@mojaloop/sdk-scheme-adapter 12.1.0 → 12.2.0

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 # Changelog: [mojaloop/thirdparty-api-svc](https://github.com/mojaloop/thirdparty-api-svc)
+## [12.2.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v12.1.0...v12.2.0) (2022-04-21)
+
+
+### Features
+
+* port use payee FSPID as GET /parties destination header if provided ([#301](https://github.com/mojaloop/sdk-scheme-adapter/issues/301)) ([3ad0ba5](https://github.com/mojaloop/sdk-scheme-adapter/commit/3ad0ba5f745b459ff6d9484c83ac3f384faf34b2))
+
 ## [12.1.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v12.0.2...v12.1.0) (2022-04-21)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "12.1.0",
+  "version": "12.2.0",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/lib/model/OutboundBulkQuotesModel.js

@@ -115,7 +115,7 @@ class OutboundBulkQuotesModel {
 
             case 'requestBulkQuote':
                 return this._requestBulkQuote();
-            
+
             case 'getBulkQuote':
                 return this._getBulkQuote(this.data.bulkQuoteId);
 
@@ -266,7 +266,7 @@ class OutboundBulkQuotesModel {
             };
 
             individualQuote.note && (quote.note = individualQuote.note);
-            
+
             if (individualQuote.extensions && individualQuote.extensions.length > 0) {
                 bulkQuoteRequest.extensionList = {
                     extension: individualQuote.extensions
@@ -440,7 +440,7 @@ class OutboundBulkQuotesModel {
                     await this.stateMachine.requestBulkQuote();
                     this._logger.log(`Quotes resolved for bulk quote ${this.data.bulkQuoteId}`);
                     break;
-                
+
                 case 'getBulkQuote':
                     await this.stateMachine.getBulkQuote();
                     this._logger.log(`Get bulk quote ${this.data.bulkQuoteId} has been completed`);

package/src/lib/model/OutboundBulkTransfersModel.js

@@ -257,7 +257,7 @@ class OutboundBulkTransfersModel {
                 ilpPacket: individualTransfer.ilpPacket,
                 condition: individualTransfer.condition,
             };
-            
+
             if (individualTransfer.extensions && individualTransfer.extensions.length > 0) {
                 bulkTransferRequest.extensionList = {
                     extension: individualTransfer.extensions

package/src/lib/model/OutboundRequestToPayModel.js

@@ -297,7 +297,7 @@ class OutboundRequestToPayModel {
                     this._logger.push({ transactionRequestResponse }).log('Transaction Request Response received');
                     this.data.requestToPayState = transactionRequestResponse.transactionRequestState;
 
-                    
+
                     return resolve(transactionRequestResponse);
                 }
                 catch(err) {

package/src/lib/model/OutboundRequestToPayTransferModel.js

@@ -145,7 +145,7 @@ class OutboundRequestToPayTransferModel {
                         }
                     }
                     break;
-                
+
                 case 'otpReceived':
                     // next transition is executeTransfer
                     await this.stateMachine.executeTransfer();
@@ -230,7 +230,7 @@ class OutboundRequestToPayTransferModel {
     }
 
     /**
-     * This method is used to communicate back to the Payee that a rejection is being 
+     * This method is used to communicate back to the Payee that a rejection is being
      * sent because the OTP did not match.
      */
     async rejectRequestToPay() {
@@ -241,7 +241,7 @@ class OutboundRequestToPayTransferModel {
         const response = {
             status : `${this.data.requestToPayTransactionId} has been REJECTED`
         };
-        return JSON.stringify(response);      
+        return JSON.stringify(response);
     }
 
 
@@ -471,7 +471,7 @@ class OutboundRequestToPayTransferModel {
     }
 
     /**
-     * Sends request for 
+     * Sends request for
      * Starts the quote resolution process by sending a POST /quotes request to the switch;
      * then waits for a notification from the cache that the quote response has been received
      */
@@ -480,7 +480,7 @@ class OutboundRequestToPayTransferModel {
         return new Promise(async (resolve, reject) => {
 
             if( this.data.initiatorType && this.data.initiatorType === 'BUSINESS') return resolve();
-            
+
             // listen for events on the quoteId
             const otpKey = `otp_${this.data.requestToPayTransactionId}`;
 
@@ -501,9 +501,9 @@ class OutboundRequestToPayTransferModel {
 
                     const otpResponseBody = otpResponse.data;
                     this._logger.push({ otpResponseBody }).log('OTP response received');
-                    
+
                     this.data.otpResponse = otpResponseBody;
-                    
+
                     return resolve(otpResponse);
                 }
                 catch(err) {
@@ -587,7 +587,7 @@ class OutboundRequestToPayTransferModel {
         return quote;
     }
 
-    
+
     /**
      * Executes a transfer
      * Starts the transfer process by sending a POST /transfers (prepare) request to the switch;
@@ -886,7 +886,7 @@ class OutboundRequestToPayTransferModel {
     }
 
 
-    
+
 }
 
 

package/src/lib/model/OutboundTransfersModel.js

@@ -277,7 +277,7 @@ class OutboundTransfersModel {
             // a GET /parties request to the switch
             try {
                 const res = await this._requests.getParties(this.data.to.idType, this.data.to.idValue,
-                    this.data.to.idSubValue);
+                    this.data.to.idSubValue, this.data.to.fspId);
                 this._logger.push({ peer: res }).log('Party lookup sent to peer');
             }
             catch(err) {

package/src/lib/model/lib/shared.js

@@ -68,7 +68,7 @@ const mojaloopPartyToInternalParty = (external) => {
         internal.idType = external.partyIdInfo.partyIdType;
         internal.idValue = external.partyIdInfo.partyIdentifier;
         internal.idSubValue = external.partyIdInfo.partySubIdOrType;
-        // Note: we dont map fspid to internal transferParty object
+        internal.fspId = external.partyIdInfo.fspId;
         if(external.partyIdInfo.extensionList){
             internal.extensionList = external.partyIdInfo.extensionList.extension;
         }
@@ -109,6 +109,7 @@ const mojaloopPartyIdInfoToInternalPartyIdInfo = (external) => {
     internal.idType = external.partyIdType;
     internal.idValue = external.partyIdentifier;
     internal.idSubValue = external.partySubIdOrType;
+    internal.fspId = external.fspId;
 
     return internal;
 };
@@ -411,19 +412,19 @@ const mojaloopBulkPrepareToInternalBulkTransfer = (external, bulkQuotes, ilp) =>
     if (bulkQuotes) {
         // create a map of internal individual quotes payees indexed by quotedId, for faster lookup
         const internalQuotesPayeesByQuoteId = {};
-        
+
         for (const quote of bulkQuotes.internalRequest.individualQuotes) {
             internalQuotesPayeesByQuoteId[quote.quoteId] = quote.to;
         }
-        
+
         // create a map of external individual transfers indexed by quotedId, for faster lookup
         const externalTransferIdsByQuoteId = {};
-        
+
         for (const transfer of external.individualTransfers) {
             const transactionObject = ilp.getTransactionObject(transfer.ilpPacket);
             externalTransferIdsByQuoteId[transactionObject.quoteId] = transfer.transferId;
         }
-        
+
         internal = {
             bulkTransferId: external.bulkTransferId,
             bulkQuotes: bulkQuotes.response,

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

@@ -354,6 +354,39 @@ describe('outboundModel', () => {
         expect(StateMachine.__instance.state).toBe('payeeResolved');
     });
 
+    test('uses payee party fspid as source header when supplied - resolving payee', async () => {
+        config.autoAcceptParty = false;
+
+        const model = new Model({
+            cache,
+            logger,
+            ...config,
+        });
+
+        let req = JSON.parse(JSON.stringify(transferRequest));
+        const testFspId = 'TESTDESTFSPID';
+        req.to.fspId = testFspId;
+
+        await model.initialize(req);
+
+        expect(StateMachine.__instance.state).toBe('start');
+
+        // start the model running
+        const resultPromise = model.run();
+
+        // now we started the model running we simulate a callback with the resolved party
+        emitPartyCacheMessage(cache, payeeParty);
+
+        // wait for the model to reach a terminal state
+        const result = await resultPromise;
+
+        // check we stopped at payeeResolved state
+        expect(result.currentState).toBe('WAITING_FOR_PARTY_ACCEPTANCE');
+        expect(StateMachine.__instance.state).toBe('payeeResolved');
+
+        // check getParties mojaloop requests method was called with the correct arguments
+        expect(MojaloopRequests.__getParties).toHaveBeenCalledWith(req.to.idType, req.to.idValue, req.to.idSubValue, testFspId);
+    });
 
     test('halts after resolving payee, resumes and then halts after receiving quote response when AUTO_ACCEPT_PARTY is false and AUTO_ACCEPT_QUOTES is false', async () => {
         config.autoAcceptParty = false;