@mojaloop/sdk-scheme-adapter 11.18.9 → 12.0.0

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [12.0.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v11.18.12...v12.0.0) (2022-03-18)
+
+
+### ⚠ BREAKING CHANGES
+
+* update typescript interfaces using latest api-snippets (#297)
+
+### Refactors
+
+* update typescript interfaces using latest api-snippets ([#297](https://github.com/mojaloop/sdk-scheme-adapter/issues/297)) ([9a72083](https://github.com/mojaloop/sdk-scheme-adapter/commit/9a7208372976297a307a57478fb339b4ebbdc790))
+
+### [11.18.12](https://github.com/mojaloop/sdk-scheme-adapter/compare/v11.18.11...v11.18.12) (2022-02-15)
+
+
+### Chore
+
+* add config option for mismatch id's ([#291](https://github.com/mojaloop/sdk-scheme-adapter/issues/291)) ([8e9717a](https://github.com/mojaloop/sdk-scheme-adapter/commit/8e9717a02c6d19f93b78f5b293917050be0ade84))
+
+### [11.18.11](https://github.com/mojaloop/sdk-scheme-adapter/compare/v11.18.9...v11.18.11) (2021-11-25)
+
 ### [11.18.9](https://github.com/mojaloop/sdk-scheme-adapter/compare/v11.18.8...v11.18.9) (2021-10-20)
 
 ### [11.18.8](https://github.com/mojaloop/sdk-scheme-adapter/compare/v11.18.7...v11.18.8) (2021-09-16)

package/OutboundServer/api_interfaces/index.d.ts

@@ -83,9 +83,6 @@ export declare namespace Schemas {
   type accountsCreationState = components['schemas']['accountsCreationState'];
   type accountsResponse = components['schemas']['accountsResponse'];
   type errorAccountsResponse = components['schemas']['errorAccountsResponse'];
-  type AccountAddress = components['schemas']['AccountAddress'];
-  type Account = components['schemas']['Account'];
-  type AccountList = components['schemas']['AccountList'];
   type PartyIdInfo = components['schemas']['PartyIdInfo'];
   type PartyName = components['schemas']['PartyName'];
   type PartyComplexName = components['schemas']['PartyComplexName'];
@@ -101,17 +98,4 @@ export declare namespace Schemas {
   type simpleTransfersPostRequest = components['schemas']['simpleTransfersPostRequest'];
   type simpleTransfersPostResponse = components['schemas']['simpleTransfersPostResponse'];
   type errorSimpleTransfersResponse = components['schemas']['errorSimpleTransfersResponse'];
-  type AuthorizationChannelType = components['schemas']['AuthorizationChannelType'];
-  type Integer = components['schemas']['Integer'];
-  type AuthorizationsPostRequest = components['schemas']['AuthorizationsPostRequest'];
-  type authorizationsPostRequest = components['schemas']['authorizationsPostRequest'];
-  type OtpValue = components['schemas']['OtpValue'];
-  type QRCODE = components['schemas']['QRCODE'];
-  type U2FPIN = components['schemas']['U2FPIN'];
-  type U2FPinValue = components['schemas']['U2FPinValue'];
-  type AuthenticationValue = components['schemas']['AuthenticationValue'];
-  type AuthenticationInfo = components['schemas']['AuthenticationInfo'];
-  type AuthorizationResponseType = components['schemas']['AuthorizationResponseType'];
-  type authorizationsPostResponse = components['schemas']['authorizationsPostResponse'];
-  type errorAuthorizationsResponse = components['schemas']['errorAuthorizationsResponse'];
-}
+}

package/OutboundServer/api_template/components/schemas/accountCreationStatus.yaml

@@ -7,7 +7,7 @@ items:
   properties:
     idType:
       $ref: >-
-        ../../../../node_modules/@mojaloop/api-snippets/thirdparty/openapi3/components/schemas/PartyIdType.yaml
+        ../../../../node_modules/@mojaloop/api-snippets/thirdparty/v1_0/openapi3/components/schemas/PartyIdType.yaml
     idValue:
       $ref: >-
         ../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/PartyIdentifier.yaml

package/OutboundServer/api_template/components/schemas/accountsRequest.yaml

@@ -8,7 +8,7 @@ items:
   properties:
     idType:
       $ref: >-
-        ../../../../node_modules/@mojaloop/api-snippets/thirdparty/openapi3/components/schemas/PartyIdType.yaml
+        ../../../../node_modules/@mojaloop/api-snippets/thirdparty/v1_0/openapi3/components/schemas/PartyIdType.yaml
     idValue:
       $ref: >-
         ../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/PartyIdentifier.yaml

package/OutboundServer/api_template/components/schemas/partiesByIdResponse.yaml

@@ -4,10 +4,10 @@
   properties:
     party:
       $ref: >-
-        ../../../../node_modules/@mojaloop/api-snippets/thirdparty/openapi3/components/schemas/Party.yaml
+        ../../../../node_modules/@mojaloop/api-snippets/thirdparty/v1_0/openapi3/components/schemas/Party.yaml
       description: Information regarding the requested Party.
     currentState:
       $ref: ../schemas/async2SyncCurrentState.yaml
   required:
     - party
-    - currentState
+    - currentState

package/OutboundServer/api_template/components/schemas/quotesPostRequest.yaml

@@ -1,13 +1,13 @@
 title: QuotesPostRequest
 type: object
 properties:
-  fspId: 
+  fspId:
     title: destination DFSP requested to calculate the quote
     $ref: >-
       ../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/FspId.yaml
   quotesPostRequest:
     $ref: >-
-      ../../../../node_modules/@mojaloop/api-snippets/thirdparty/openapi3/components/schemas/QuotesPostRequest.yaml
-required: 
+      ../../../../node_modules/@mojaloop/api-snippets/thirdparty/v1_0/openapi3/components/schemas/QuotesPostRequest.yaml
+required:
   - fspId
   - quotesPostRequest

package/OutboundServer/api_template/components/schemas/transferParty.yaml

@@ -8,7 +8,7 @@ properties:
       ../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/TransactionInitiatorType.yaml
   idType:
     $ref: >-
-      ../../../../node_modules/@mojaloop/api-snippets/thirdparty/openapi3/components/schemas/PartyIdType.yaml
+      ../../../../node_modules/@mojaloop/api-snippets/thirdparty/v1_0/openapi3/components/schemas/PartyIdType.yaml
   idValue:
     $ref: >-
       ../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/PartyIdentifier.yaml

package/audit-resolve.json

@@ -138,6 +138,257 @@
       "decision": "ignore",
       "madeAt": 1634716081521,
       "expiresAt": 1637308004771
+    },
+    "1004946|@mojaloop/event-sdk>@grpc/proto-loader>yargs>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879175753,
+      "expiresAt": 1647471172307
+    },
+    "1004946|@mojaloop/central-services-shared>widdershins>oas-resolver>yargs>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879175753,
+      "expiresAt": 1647471172307
+    },
+    "1004946|@mojaloop/central-services-shared>widdershins>oas-resolver>yargs>cliui>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879175753,
+      "expiresAt": 1647471172307
+    },
+    "1004946|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-resolver>yargs>cliui>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879175753,
+      "expiresAt": 1647471172307
+    },
+    "1004946|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-validator>oas-resolver>yargs>cliui>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879175754,
+      "expiresAt": 1647471172307
+    },
+    "1004946|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-validator>oas-resolver>yargs>cliui>wrap-ansi>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879175754,
+      "expiresAt": 1647471172307
+    },
+    "1004946|@mojaloop/event-sdk>@grpc/proto-loader>yargs>cliui>wrap-ansi>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879175754,
+      "expiresAt": 1647471172307
+    },
+    "1004946|@mojaloop/central-services-shared>widdershins>oas-resolver>yargs>cliui>wrap-ansi>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879175754,
+      "expiresAt": 1647471172307
+    },
+    "1004946|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-resolver>yargs>cliui>wrap-ansi>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879175754,
+      "expiresAt": 1647471172307
+    },
+    "1004946|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-validator>oas-resolver>yargs>cliui>wrap-ansi>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879175754,
+      "expiresAt": 1647471172307
+    },
+    "1004946|@mojaloop/event-sdk>@grpc/proto-loader>yargs>cliui>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879175754,
+      "expiresAt": 1647471172307
+    },
+    "1004854|@mojaloop/central-services-shared>widdershins>openapi-sampler>json-pointer": {
+      "decision": "ignore",
+      "madeAt": 1644879153322,
+      "expiresAt": 1647471110577
+    },
+    "1004869|@mojaloop/central-services-shared>widdershins>swagger2openapi>better-ajv-errors>jsonpointer": {
+      "decision": "ignore",
+      "madeAt": 1644879154472,
+      "expiresAt": 1647471110577
+    },
+    "1004869|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-validator>better-ajv-errors>jsonpointer": {
+      "decision": "ignore",
+      "madeAt": 1644879154472,
+      "expiresAt": 1647471110577
+    },
+    "1004946|@mojaloop/central-services-shared>widdershins>yargs>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879155619,
+      "expiresAt": 1647471110577
+    },
+    "1004946|@mojaloop/central-services-shared>widdershins>yargs>cliui>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1644879155619,
+      "expiresAt": 1647471110577
+    },
+    "1005383|@mojaloop/central-services-shared>shins>sanitize-html": {
+      "decision": "ignore",
+      "madeAt": 1644879156746,
+      "expiresAt": 1647471110577
+    },
+    "1005384|@mojaloop/central-services-shared>shins>sanitize-html": {
+      "decision": "ignore",
+      "madeAt": 1644879156746,
+      "expiresAt": 1647471110577
+    },
+    "1005534|@mojaloop/central-services-shared>widdershins>yargs>yargs-parser": {
+      "decision": "ignore",
+      "madeAt": 1644879157837,
+      "expiresAt": 1647471110577
+    },
+    "1006865|axios>follow-redirects": {
+      "decision": "fix",
+      "madeAt": 1644879138577
+    },
+    "1006865|@mojaloop/central-services-shared>axios>follow-redirects": {
+      "decision": "fix",
+      "madeAt": 1644879138577
+    },
+    "1007023|axios>follow-redirects": {
+      "decision": "fix",
+      "madeAt": 1644879138577
+    },
+    "1007023|@mojaloop/central-services-shared>axios>follow-redirects": {
+      "decision": "fix",
+      "madeAt": 1644879138577
+    },
+    "1006899|@mojaloop/central-services-shared>widdershins>node-fetch": {
+      "decision": "fix",
+      "madeAt": 1644879149946
+    },
+    "1006899|@mojaloop/event-sdk>grpc>@mapbox/node-pre-gyp>node-fetch": {
+      "decision": "fix",
+      "madeAt": 1644879149946
+    },
+    "1006846|@mojaloop/central-services-shared>shins>sanitize-html>postcss": {
+      "decision": "ignore",
+      "madeAt": 1644879158938,
+      "expiresAt": 1647471110577
+    },
+    "1006886|@mojaloop/central-services-shared>shins>markdown-it": {
+      "decision": "ignore",
+      "madeAt": 1644879160175,
+      "expiresAt": 1647471110577
+    },
+    "1007017|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-validator>ajv": {
+      "decision": "ignore",
+      "madeAt": 1644879161354,
+      "expiresAt": 1647471110577
+    },
+    "1064587|@mojaloop/central-services-shared>widdershins>urijs": {
+      "decision": "fix",
+      "madeAt": 1647565572809
+    },
+    "1064606|@mojaloop/central-services-shared>widdershins>urijs": {
+      "decision": "fix",
+      "madeAt": 1647565572809
+    },
+    "1067233|@mojaloop/central-services-shared>widdershins>urijs": {
+      "decision": "fix",
+      "madeAt": 1647565572809
+    },
+    "1064843|@mojaloop/event-sdk>@grpc/proto-loader>yargs>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565608486,
+      "expiresAt": 1650157604921
+    },
+    "1064843|@mojaloop/central-services-shared>widdershins>oas-resolver>yargs>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565608486,
+      "expiresAt": 1650157604921
+    },
+    "1064843|@mojaloop/central-services-shared>widdershins>oas-resolver>yargs>cliui>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565608486,
+      "expiresAt": 1650157604921
+    },
+    "1064843|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-resolver>yargs>cliui>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565608486,
+      "expiresAt": 1650157604921
+    },
+    "1064843|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-validator>oas-resolver>yargs>cliui>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565608486,
+      "expiresAt": 1650157604921
+    },
+    "1064843|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-validator>oas-resolver>yargs>cliui>wrap-ansi>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565608486,
+      "expiresAt": 1650157604921
+    },
+    "1064843|@mojaloop/event-sdk>@grpc/proto-loader>yargs>cliui>wrap-ansi>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565608486,
+      "expiresAt": 1650157604921
+    },
+    "1064843|@mojaloop/central-services-shared>widdershins>oas-resolver>yargs>cliui>wrap-ansi>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565608486,
+      "expiresAt": 1650157604921
+    },
+    "1064843|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-resolver>yargs>cliui>wrap-ansi>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565608486,
+      "expiresAt": 1650157604921
+    },
+    "1064843|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-validator>oas-resolver>yargs>cliui>wrap-ansi>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565608487,
+      "expiresAt": 1650157604921
+    },
+    "1064843|@mojaloop/event-sdk>@grpc/proto-loader>yargs>cliui>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565608487,
+      "expiresAt": 1650157604921
+    },
+    "1064661|@mojaloop/central-services-shared>shins>markdown-it": {
+      "decision": "ignore",
+      "madeAt": 1647565592292,
+      "expiresAt": 1650157555692
+    },
+    "1064744|@mojaloop/central-services-shared>widdershins>openapi-sampler>json-pointer": {
+      "decision": "ignore",
+      "madeAt": 1647565593879,
+      "expiresAt": 1650157555692
+    },
+    "1064761|@mojaloop/central-services-shared>widdershins>swagger2openapi>better-ajv-errors>jsonpointer": {
+      "decision": "ignore",
+      "madeAt": 1647565594838,
+      "expiresAt": 1650157555692
+    },
+    "1064761|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-validator>better-ajv-errors>jsonpointer": {
+      "decision": "ignore",
+      "madeAt": 1647565594838,
+      "expiresAt": 1650157555692
+    },
+    "1064843|@mojaloop/central-services-shared>widdershins>yargs>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565599016,
+      "expiresAt": 1650157555692
+    },
+    "1064843|@mojaloop/central-services-shared>widdershins>yargs>cliui>string-width>strip-ansi>ansi-regex": {
+      "decision": "ignore",
+      "madeAt": 1647565599016,
+      "expiresAt": 1650157555692
+    },
+    "1065159|@mojaloop/central-services-shared>widdershins>swagger2openapi>oas-validator>ajv": {
+      "decision": "ignore",
+      "madeAt": 1647565600359,
+      "expiresAt": 1650157555692
+    },
+    "1065367|@mojaloop/central-services-shared>shins>sanitize-html": {
+      "decision": "ignore",
+      "madeAt": 1647565601450,
+      "expiresAt": 1650157555692
+    },
+    "1065368|@mojaloop/central-services-shared>shins>sanitize-html": {
+      "decision": "ignore",
+      "madeAt": 1647565601450,
+      "expiresAt": 1650157555692
+    },
+    "1065523|@mojaloop/central-services-shared>widdershins>yargs>yargs-parser": {
+      "decision": "ignore",
+      "madeAt": 1647565602524,
+      "expiresAt": 1650157555692
     }
   },
   "rules": {},

package/config.js

@@ -154,5 +154,10 @@ module.exports = {
     proxyConfig: env.get('PROXY_CONFIG_PATH').asYamlConfig(),
     reserveNotification: env.get('RESERVE_NOTIFICATION').default('false').asBool(),
     // resourceVersions config should be string in format: "resouceOneName=1.0,resourceTwoName=1.1"
-    resourceVersions: env.get('RESOURCE_VERSIONS').default('').asResourceVersions()
+    resourceVersions: env.get('RESOURCE_VERSIONS').default('').asResourceVersions(),
+
+    // in 3PPI DFSP's generate their own `transferId` which is associated with
+    // a transactionRequestId. this option decodes the ilp packet for
+    // the `transactionId` to retrieve the quote from cache
+    allowDifferentTransferTransactionId: env.get('ALLOW_DIFFERENT_TRANSFER_TRANSACTION_ID').default('false').asBool(),
 };

package/lib/model/InboundTransfersModel.js

@@ -34,6 +34,7 @@ class InboundTransfersModel {
         this._rejectTransfersOnExpiredQuotes = config.rejectTransfersOnExpiredQuotes;
         this._allowTransferWithoutQuote = config.allowTransferWithoutQuote;
         this._reserveNotification = config.reserveNotification;
+        this._allowDifferentTransferTransactionId = config.allowDifferentTransferTransactionId;
 
         this._mojaloopRequests = new MojaloopRequests({
             logger: this._logger,
@@ -175,7 +176,7 @@ class InboundTransfersModel {
                 response.expiration = new Date(expiration).toISOString();
             }
 
-            // project our internal quote reponse into mojaloop quote response form
+            // project our internal quote response into mojaloop quote response form
             const mojaloopResponse = shared.internalQuoteResponseToMojaloop(response);
 
             // create our ILP packet and condition and tag them on to our internal quote response
@@ -193,7 +194,7 @@ class InboundTransfersModel {
                 fulfilment: fulfilment
             });
 
-            // now store the quoteRespnse data against the quoteId in our cache to be sent as a response to GET /quotes/{ID}
+            // now store the quoteResponse data against the quoteId in our cache to be sent as a response to GET /quotes/{ID}
             await this._cache.set(`quoteResponse_${quoteRequest.quoteId}`, mojaloopResponse);
 
             // make a callback to the source fsp with the quote response
@@ -209,21 +210,21 @@ class InboundTransfersModel {
     }
 
     /**
-     * This is executed as when GET /quotes/{ID} request is made to get the response of a previous POST /quotes request. 
+     * This is executed as when GET /quotes/{ID} request is made to get the response of a previous POST /quotes request.
      * Gets the quoteResponse from the cache and makes a callback to the originator with result
      */
     async getQuoteRequest(quoteId, sourceFspId) {
         try {
             // Get the quoteRespnse data for the quoteId from the cache to be sent as a response to GET /quotes/{ID}
             const quoteResponse = await this._cache.get(`quoteResponse_${quoteId}`);
-            
+
             // If no quoteResponse is found in the cache, make an error callback to the source fsp
             if (!quoteResponse) {
                 const err = new Error('Quote Id not found');
                 const mojaloopError = await this._handleError(err, Errors.MojaloopApiErrorCodes.QUOTE_ID_NOT_FOUND);
                 this._logger.push({ mojaloopError }).log(`Sending error response to ${sourceFspId}`);
                 return await this._mojaloopRequests.putQuotesError(quoteId,
-                    mojaloopError, sourceFspId); 
+                    mojaloopError, sourceFspId);
             }
             // Make a PUT /quotes/{ID} callback to the source fsp with the quote response
             return this._mojaloopRequests.putQuotes(quoteId, quoteResponse, sourceFspId);
@@ -270,14 +271,20 @@ class InboundTransfersModel {
 
 
     /**
-     * Validates  an incoming transfer prepare request and makes a callback to the originator with
+     * Validates an incoming transfer prepare request and makes a callback to the originator with
      * the result
      */
     async prepareTransfer(prepareRequest, sourceFspId) {
         try {
-
             // retrieve our quote data
-            const quote = await this._cache.get(`quote_${prepareRequest.transferId}`);
+            let quote;
+
+            if (this._allowDifferentTransferTransactionId) {
+                const transactionId = this._ilp.getTransactionObject(prepareRequest.ilpPacket).transactionId;
+                quote = await this._cache.get(`quote_${transactionId}`);
+            } else {
+                quote = await this._cache.get(`quote_${prepareRequest.transferId}`);
+            }
 
             if(!quote) {
                 // Check whether to allow transfers without a previous quote.
@@ -703,7 +710,7 @@ class InboundTransfersModel {
     }
 
     /**
-    * Forwards Switch notification for fulfiled transfer to the DFSP backend, when acting as a payee 
+    * Forwards Switch notification for fulfiled transfer to the DFSP backend, when acting as a payee
     */
     async sendNotificationToPayee(body, transferId) {
         try {

package/lib/model/OutboundBulkQuotesModel.js

@@ -44,6 +44,7 @@ class OutboundBulkQuotesModel {
             jwsSign: config.jwsSign,
             jwsSigningKey: config.jwsSigningKey,
             wso2: config.wso2,
+            resourceVersions: config.resourceVersions,
         });
     }
 

package/lib/model/OutboundBulkTransfersModel.js

@@ -43,6 +43,7 @@ class OutboundBulkTransfersModel {
             jwsSignPutParties: config.jwsSignPutParties,
             jwsSigningKey: config.jwsSigningKey,
             wso2: config.wso2,
+            resourceVersions: config.resourceVersions,
         });
     }
 

package/lib/model/OutboundTransfersModel.js

@@ -56,6 +56,7 @@ class OutboundTransfersModel {
             jwsSignPutParties: config.jwsSignPutParties,
             jwsSigningKey: config.jwsSigningKey,
             wso2: config.wso2,
+            resourceVersions: config.resourceVersions,
         });
 
         this._ilp = new Ilp({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "11.18.9",
+  "version": "12.0.0",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -49,6 +49,12 @@
     "type": "git",
     "url": "git@github.com:mojaloop/sdk-scheme-adapter.git"
   },
+  "@comment dependencies": [
+    "koa2-oauth-server is an old unmaintained repo. It uses the now unsupported git protocol.",
+    "Please see https://github.blog/2021-09-01-improving-git-protocol-security-github/ for more information.",
+    "If you regenerate package-lock.json, you will manually have to update `git://` to `https://` on its",
+    "dependencies."
+  ],
   "dependencies": {
     "@koa/cors": "^3.1.0",
     "@mojaloop/central-services-error-handling": "11.3.0",
@@ -57,7 +63,7 @@
     "@mojaloop/central-services-metrics": "11.0.0",
     "@mojaloop/central-services-shared": "14.0.0",
     "@mojaloop/event-sdk": "10.7.1",
-    "@mojaloop/sdk-standard-components": "15.13.0",
+    "@mojaloop/sdk-standard-components": "^16.0.0",
     "ajv": "8.6.3",
     "ajv-keywords": "5.0.0",
     "axios": "^0.21.4",
@@ -79,7 +85,7 @@
   "devDependencies": {
     "@babel/core": "^7.15.5",
     "@babel/preset-env": "^7.15.6",
-    "@mojaloop/api-snippets": "^13.0.3",
+    "@mojaloop/api-snippets": "^13.0.9",
     "@redocly/openapi-cli": "^1.0.0-beta.59",
     "@types/jest": "^27.0.1",
     "babel-jest": "^27.2.0",

package/test/unit/lib/model/InboundTransfersModel.test.js

@@ -21,6 +21,7 @@ const mockTxnReqquestsArguments = require('./data/mockTxnRequestsArguments');
 const { MojaloopRequests, Ilp, Logger } = require('@mojaloop/sdk-standard-components');
 const { BackendRequests, HTTPResponseError } = require('../../../../lib/model/lib/requests');
 const Cache = require('../../../../lib/cache');
+const shared = require('../../../../lib/model/lib/shared');
 
 const getTransfersBackendResponse = require('./data/getTransfersBackendResponse');
 const getTransfersMojaloopResponse = require('./data/getTransfersMojaloopResponse');
@@ -232,9 +233,9 @@ describe('inboundModel', () => {
 
         test('calls `mojaloopRequests.putAuthorizations` with the expected arguments.', async () => {
             await model.getAuthorizations('123456', mockTxnReqArgs.fspId);
-            
+
             expect(MojaloopRequests.__putAuthorizations).toHaveBeenCalledTimes(1);
-            
+
         });
 
 
@@ -406,6 +407,43 @@ describe('inboundModel', () => {
             expect(BackendRequests.__postTransfers).toHaveBeenCalledTimes(1);
             expect(MojaloopRequests.__putTransfers).toHaveBeenCalledTimes(1);
         });
+
+        test('allow different transfer and transaction id', async () => {
+            const transactionId = 'mockTransactionId';
+            const TRANSFER_ID = 'transfer-id';
+            shared.mojaloopPrepareToInternalTransfer = jest.fn().mockReturnValueOnce({});
+
+            cache.set(`quote_${transactionId}`, {
+                fulfilment: '',
+                mojaloopResponse: {
+                    response: ''
+                }
+            });
+
+            const args = {
+                transferId: TRANSFER_ID,
+                amount: {
+                    currency: 'USD',
+                    amount: 20.13
+                },
+                ilpPacket: 'mockIlpPacket',
+                condition: 'mockGeneratedCondition'
+            };
+
+            const model = new Model({
+                ...config,
+                cache,
+                logger,
+                allowDifferentTransferTransactionId: true,
+                checkIlp: false,
+            });
+
+            await model.prepareTransfer(args, mockArgs.fspId);
+
+            expect(MojaloopRequests.__putTransfersError).toHaveBeenCalledTimes(0);
+            expect(BackendRequests.__postTransfers).toHaveBeenCalledTimes(1);
+            expect(MojaloopRequests.__putTransfers).toHaveBeenCalledTimes(1);
+        });
     });
 
     describe('prepareBulkTransfer:', () => {
@@ -574,7 +612,7 @@ describe('inboundModel', () => {
                     }
                 ]
             };
-            
+
             const model = new Model({
                 ...config,
                 cache,
@@ -595,7 +633,7 @@ describe('inboundModel', () => {
         const transferId = '1234';
         let cache;
 
-        beforeEach(async () => { 
+        beforeEach(async () => {
             cache = new Cache({
                 host: 'dummycachehost',
                 port: 1234,