feat(backend): require wallet address prefix to be set during tenant creation

bruno/collections/Rafiki/Rafiki Admin APIs/Create Tenant.bru

@@ -19,6 +19,7 @@ body:graphql {
         apiSecret
         idpConsentUrl
         idpSecret
+        walletAddressPrefix
       }
     }
   }
@@ -30,7 +31,8 @@ body:graphql:vars {
       "email": "[email protected]",
       "apiSecret": "test-secret",
       "idpConsentUrl": "https://example.com/consent",
-      "idpSecret": "test-idp-secret"
+      "idpSecret": "test-idp-secret",
+      "walletAddressPrefix": "https://cloud-nine-wallet-backend"
     }
   }
 }

packages/backend/jest.env.js

@@ -1,7 +1,7 @@
 process.env.LOG_LEVEL = 'silent'
 process.env.INSTANCE_NAME = 'Rafiki'
 process.env.KEY_ID = 'myKey'
-process.env.OPEN_PAYMENTS_URL = 'http://127.0.0.1:3000'
+process.env.OPEN_PAYMENTS_URL = 'https://127.0.0.1:3000'
 process.env.ILP_CONNECTOR_URL = 'http://127.0.0.1:3002'
 process.env.ILP_ADDRESS = 'test.rafiki'
 process.env.AUTH_SERVER_GRANT_URL = 'http://127.0.0.1:3006'

packages/backend/migrations/20250930210751_add_prefix_to_tenant.js

@@ -0,0 +1,51 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema
+    .alterTable('tenants', (table) => {
+      table.string('walletAddressPrefix').unique()
+    })
+    .then(() => {
+      return knex.raw(
+        `UPDATE "tenants" SET "walletAddressPrefix" = (SELECT "value" from "tenantSettings" WHERE "tenantId" = "tenants"."id" AND "key" = 'WALLET_ADDRESS_URL')`
+      )
+    })
+    .then(() => {
+      return knex.raw(
+        `DELETE FROM "tenantSettings" WHERE "key" = 'WALLET_ADDRESS_URL'`
+      )
+    })
+    .then(() => {
+      return knex.raw(
+        `UPDATE "tenants" SET "walletAddressPrefix" = '${process.env.OPEN_PAYMENTS_URL}' WHERE "id" = '${process.env.OPERATOR_TENANT_ID}'`
+      )
+    })
+    .then(() => {
+      return knex.raw(
+        `UPDATE "tenants" SET "walletAddressPrefix" = '${process.env.OPEN_PAYMENTS_URL}/' || gen_random_uuid() WHERE "walletAddressPrefix" IS NULL`
+      )
+    })
+    .then(() => {
+      return knex.schema.alterTable('tenants', (table) => {
+        table.dropNullable('walletAddressPrefix')
+      })
+    })
+}
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex
+    .raw(
+      `INSERT INTO "tenantSettings" ("id", "key", "value", "tenantId") SELECT gen_random_uuid(), 'WALLET_ADDRESS_URL', "walletAddressPrefix", "id" FROM "tenants" WHERE "walletAddressPrefix" IS NOT NULL`
+    )
+    .then(() => {
+      return knex.schema.alterTable('tenants', (table) => {
+        table.dropColumn('walletAddressPrefix')
+      })
+    })
+}

packages/backend/src/asset/service.test.ts

@@ -26,15 +26,15 @@ import {
   TenantSettingService
 } from '../tenants/settings/service'
 import { exchangeRatesSetting } from '../tests/tenantSettings'
-import { createTenantSettings } from '../tests/tenantSettings'
-import { TenantSettingKeys } from '../tenants/settings/model'
+import { TenantService } from '../tenants/service'
 
 describe('Asset Service', (): void => {
   let deps: IocContract<AppServices>
   let appContainer: TestContainer
   let assetService: AssetService
   let peerService: PeerService
   let walletAddressService: WalletAddressService
+  let tenantService: TenantService
   let tenantSettingService: TenantSettingService
   let config: IAppConfig
 
@@ -44,6 +44,7 @@ describe('Asset Service', (): void => {
     config = await deps.use('config')
     assetService = await deps.use('assetService')
     walletAddressService = await deps.use('walletAddressService')
+    tenantService = await deps.use('tenantService')
     tenantSettingService = await deps.use('tenantSettingService')
     peerService = await deps.use('peerService')
   })
@@ -74,14 +75,9 @@ describe('Asset Service', (): void => {
   })
 
   beforeEach(async () => {
-    await createTenantSettings(deps, {
-      tenantId: Config.operatorTenantId,
-      setting: [
-        {
-          key: TenantSettingKeys.WALLET_ADDRESS_URL.name,
-          value: 'https://alice.me'
-        }
-      ]
+    await tenantService.update({
+      id: Config.operatorTenantId,
+      walletAddressPrefix: 'https://alice.me'
     })
   })
 

packages/backend/src/graphql/resolvers/tenant.test.ts

@@ -241,6 +241,7 @@ describe('Tenant Resolvers', (): void => {
                     idpConsentUrl
                     idpSecret
                     publicName
+                    walletAddressPrefix
                   }
                 }
               }
@@ -274,6 +275,7 @@ describe('Tenant Resolvers', (): void => {
                     idpConsentUrl
                     idpSecret
                     publicName
+                    walletAddressPrefix
                   }
                 }
               }
@@ -406,6 +408,7 @@ describe('Tenant Resolvers', (): void => {
                     idpConsentUrl
                     idpSecret
                     publicName
+                    walletAddressPrefix
                   }
                 }
               }
@@ -441,6 +444,7 @@ describe('Tenant Resolvers', (): void => {
                     idpConsentUrl
                     idpSecret
                     publicName
+                    walletAddressPrefix
                   }
                 }
               }

packages/backend/src/graphql/resolvers/tenant.ts

@@ -144,9 +144,13 @@ export const updateTenant: MutationResolvers<TenantedApolloContext>['updateTenan
 
     const tenantService = await ctx.container.use('tenantService')
     try {
-      const updatedTenant = await tenantService.update(args.input)
-      return { tenant: tenantToGraphQl(updatedTenant) }
+      const updatedTenantOrError = await tenantService.update(args.input)
+      if (isTenantError(updatedTenantOrError)) {
+        throw updatedTenantOrError
+      }
+      return { tenant: tenantToGraphQl(updatedTenantOrError) }
     } catch (err) {
+      if (isTenantError(err)) throw err
       throw new GraphQLError('failed to update tenant', {
         extensions: {
           code: GraphQLErrorCode.NotFound
@@ -191,6 +195,7 @@ export function tenantToGraphQl(tenant: Tenant): SchemaTenant {
     idpConsentUrl: tenant.idpConsentUrl,
     idpSecret: tenant.idpSecret,
     publicName: tenant.publicName,
+    walletAddressPrefix: tenant.walletAddressPrefix,
     settings: tenantSettingsToGraphql(tenant.settings),
     createdAt: new Date(+tenant.createdAt).toISOString(),
     deletedAt: tenant.deletedAt