Skip to content

fix(backend): made CARD_SERVICE_URL optional #3600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: feat: adding `card-service` and `point-of-sale`
merged 5 commits into from
Aug 14, 2025
Merged

fix(backend): made CARD_SERVICE_URL optional #3600

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d191f2
Made CARD_SERVICE_URL optional
oana-lolea Aug 13, 2025
c418642
Created cardService container only if cardServiceUrl is set in config
oana-lolea Aug 13, 2025
96d13b8
Added noop card service when cardServiceUrl is not provided
oana-lolea Aug 14, 2025
43da82b
Regenerated graphql
oana-lolea Aug 14, 2025
c016794
Added warning when CARD_SERVICE_URL is not set
oana-lolea Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/backend/src/config/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export const Config = {
'SEND_TENANT_WEBHOOKS_TO_OPERATOR',
false
),
cardServiceUrl: envString('CARD_SERVICE_URL')
cardServiceUrl: process.env.CARD_SERVICE_URL
}

function parseRedisTlsConfig(
Expand Down
15 changes: 9 additions & 6 deletions packages/backend/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,13 +672,16 @@ export function initIocContainer(
})
})

container.singleton('cardService', async (deps) => {
return createCardService({
axios: await deps.use('axios'),
logger: await deps.use('logger'),
cardServiceUrl: config.cardServiceUrl
if (config.cardServiceUrl) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove this if and keep the cardService service defined, otherwise we might get unexpected behaviour if a singleton resolves to undefined.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can do a NoopCardService (similar to the NoopTelemetryService)

const cardServiceUrl = config.cardServiceUrl
container.singleton('cardService', async (deps) => {
return createCardService({
axios: await deps.use('axios'),
logger: await deps.use('logger'),
cardServiceUrl
})
})
})
}

return container
}
Expand Down
4 changes: 2 additions & 2 deletions packages/backend/src/open_payments/wallet_address/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export class WalletAddress
}: {
authServer: string
resourceServer: string
cardService: string
cardService?: string
}): OpenPaymentsWalletAddress {
const returnVal: OpenPaymentsWalletAddress = {
id: this.address,
Expand All @@ -132,7 +132,7 @@ export class WalletAddress
assetScale: this.asset.scale,
authServer,
resourceServer,
cardService
...(cardService && { cardService })
}
if (this.additionalProperties && this.additionalProperties.length) {
returnVal.additionalProperties = this.additionalProperties
Expand Down
4 changes: 3 additions & 1 deletion packages/backend/src/open_payments/wallet_address/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ export async function getWalletAddress(
ctx.body = walletAddress.toOpenPaymentsType({
authServer: `${ensureTrailingSlash(deps.config.authServerGrantUrl)}${walletAddress.tenantId}`,
resourceServer: `${ensureTrailingSlash(deps.config.openPaymentsUrl)}${walletAddress.tenantId}`,
cardService: `${ensureTrailingSlash(deps.config.cardServiceUrl)}${walletAddress.tenantId}`
...(deps.config.cardServiceUrl && {
cardService: `${ensureTrailingSlash(deps.config.cardServiceUrl)}${walletAddress.tenantId}`
})
})
}

Expand Down
Loading