chore: update consentRequests simulator resp to support all error cases

package.json

@@ -88,7 +88,7 @@
     "@mojaloop/central-services-metrics": "^9.5.0",
     "@mojaloop/central-services-shared": "^11.5.9",
     "@mojaloop/sdk-scheme-adapter": "^11.15.0",
-    "@mojaloop/sdk-standard-components": "^15.6.0",
+    "@mojaloop/sdk-standard-components": "^15.7.0",
     "@types/axios": "^0.14.0",
     "@types/convict": "^5.2.2",
     "@types/hapi": "^18.0.5",

src/models/inbound/dfspConsentRequests.interface.ts

@@ -32,6 +32,7 @@ import {
 import { Method } from 'javascript-state-machine'
 import { ThirdpartyRequests } from '@mojaloop/sdk-standard-components';
 import {
+  v1_1 as fspiopAPI,
   thirdparty as tpAPI
 } from '@mojaloop/api-snippets'
 import { PubSub } from '~/shared/pub-sub'
@@ -40,8 +41,11 @@ import * as OutboundAPI from '~/interface/outbound/api_interfaces'
 
 export interface BackendValidateConsentRequestsResponse {
   isValid: boolean
-  authChannels: OutboundAPI.Schemas.AuthChannels
-  authUri?: string
+  data: {
+    authChannels: OutboundAPI.Schemas.AuthChannels
+    authUri?: string
+  }
+  errorInformation?: fspiopAPI.Schemas.ErrorInformation
 }
 
 export interface BackendSendOTPRequest {

src/models/inbound/dfspConsentRequests.model.ts

@@ -34,7 +34,7 @@ import {
   thirdparty as tpAPI
 } from '@mojaloop/api-snippets'
 import inspect from '~/shared/inspect'
-import { reformatError } from '~/shared/util'
+import { reformatError, mkMojaloopFSPIOPError } from '~/shared/util'
 import {
   DFSPConsentRequestsData,
   DFSPConsentRequestsStateMachine,
@@ -88,11 +88,11 @@ export class DFSPConsentRequestsModel
       const response = await this.dfspBackendRequests.validateConsentRequests(request)
 
       if (!response) {
-        throw new Errors.MojaloopFSPIOPError('', '', '', Errors.MojaloopApiErrorCodes.TP_FSP_CONSENT_SCOPES_ERROR)
+        throw mkMojaloopFSPIOPError(Errors.MojaloopApiErrorCodes.TP_CONSENT_REQ_VALIDATION_ERROR)
       }
 
       if (!response.isValid) {
-        throw new Errors.MojaloopFSPIOPError('', '', '', Errors.MojaloopApiErrorCodes.TP_NO_SUPPORTED_SCOPE_ACTIONS)
+        throw mkMojaloopFSPIOPError(Errors.MojaloopApiErrorCodeFromCode(`${response.errorInformation?.errorCode}`))
       }
 
       this.data.response = response
@@ -102,13 +102,12 @@ export class DFSPConsentRequestsModel
       const consentRequestResponse = {
         scopes: request.scopes,
         callbackUri: request.callbackUri,
-        authChannels: response.authChannels,
-        authUri: response.authUri,
+        authChannels: response.data.authChannels,
+        authUri: response.data.authUri,
         initiatorId: toParticipantId
       } as consentRequestResponseType
       await this.thirdpartyRequests.putConsentRequests(request.id, consentRequestResponse, toParticipantId)
 
-
     } catch (error) {
       const mojaloopError = await reformatError(error)
 
@@ -130,7 +129,7 @@ export class DFSPConsentRequestsModel
     const { request, response } = this.data
 
     try {
-      const channel = [...response!.authChannels].pop()
+      const channel = [...response!.data.authChannels].pop()
       switch (channel) {
         case 'WEB': {
           await this.dfspBackendRequests.storeConsentRequests(request)

src/shared/util.ts

@@ -59,6 +59,18 @@ async function reformatError (err: Error): Promise<Errors.MojaloopApiErrorObject
   return new Errors.MojaloopFSPIOPError(err, '', '', mojaloopErrorCode).toApiErrorObject()
 }
 
+/**
+ * @function mkMojaloopFSPIOPError
+ * @description Helper function to create MojaloopFSPIOPError
+ * @param {MojaloopApiErrorCode} errorCode
+ * @returns {MojaloopFSPIOPError}
+ */
+function mkMojaloopFSPIOPError (errorCode: Errors.MojaloopApiErrorCode): Errors.MojaloopFSPIOPError {
+  // TODO: investigate passing non empty strings for other args
+  return new Errors.MojaloopFSPIOPError('', '', '', errorCode)
+}
+
 export {
-  reformatError
+  reformatError,
+  mkMojaloopFSPIOPError
 }

test/unit/data/mockData.json

@@ -214,25 +214,35 @@
     },
     "response": {
       "isValid": true,
-      "authChannels": [
-        "WEB"
-      ],
-      "authUri": "dfspa.com/authorize?consentRequestId=456"
+      "data": {
+        "authChannels": [
+          "WEB"
+        ],
+        "authUri": "dfspa.com/authorize?consentRequestId=456"
+      }
     },
     "responseOTP": {
       "isValid": true,
-      "authChannels": [
-        "OTP"
-      ]
+      "data": {
+        "authChannels": [
+          "OTP"
+        ]
+      }
     },
     "responseError": {
       "isValid": false,
-      "authChannels": []
+      "data": {},
+      "errorInformation": {
+        "errorCode": "7204",
+        "errorDescription": "FSP does not support any requested scope actions"
+      }
     },
     "responseErrorAuthChannel": {
-      "authChannels": [
-        "TEST"
-      ]
+      "data": {
+        "authChannels": [
+          "TEST"
+        ]
+      }
     },
     "otpRequest": {
       "consentRequestId": "b51ec534-ee48-4575-b6a9-ead2955b8069",

test/unit/models/inbound/dfspConsentRequests.model.test.ts

@@ -227,16 +227,16 @@ describe('dfspConsentRequestsModel', () => {
         await model.fsm.validateRequest()
         shouldNotBeExecuted()
       } catch (err) {
-        expect(err.apiErrorCode.code).toEqual('7207')
+        expect(err.apiErrorCode.code).toEqual('7208')
       }
 
       // check a PUT /consentsRequest/{ID}/error response was sent to source participant
       expect(modelConfig.thirdpartyRequests.putConsentRequestsError).toBeCalledWith(
         mockData.consentRequestsPutError.params.ID,
         {
           errorInformation: {
-            errorCode: '7207',
-            errorDescription: 'FSP failed retrieve scopes for consent request'
+            errorCode: '7208',
+            errorDescription: 'FSP failed to validate consent request'
           }
         },
         'pispa'

test/unit/shared/util.test.ts

@@ -24,11 +24,11 @@
  * Sridhar Voruganti <sridhar.voruganti@modusbox.com>
  --------------
  ******/
-import { reformatError } from '~/shared/util'
+import { reformatError, mkMojaloopFSPIOPError } from '~/shared/util'
 import { HTTPResponseError } from '~/shared/http-response-error'
 import { Errors } from '@mojaloop/sdk-standard-components'
-describe('shared/reformatError', (): void => {
 
+describe('shared/reformatError', (): void => {
   it('reformating of generic Error', async () => {
     const expected = {
       errorInformation: {
@@ -89,3 +89,10 @@ describe('shared/reformatError', (): void => {
   })
 
 })
+describe('shared/mkMojaloopFSPIOPError', (): void => {
+  it('mkMojaloopFSPIOPError', () => {
+    const errorObj = mkMojaloopFSPIOPError(Errors.MojaloopApiErrorCodeFromCode('7204'))
+    expect(errorObj.apiErrorCode.code).toEqual('7204')
+    expect(errorObj.apiErrorCode.message).toEqual('FSP does not support any requested scope actions')
+  })
+})