feat(3114): update for auth and resource server.

interledger · Dec 11, 2024 · 7d562b5 · 7d562b5
1 parent a9f0fff
commit 7d562b5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/localenv/mock-account-servicing-entity/app/lib/parse_config.server.ts b/localenv/mock-account-servicing-entity/app/lib/parse_config.server.ts
@@ -26,5 +26,7 @@ export const CONFIG: Config = {
   testnetAutoPeerUrl: process.env.TESTNET_AUTOPEER_URL ?? '',
   authServerDomain: process.env.AUTH_SERVER_DOMAIN || 'http://localhost:3006',
   graphqlUrl: process.env.GRAPHQL_URL,
-  idpSecret: process.env.IDP_SECRET
+  idpSecret: process.env.IDP_SECRET,
+  operatorTenantId:
+    process.env.OPERATOR_TENANT_ID || '438fa74a-fa7d-4317-9ced-dde32ece1787'
 }
diff --git a/packages/backend/migrations/20241203112902_add_tenant_to_wallet_address.js b/packages/backend/migrations/20241203112902_add_tenant_to_wallet_address.js
@@ -5,9 +5,8 @@
 exports.up = function (knex) {
   return Promise.all([
     knex.schema.alterTable('walletAddresses', function (table) {
-      table.uuid('tenantId')
-      table.foreign(['tenantId']).references('tenants.id')
-      table.index(['tenantId'])
+      table.uuid('tenantId').index().notNullable()
+      //table.foreign(['tenantId']).references('tenants.id')
     })
   ])
 }

diff --git a/packages/backend/src/open_payments/wallet_address/routes.test.ts b/packages/backend/src/open_payments/wallet_address/routes.test.ts
@@ -102,6 +102,7 @@ describe('Wallet Address Routes', (): void => {
       addPropNotVisibleInOpenPayments.fieldValue = 'it-is-not'
       addPropNotVisibleInOpenPayments.visibleInOpenPayments = false
       const walletAddress = await createWalletAddress(deps, {
+        tenantId: config.operatorTenantId,
         publicName: faker.person.firstName(),
         additionalProperties: [addProp, addPropNotVisibleInOpenPayments]
       })
@@ -118,8 +119,9 @@ describe('Wallet Address Routes', (): void => {
         publicName: walletAddress.publicName,
         assetCode: walletAddress.asset.code,
         assetScale: walletAddress.asset.scale,
-        authServer: config.authServerGrantUrl,
-        resourceServer: config.openPaymentsUrl,
+        // Ensure the tenant id is returned for auth and resource server:
+        authServer: `${config.authServerGrantUrl}/${config.operatorTenantId}`,
+        resourceServer: `${config.openPaymentsUrl}/${config.operatorTenantId}`,
         additionalProperties: {
           [addProp.fieldKey]: addProp.fieldValue
         }
@@ -145,6 +147,7 @@ describe('Wallet Address Routes', (): void => {
 
     test('returns wallet address', async (): Promise<void> => {
       const walletAddress = await createWalletAddress(deps, {
+        tenantId: config.operatorTenantId,
         publicName: faker.person.firstName()
       })
 
@@ -160,8 +163,9 @@ describe('Wallet Address Routes', (): void => {
         publicName: walletAddress.publicName,
         assetCode: walletAddress.asset.code,
         assetScale: walletAddress.asset.scale,
-        authServer: config.authServerGrantUrl,
-        resourceServer: config.openPaymentsUrl
+        // Ensure the tenant id is returned for auth and resource server:
+        authServer: `${config.authServerGrantUrl}/${config.operatorTenantId}`,
+        resourceServer: `${config.openPaymentsUrl}/${config.operatorTenantId}`,
       })
     })
   })

diff --git a/packages/backend/src/open_payments/wallet_address/routes.ts b/packages/backend/src/open_payments/wallet_address/routes.ts
@@ -60,11 +60,16 @@ export async function getWalletAddress(
     )
 
   ctx.body = walletAddress.toOpenPaymentsType({
-    authServer: deps.config.authServerGrantUrl,
-    resourceServer: deps.config.openPaymentsUrl
+    authServer: `${ensureTrailingSlash(deps.config.authServerGrantUrl)}${walletAddress.tenantId}`,
+    resourceServer: `${ensureTrailingSlash(deps.config.openPaymentsUrl)}${walletAddress.tenantId}`
   })
 }
 
+function ensureTrailingSlash(str: string): string {
+  if (!str.endsWith('/')) return `${str}/`
+  return str
+}
+
 interface ListSubresourceOptions<M extends WalletAddressSubresource> {
   ctx: ListContext
   getWalletAddressPage: WalletAddressSubresourceService<M>['getWalletAddressPage']

diff --git a/packages/mock-account-service-lib/src/seed.ts b/packages/mock-account-service-lib/src/seed.ts
@@ -140,7 +140,7 @@ export async function setupFromSeed(
       logger.debug('hostname: ', config.publicHost)
 
       const url = `${config.publicHost}/${account.path}`
-      const tenantId = '438fa74a-fa7d-4317-9ced-dde32ece1787' //TODO @jason complete this: <-
+      const tenantId = config.operatorTenantId
       let walletAddress = await getWalletAddressByURL(url)
       if (!walletAddress) {
         walletAddress = await createWalletAddress(

diff --git a/packages/mock-account-service-lib/src/types.ts b/packages/mock-account-service-lib/src/types.ts
@@ -49,6 +49,7 @@ export interface Config {
   authServerDomain: string
   graphqlUrl: string
   idpSecret: string
+  operatorTenantId: string
 }
 export interface Webhook {
   id: string