feat: remove walletAddress from complete incoming payment context

interledger · Oct 19, 2023 · 4ad3cdb · 4ad3cdb
1 parent 3ebbdc0
commit 4ad3cdb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/packages/backend/src/app.ts b/packages/backend/src/app.ts
@@ -496,7 +496,6 @@ export class App {
     // Complete incoming payment
     router.post<DefaultState, SignedSubresourceContext>(
       '/incoming-payments/:id/complete',
-      createWalletAddressMiddleware(),
       createValidatorMiddleware<ContextType<SignedSubresourceContext>>(
         resourceServerSpec,
         {

diff --git a/packages/backend/src/open_payments/payment/incoming/routes.test.ts b/packages/backend/src/open_payments/payment/incoming/routes.test.ts
@@ -297,7 +297,7 @@ describe('Incoming Payment Routes', (): void => {
   describe('get unauthenticated incoming payment', (): void => {
     test('Can get incoming payment with public fields', async (): Promise<void> => {
       const incomingPayment = await createIncomingPayment(deps, {
-        paymentPointerId: paymentPointer.id,
+        walletAddressId: walletAddress.id,
         expiresAt,
         incomingAmount,
         metadata
@@ -312,7 +312,7 @@ describe('Incoming Payment Routes', (): void => {
         params: {
           id: incomingPayment.id
         },
-        paymentPointer
+        walletAddress
       })
       ctx.authenticated = false
 

diff --git a/packages/backend/src/open_payments/payment/incoming/routes.ts b/packages/backend/src/open_payments/payment/incoming/routes.ts
@@ -81,7 +81,7 @@ async function getIncomingPaymentPublic(
     const incomingPayment = await deps.incomingPaymentService.get({
       id: ctx.params.id,
       client: ctx.accessAction === AccessAction.Read ? ctx.client : undefined,
-      paymentPointerId: ctx.paymentPointer.id
+      walletAddressId: ctx.walletAddress.id
     })
     ctx.body = incomingPayment?.toPublicOpenPaymentsType()
   } catch (err) {
@@ -147,10 +147,14 @@ async function createIncomingPayment(
     )
   }
 
+  if (!incomingPaymentOrError.walletAddress) {
+    ctx.throw(404)
+  }
+
   ctx.status = 201
   const connection = deps.connectionService.get(incomingPaymentOrError)
   ctx.body = incomingPaymentToBody(
-    ctx.walletAddress,
+    incomingPaymentOrError.walletAddress,
     incomingPaymentOrError,
     connection
   )
@@ -175,7 +179,12 @@ async function completeIncomingPayment(
       errorToMessage[incomingPaymentOrError]
     )
   }
-  ctx.body = incomingPaymentToBody(ctx.walletAddress, incomingPaymentOrError)
+
+  if (!incomingPaymentOrError.walletAddress) {
+    ctx.throw(404)
+  }
+
+  ctx.body = incomingPaymentToBody(incomingPaymentOrError.walletAddress, incomingPaymentOrError)
 }
 
 async function listIncomingPayments(

diff --git a/packages/backend/src/open_payments/wallet_address/middleware.ts b/packages/backend/src/open_payments/wallet_address/middleware.ts
@@ -21,7 +21,7 @@ export function createWalletAddressMiddleware() {
         ctx.throw(401)
       }
     } else {
-      ctx.walletAddressUrl = `https://${ctx.request.host}/${ctx.params.paymentPointerPath}`
+      ctx.walletAddressUrl = `https://${ctx.request.host}/${ctx.params.walletAddressPath}`
     }
     const config = await ctx.container.use('config')
     if (ctx.walletAddressUrl !== config.walletAddressUrl) {