feat(backend): tenanted incoming payments

bruno/collections/Rafiki/Examples/Open Payments/Create Incoming Payment.bru

@@ -41,7 +41,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
   }

bruno/collections/Rafiki/Examples/Web Monetization/Create Incoming Payment.bru

@@ -36,7 +36,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
     bru.setEnvVar("quoteDebitAmount", JSON.stringify({

bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Create Incoming Payment.bru

@@ -42,7 +42,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
   }

bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/List Incoming Payments.bru

@@ -10,7 +10,7 @@ get {
   auth: none
 }
 
-query {
+params:query {
   first: 10
   wallet-address: {{receiverWalletAddress}}
   ~cursor: ea3bf38f-2719-4473-a0f7-4ba967d1d81b

bruno/collections/Rafiki/Rafiki Admin APIs/Create Incoming Payment.bru

@@ -45,7 +45,8 @@ body:graphql:vars {
       },
       "incomingAmount": null,
       "walletAddressId": "{{walletAddressId}}"
-    }
+    },
+      "tenantId": "{{tenantId}}"
   }
 }
 

bruno/collections/Rafiki/Rafiki Admin APIs/Get Incoming Payment By Tenant.bru

@@ -0,0 +1,48 @@
+meta {
+  name: Get Incoming Payment By Tenant
+  type: graphql
+  seq: 54
+}
+
+post {
+  url: {{RafikiGraphqlHost}}/{{tenantId}}/graphql
+  body: graphql
+  auth: none
+}
+
+body:graphql {
+  query GetIncomingPayment($id: String!) {
+  incomingPayment(id: $id) {
+      id
+      walletAddressId
+      client
+      state
+      expiresAt
+      incomingAmount {
+          value
+          assetCode
+          assetScale
+      }
+      receivedAmount {
+          value
+          assetCode
+          assetScale
+      }
+      metadata
+      createdAt
+    }
+  }
+}
+
+body:graphql:vars {
+  {
+      "id": "{{incomingPaymentId}}",
+        "tenantId": "{{tenantId}}"
+  }
+}
+
+script:pre-request {
+  const scripts = require('./scripts');
+
+  scripts.addApiSignatureHeader();
+}

packages/backend/migrations/20250120101610_add_tenant_to_incoming_payments.js

@@ -0,0 +1,32 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema
+    .alterTable('incomingPayments', function (table) {
+      table.uuid('tenantId')
+      table.foreign('tenantId').references('id').inTable('tenants')
+    })
+    .then(() => {
+      knex.raw(
+        `UPDATE "incomingPayments" SET "tenantId" = (SELECT id from "tenants" LIMIT 1)`
+      )
+    })
+    .then(() => {
+      knex.schema.alterTable('incomingPayments', function (table) {
+        table.uuid('tenantId').notNullable()
+      })
+    })
+}
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.alterTable('incomingPayments', function (table) {
+    table.dropForeign('tenantId')
+    table.dropColumn('tenantId')
+  })
+}

packages/backend/src/app.ts

@@ -499,7 +499,7 @@ export class App {
     // POST /incoming-payments
     // Create incoming payment
     router.post<DefaultState, SignedCollectionContext<IncomingCreateBody>>(
-      '/incoming-payments',
+      '/:tenantId/incoming-payments',
       createValidatorMiddleware<
         ContextType<SignedCollectionContext<IncomingCreateBody>>
       >(
@@ -526,7 +526,7 @@ export class App {
       DefaultState,
       SignedCollectionContext<never, GetCollectionQuery>
     >(
-      '/incoming-payments',
+      '/:tenantId/incoming-payments',
       createValidatorMiddleware<
         ContextType<SignedCollectionContext<never, GetCollectionQuery>>
       >(
@@ -625,7 +625,7 @@ export class App {
     // GET /incoming-payments/{id}
     // Read incoming payment
     router.get<DefaultState, SubresourceContextWithAuthenticatedStatus>(
-      '/incoming-payments/:id',
+      '/:tenantId/incoming-payments/:id',
       createValidatorMiddleware<
         ContextType<SubresourceContextWithAuthenticatedStatus>
       >(
@@ -650,7 +650,7 @@ export class App {
     // POST /incoming-payments/{id}/complete
     // Complete incoming payment
     router.post<DefaultState, SignedSubresourceContext>(
-      '/incoming-payments/:id/complete',
+      '/:tenantId/incoming-payments/:id/complete',
       createValidatorMiddleware<ContextType<SignedSubresourceContext>>(
         resourceServerSpec,
         {

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

@@ -74,7 +74,8 @@ describe('Payment', (): void => {
     })
     const incomingPayment = await createIncomingPayment(deps, {
       walletAddressId: inWalletAddressId,
-      client: client
+      client: client,
+      tenantId: Config.operatorTenantId
     })
 
     const query = await appContainer.apolloClient

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

@@ -38,13 +38,15 @@ describe('Incoming Payment Resolver', (): void => {
   let incomingPaymentService: IncomingPaymentService
   let accountingService: AccountingService
   let asset: Asset
+  let tenantId: string
 
   beforeAll(async (): Promise<void> => {
     deps = await initIocContainer(Config)
     appContainer = await createTestApp(deps)
     incomingPaymentService = await deps.use('incomingPaymentService')
     accountingService = await deps.use('accountingService')
     asset = await createAsset(deps)
+    tenantId = Config.operatorTenantId
   })
 
   afterAll(async (): Promise<void> => {
@@ -78,7 +80,8 @@ describe('Incoming Payment Resolver', (): void => {
           metadata: {
             description: `IncomingPayment`,
             externalRef: '#123'
-          }
+          },
+          tenantId
         }),
       pagedQuery: 'incomingPayments',
       parent: {
@@ -118,7 +121,8 @@ describe('Incoming Payment Resolver', (): void => {
           client,
           metadata,
           expiresAt,
-          incomingAmount
+          incomingAmount,
+          tenantId
         })
 
         const createSpy = jest
@@ -167,7 +171,7 @@ describe('Incoming Payment Resolver', (): void => {
               query.data?.createIncomingPayment
           )
 
-        expect(createSpy).toHaveBeenCalledWith(input)
+        expect(createSpy).toHaveBeenCalledWith({ ...input, tenantId })
         expect(query).toEqual({
           __typename: 'IncomingPaymentResponse',
           payment: {
@@ -237,7 +241,7 @@ describe('Incoming Payment Resolver', (): void => {
           })
         )
       }
-      expect(createSpy).toHaveBeenCalledWith(input)
+      expect(createSpy).toHaveBeenCalledWith({ ...input, tenantId })
     })
 
     test('Internal server error', async (): Promise<void> => {
@@ -282,7 +286,10 @@ describe('Incoming Payment Resolver', (): void => {
           })
         )
       }
-      expect(createSpy).toHaveBeenCalledWith(input)
+      expect(createSpy).toHaveBeenCalledWith({
+        ...input,
+        tenantId
+      })
     })
   })
 
@@ -299,7 +306,8 @@ describe('Incoming Payment Resolver', (): void => {
           value: BigInt(56),
           assetCode: asset.code,
           assetScale: asset.scale
-        }
+        },
+        tenantId
       })
     }
 
@@ -475,7 +483,8 @@ describe('Incoming Payment Resolver', (): void => {
           walletAddressId,
           metadata,
           expiresAt,
-          incomingAmount
+          incomingAmount,
+          tenantId
         })
         const input = {
           id: payment.id,
@@ -510,7 +519,7 @@ describe('Incoming Payment Resolver', (): void => {
               query.data?.updateIncomingPayment
           )
 
-        expect(createSpy).toHaveBeenCalledWith(input)
+        expect(createSpy).toHaveBeenCalledWith({ ...input, tenantId })
         expect(query).toEqual({
           __typename: 'IncomingPaymentResponse',
           payment: {
@@ -565,7 +574,7 @@ describe('Incoming Payment Resolver', (): void => {
           })
         )
       }
-      expect(createSpy).toHaveBeenCalledWith(input)
+      expect(createSpy).toHaveBeenCalledWith({ ...input, tenantId })
     })
 
     test('Internal server error', async (): Promise<void> => {
@@ -611,7 +620,7 @@ describe('Incoming Payment Resolver', (): void => {
           })
         )
       }
-      expect(createSpy).toHaveBeenCalledWith(input)
+      expect(createSpy).toHaveBeenCalledWith({ ...input, tenantId })
     })
   })
 })