chore(auth): return objects during GNAP errors

bruno/collections/Rafiki/Examples/Open Payments Without Quote/Continuation Request.bru

@@ -21,9 +21,9 @@ script:pre-request {
 }
 
 script:post-response {
-  const body = res.getBody();
-  bru.setEnvVar("accessToken", body.access_token.value);
-  bru.setEnvVar("tokenId", body.access_token.manage.split('/').pop())
+  const scripts = require('./scripts');
+
+  scripts.storeTokenDetails();
 }
 
 tests {

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

@@ -36,20 +36,24 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-  bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
-  bru.setEnvVar("incomingPaymentUrl", body.id);
 
-  bru.setEnvVar("debitAmount", JSON.stringify({
-      "value": "500",
-      "assetCode": "USD",
-      "assetScale": 2
-    }))
+  if (body?.id) {    
+    bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
+    bru.setEnvVar("incomingPaymentUrl", body.id);
+
+    bru.setEnvVar("debitAmount", JSON.stringify({
+        "value": "500",
+        "assetCode": "USD",
+        "assetScale": 2
+      }))
+
+    bru.setEnvVar("receiveAmount", JSON.stringify({
+        "value": "500",
+        "assetCode": "USD",
+        "assetScale": 2
+      }))
+  }
 
-  bru.setEnvVar("receiveAmount", JSON.stringify({
-      "value": "500",
-      "assetCode": "USD",
-      "assetScale": 2
-    }))
 }
 
 tests {

bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Outgoing Payment.bru

@@ -35,11 +35,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-  console.log(res.status)
-  console.log(res.statusText)
-  console.log({body})
-  bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
-
+
+  if (body?.id) {
+    bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
+  }
 }
 
 tests {

bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get receiver wallet address.bru

@@ -23,7 +23,11 @@ script:pre-request {
 script:post-response {
   const url = require('url')
 
-  const body = res.body
+  if (res.getStatus() !== 200) {
+    return
+  }
+
+  const body = res.getBody()
   bru.setEnvVar("receiverAssetCode", body?.assetCode)
   bru.setEnvVar("receiverAssetScale", body?.assetScale)
 

bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get sender wallet address.bru

@@ -23,7 +23,12 @@ script:pre-request {
 script:post-response {
   const url = require('url')
 
-  const body = res.body
+  if (res.getStatus() !== 200) {
+    return
+  }
+
+  const body = res.getBody()
+
   bru.setEnvVar("senderAssetCode", body?.assetCode)
   bru.setEnvVar("senderAssetScale", body?.assetScale)
 

bruno/collections/Rafiki/Examples/Open Payments/Continuation Request.bru

@@ -21,9 +21,9 @@ script:pre-request {
 }
 
 script:post-response {
-  const body = res.getBody();
-  bru.setEnvVar("accessToken", body.access_token.value);
-  bru.setEnvVar("tokenId", body.access_token.manage.split('/').pop())
+  const scripts = require('./scripts');
+
+  scripts.storeTokenDetails();
 }
 
 tests {

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

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

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

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

bruno/collections/Rafiki/Examples/Open Payments/Create Quote.bru

@@ -32,9 +32,11 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-  bru.setEnvVar("quoteId", body.id.split("/").pop());
-  bru.setEnvVar("quoteDebitAmount", JSON.stringify(body.debitAmount))
-  bru.setEnvVar("quoteReceiveAmount", JSON.stringify(body.receiveAmount))
+  if (body?.id) {
+    bru.setEnvVar("quoteId", body.id.split("/").pop());
+    bru.setEnvVar("quoteDebitAmount", JSON.stringify(body.debitAmount))
+    bru.setEnvVar("quoteReceiveAmount", JSON.stringify(body.receiveAmount))
+  }
 
 }
 

bruno/collections/Rafiki/Examples/Open Payments/Get receiver wallet address.bru

@@ -22,8 +22,12 @@ script:pre-request {
 
 script:post-response {
   const url = require('url')
-
-  const body = res.body
+
+  if (res.getStatus() !== 200) {
+    return
+  }
+
+  const body = res.getBody()
   bru.setEnvVar("receiverAssetCode", body?.assetCode)
   bru.setEnvVar("receiverAssetScale", body?.assetScale)
 

bruno/collections/Rafiki/Examples/Open Payments/Get sender wallet address.bru

@@ -23,7 +23,11 @@ script:pre-request {
 script:post-response {
   const url = require('url')
 
-  const body = res.body
+  if (res.getStatus() !== 200) {
+    return
+  }
+
+  const body = res.getBody()
   bru.setEnvVar("senderAssetCode", body?.assetCode)
   bru.setEnvVar("senderAssetScale", body?.assetScale)
 

bruno/collections/Rafiki/Examples/Web Monetization/Continuation Request.bru

@@ -21,9 +21,9 @@ script:pre-request {
 }
 
 script:post-response {
-  const body = res.getBody();
-  bru.setEnvVar("accessToken", body.access_token.value);
-  bru.setEnvVar("tokenId", body.access_token.manage.split('/').pop())
+  const scripts = require('./scripts');
+
+  scripts.storeTokenDetails();
 }
 
 tests {

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

@@ -36,17 +36,20 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-  bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
-  bru.setEnvVar("quoteDebitAmount", JSON.stringify({
-          value: "99999999999999",
-          assetCode: "USD",
-          assetScale: 2
-      }))
-  bru.setEnvVar("quoteReceiveAmount", JSON.stringify({
-          value: "99999999999999",
-          assetCode: "USD",
-          assetScale: 2
-      }))
+
+  if (body?.id) {
+    bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
+    bru.setEnvVar("quoteDebitAmount", JSON.stringify({
+            value: "99999999999999",
+            assetCode: "USD",
+            assetScale: 2
+        }))
+    bru.setEnvVar("quoteReceiveAmount", JSON.stringify({
+            value: "99999999999999",
+            assetCode: "USD",
+            assetScale: 2
+        }))
+  }
 }
 
 tests {

bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 1.bru

@@ -40,8 +40,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-  bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
-
+
+  if (body?.id) {
+    bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
+  }
 }
 
 tests {

bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 2.bru

@@ -40,8 +40,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-  bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
 
+  if (body?.id) {
+    bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
+  }
 }
 
 tests {

bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 3.bru

@@ -40,8 +40,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-  bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
 
+  if (body?.id) {
+    bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
+  }
 }
 
 tests {

bruno/collections/Rafiki/Examples/Web Monetization/Get receiver wallet address.bru

@@ -23,7 +23,12 @@ script:pre-request {
 script:post-response {
   const url = require('url')
 
-  const body = res.body
+  if (res.getStatus() !== 200) {
+    return
+  }
+
+  const body = res.getBody()
+
   bru.setEnvVar("receiverAssetCode", body?.assetCode)
   bru.setEnvVar("receiverAssetScale", body?.assetScale)
 

bruno/collections/Rafiki/Examples/Web Monetization/Get sender wallet address.bru

@@ -23,7 +23,11 @@ script:pre-request {
 script:post-response {
   const url = require('url')
 
-  const body = res.body
+  if (res.getStatus() !== 200) {
+    return
+  }
+
+  const body = res.getBody()
   bru.setEnvVar("senderAssetCode", body?.assetCode)
   bru.setEnvVar("senderAssetScale", body?.assetScale)
 

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

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

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

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

bruno/collections/Rafiki/Open Payments APIs/Quotes/Create Quote.bru

@@ -37,10 +37,12 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-  bru.setEnvVar("quoteId", body.id.split("/").pop());
-  bru.setEnvVar("quoteDebitAmount", JSON.stringify(body.debitAmount))
-  bru.setEnvVar("quoteReceiveAmount", JSON.stringify(body.receiveAmount))
-
+
+  if (body?.id) {
+    bru.setEnvVar("quoteId", body.id.split("/").pop());
+    bru.setEnvVar("quoteDebitAmount", JSON.stringify(body.debitAmount))
+    bru.setEnvVar("quoteReceiveAmount", JSON.stringify(body.receiveAmount))
+  }
 }
 
 tests {

bruno/collections/Rafiki/scripts.js

@@ -147,10 +147,16 @@ const scripts = {
 
   storeTokenDetails: function () {
     const body = res.getBody()
-    bru.setEnvVar('accessToken', body?.access_token?.value)
-    bru.setEnvVar('continueToken', body.continue.access_token.value)
-    bru.setEnvVar('continueId', body.continue.uri.split('/').pop())
-    bru.setEnvVar('tokenId', body?.access_token?.manage.split('/').pop())
+
+    if (body?.access_token) {
+      bru.setEnvVar('accessToken', body.access_token.value)
+      bru.setEnvVar('tokenId', body.access_token.manage.split('/').pop())
+    }
+
+    if (body?.continue) {
+      bru.setEnvVar('continueToken', body.continue.access_token.value)
+      bru.setEnvVar('continueId', body.continue.uri.split('/').pop())
+    }
   },
 
   loadWalletAddressIdsIntoVariables: async function () {

packages/auth/src/shared/gnapErrors.test.ts

@@ -38,14 +38,13 @@ describe('gnapServerErrorMiddleware', (): void => {
       throw error
     })
 
-    const ctxThrowSpy = jest.spyOn(ctx, 'throw')
-
-    await expect(gnapServerErrorMiddleware(ctx, next)).rejects.toMatchObject({
-      status: error.status,
-      message: error.message
+    await expect(gnapServerErrorMiddleware(ctx, next)).resolves.toBeUndefined()
+    expect(ctx.body).toEqual({
+      error: {
+        description: error.message
+      }
     })
-
-    expect(ctxThrowSpy).toHaveBeenCalledWith(error.status, error.message)
+    expect(ctx.status).toBe(error.status)
     expect(next).toHaveBeenCalledTimes(1)
   })
 
@@ -59,19 +58,27 @@ describe('gnapServerErrorMiddleware', (): void => {
       throw error
     })
 
-    const ctxThrowSpy = jest.spyOn(ctx, 'throw')
-
-    await expect(gnapServerErrorMiddleware(ctx, next)).rejects.toMatchObject({
-      status: error.status,
+    await expect(gnapServerErrorMiddleware(ctx, next)).resolves.toBeUndefined()
+    expect(ctx.body).toEqual({
       error: {
         code: error.code,
         description: error.message
       }
     })
+    expect(ctx.status).toBe(error.status)
+    expect(next).toHaveBeenCalledTimes(1)
+  })
 
-    expect(ctxThrowSpy).toHaveBeenCalledWith(error.status, error.code, {
-      error: { code: error.code, description: error.message }
+  test('handles unknown error', async (): Promise<void> => {
+    const error = new Error('unexpected')
+    const next = jest.fn().mockImplementationOnce(() => {
+      throw error
     })
+
+    const ctxThrowSpy = jest.spyOn(ctx, 'throw')
+
+    await expect(gnapServerErrorMiddleware(ctx, next)).rejects.toThrow()
+    expect(ctxThrowSpy).toHaveBeenCalledWith(500)
     expect(next).toHaveBeenCalledTimes(1)
   })
 })