fix(point-of-sale): added bruno script + added missing env variables to local docker compose file

bruno/collections/Rafiki/POS Service APIs/Initiate Payment.bru

@@ -0,0 +1,24 @@
+meta {
+  name: Initiate Payment
+  type: http
+  seq: 3
+}
+
+post {
+  url: http://localhost:3008/payment
+  body: json
+  auth: inherit
+}
+
+body:json {
+  {
+    "card": {
+      "walletAddress": "http://cloud-nine-wallet-backend/accounts/gfranklin",
+      "trasactionCounter": 1,
+      "expiry": "2025-09-13T13:00:00Z"
+    },
+    "signature": "signature",
+    "value": 1,
+    "merchantWalletAddress": "http://localhost:3000/accounts/gfranklin"
+  }
+}

localenv/cloud-nine-wallet/docker-compose.yml

@@ -23,6 +23,10 @@ services:
       LOG_LEVEL: debug
       CARD_SERVICE_PORT: 3007
       DATABASE_URL: postgresql://cloud_nine_wallet_card_service:cloud_nine_wallet_card_service@shared-database/cloud_nine_wallet_card_service
+      GRAPHQL_URL: http://cloud-nine-wallet-backend:3001/graphql
+      TENANT_ID: 438fa74a-fa7d-4317-9ced-dde32ece1787
+      TENANT_SECRET: tenant_secret
+      TENANT_SIGNATURE_VERSION: tenant_signature_version
     depends_on:
       - shared-database
     healthcheck:
@@ -55,6 +59,10 @@ services:
       LOG_LEVEL: debug 
       PORT: 3008
       DATABASE_URL: postgresql://cloud_nine_wallet_point_of_sale:cloud_nine_wallet_point_of_sale@shared-database/cloud_nine_wallet_point_of_sale 
+      TENANT_ID: 438fa74a-fa7d-4317-9ced-dde32ece1787
+      TENANT_SECRET: secret
+      GRAPHQL_URL: http://cloud-nine-wallet-backend:3001/graphql
+      WEBHOOK_SIGNATURE_SECRET: webhook_secret
     depends_on: 
       - shared-database 
     healthcheck: 

localenv/happy-life-bank/docker-compose.yml

@@ -23,6 +23,10 @@ services:
       LOG_LEVEL: debug
       CARD_SERVICE_PORT: 4007
       DATABASE_URL: postgresql://happy_life_bank_card_service:happy_life_bank_card_service@shared-database/happy_life_bank_card_service
+      GRAPHQL_URL: http://happy-life-bank-backend:3001/graphql
+      TENANT_ID: cf5fd7d3-1eb1-4041-8e43-ba45747e9e5d
+      TENANT_SECRET: tenant_secret
+      TENANT_SIGNATURE_VERSION: tenant_signature_version
     depends_on:
       - shared-database
       - cloud-nine-wallet-card-service
@@ -56,6 +60,10 @@ services:
       LOG_LEVEL: debug 
       PORT: 4008 
       DATABASE_URL: postgresql://happy_life_bank_point_of_sale:happy_life_bank_point_of_sale@shared-database/happy_life_bank_point_of_sale
+      TENANT_ID: cf5fd7d3-1eb1-4041-8e43-ba45747e9e5d
+      TENANT_SECRET: secret
+      GRAPHQL_URL: http://happy-life-bank-backend:3001/graphql
+      WEBHOOK_SIGNATURE_SECRET: webhook_secret
     depends_on: 
       - shared-database
       - cloud-nine-wallet-point-of-sale

packages/backend/src/app.ts

@@ -454,7 +454,7 @@ export class App {
     // For tests, we still need to get the tenant in the middleware, but
     // we don't need to verify the signature nor prevent replay attacks
     koa.use(
-      this.config.env !== 'test'
+      this.config.env !== 'test' && this.config.env !== 'development'
         ? tenantSignatureMiddleware
         : testTenantSignatureMiddleware
     )

packages/point-of-sale/src/payments/routes.ts

@@ -62,6 +62,7 @@ async function payment(
   ctx: PaymentContext
 ): Promise<void> {
   const body = ctx.request.body
+  const tenantId = ctx.request.header['tenant-id'] as string | undefined
   try {
     const walletAddress = await deps.paymentService.getWalletAddress(
       body.card.walletAddress
@@ -73,7 +74,8 @@ async function payment(
     }
     const incomingPayment = await deps.paymentService.createIncomingPayment(
       walletAddress.id,
-      incomingAmount
+      incomingAmount,
+      tenantId
     )
     const deferred = new Deferred<WebhookBody>()
     webhookWaitMap.setWithExpiry(
@@ -101,6 +103,7 @@ async function payment(
     ctx.body = result
     ctx.status = 200
   } catch (err) {
+    deps.logger.debug(err)
     if (err instanceof IncomingPaymentEventTimeoutError)
       webhookWaitMap.delete(err.incomingPaymentId)
     const { body, status } = handlePaymentError(err)

packages/point-of-sale/src/payments/service.ts

@@ -4,8 +4,8 @@ import { IAppConfig } from '../config/app'
 import { ApolloClient, NormalizedCacheObject } from '@apollo/client'
 import {
   AmountInput,
-  CreateIncomingPaymentInput,
   IncomingPayment,
+  MutationCreateIncomingPaymentArgs,
   type Mutation
 } from '../graphql/generated/graphql'
 import { FnWithDeps } from '../shared/types'
@@ -37,7 +37,8 @@ export type WalletAddress = OpenPaymentsWalletAddress & {
 export type PaymentService = {
   createIncomingPayment: (
     walletAddressId: string,
-    incomingAmount: AmountInput
+    incomingAmount: AmountInput,
+    tenantId?: string
   ) => Promise<IncomingPayment>
   getWalletAddress: (walletAddressUrl: string) => Promise<WalletAddress>
 }
@@ -66,19 +67,28 @@ export function createPaymentService(
 const createIncomingPayment: FnWithDeps<
   ServiceDependencies,
   PaymentService['createIncomingPayment']
-> = async (deps, walletAddressId, incomingAmount) => {
+> = async (deps, walletAddressId, incomingAmount, tenantId) => {
   const client = deps.apolloClient
   const { data } = await client.mutate<
     Mutation['createIncomingPayment'],
-    CreateIncomingPaymentInput
+    MutationCreateIncomingPaymentArgs
   >({
     mutation: CREATE_INCOMING_PAYMENT,
     variables: {
-      walletAddressId,
-      incomingAmount,
-      idempotencyKey: v4(),
-      isCardPayment: true
-    }
+      input: {
+        walletAddressId,
+        incomingAmount,
+        idempotencyKey: v4(),
+        isCardPayment: true
+      }
+    },
+    ...(tenantId && {
+      context: {
+        headers: {
+          'tenant-id': tenantId
+        }
+      }
+    })
   })
 
   const incomingPayment = data?.payment
@@ -101,7 +111,8 @@ async function getWalletAddress(
 ): Promise<WalletAddress> {
   const config: AxiosRequestConfig = {
     headers: {
-      'Content-Type': 'application/json'
+      Accept: 'application/json',
+      host: 'cloud-nine-wallet-backend'
     }
   }
   const { data: walletAddress } = await deps.axios.get<