chore: sync pisp/master to v11.10.1 #237

kleyow · 2020-12-31T05:08:19Z

No description provided.

…int_env_name Renamed ALS_ENDPOINT_HOST to ALS_ENDPOINT

* Initial commit for bulk transfers support * Initial commit for bulk quotes and bulkt transfers support * Complete inbound API bulk quotes implementation * Separate bulk quotes switch base URL * Add postTransfers and getBulkTransfers * Update Outbound API spec with bulk transfers endpoints * Update outbound API spec * Add outbound bulk transfers * Fix API spec bugs * Add bulk party lookup * Whitespace fixes * Add outbound bulk quotes requests * Remove used imports * Add outbound POST bulk transfers handler * Add outboud GET /bulkTransfers/{ID} * Add Jest config for test debugging * Add unit tests for bulk quotes and bulk transfers * Add tests for outbound API. Fix missing specs entries. * Add tests for outbound API /bulkQuotes abd /bulkTransfers * Add inbound GET /bulkQuotes/{ID} * Add unit tests for inbound GET bulkQuotesById, PUT bulkQuotesById, PUT bulkQuotesErrorById * Fix spec description for /bulkTransfers and variable initialization in InboundTransfersModel * Remove unreferenced spec entry. * Updates per code review * Updates per code review * Updates per code review * Add more unit tests for InboundTransfersModel. Mor code review changes * Remodel bulk quotes using single state state-machine pattern * Remodel bulk transfers using state machine pattern. Add GET bulk quotes endpoint * Update API spec * Fix tests * Add more unit tests for InboundTransfersModel * Add unit tests for OutboundBulkQuotesModel * Add tests for OutboundBulkTransfersModel * Fix linting issue * PR review updates. * Remove some IDE auto inserted whitespaces * PR review update Co-authored-by: Sam <10507686+elnyry-sam-k@users.noreply.github.com>

#1386: Bug fixes

…feature/#1462-request-for-notif

* requests now respond with .data instead of .body * Fixed test. Fixed (not in the broken sense, but sort of) package version.

…feature/#1462-request-for-notif

Do not JSON parse already-parsed response data

…n in test mode. Tidied up websocket server creation. Removed koa-websocket and added ws.

#1386: Update sdk-standard-component

…ver-constructor Refactored OAuth test server constructor

…ndard-components-functionality Incorporated new sdk-standard-components functionality into SDK

Run all tests

Log request retries

…e-env-vars Remove redundant example env vars

fixed config refactoring issue

* Added GET /quotes{ID} * added the error callback * update readme

…pe}/{ID}/{SubId}/error (mojaloop#233) * Added GET /quotes{ID} * added PUT /participants * merge master * delete accidentally added files

CLAassistant · 2020-12-31T05:08:28Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
6 out of 7 committers have signed the CLA.

✅ vgenev
✅ msk-
✅ vijayg10
✅ bushjames
✅ kleyow
✅ shashi165
❌ Valentin

Valentin seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

kleyow · 2021-01-03T19:46:29Z

src/lib/model/OutboundAuthorizationsModel.js

            // where this event is fired but only if env ENABLE_PISP_MODE=true
            subId = await cache.subscribe(channel, async (channel, message, sid) => {
-                try { 
+                try {
                    const parsed = JSON.parse(message);
                    this.context.data = {
                        ...parsed,


@eoln is this supposed to be ...parsed or ...parsed.data?
It doesn't line up with the test found at

sdk-scheme-adapter/src/test/unit/lib/model/OutboundAuthorizationsModel.test.js

Line 146 in 734e0fa

const message = {

sdk-scheme-adapter/src/test/unit/lib/model/OutboundAuthorizationsModel.test.js

Line 167 in 734e0fa

expect(model.context.data).toEqual({

I'm not sure how we want to store the message or if it's the test that's faulty. It's creating a false positive since the expect(...) is run after an asyncronyous function. (Which is an issue of itself, feel like that was discussed at one point)

I vote we follow up on this maybe in a different PR since it's a little out of context for this merge ticket.

nice finding @kleyow

themessage is published to the channel here:

sdk-scheme-adapter/src/InboundServer/handlers.js

Line 339 in 734e0fa

await ctx.state.cache.publish(authorizationChannel, {

so model.context.data will store the whole published message and request payload body will be model.context.data.data

but here we are expecting this.context.data to be the request payload

sdk-scheme-adapter/src/lib/model/OutboundAuthorizationsModel.js

Line 40 in 734e0fa

const { data, logger } = this.context;

so you are right there should be `...parsed.data``` in L140

but why the test is false positive.... ?
for this test important is how cache.publish called here:

sdk-scheme-adapter/src/test/unit/lib/model/OutboundAuthorizationsModel.test.js

Line 185 in 734e0fa

await cache.publish(channel, JSON.stringify(message));

is mocked:

sdk-scheme-adapter/src/test/unit/lib/model/OutboundAuthorizationsModel.test.js

Line 51 in 734e0fa

publish: jest.fn(async (channel, message) => await handler(channel, message, subId)),

so the expect in L167 is called when handler is called what we check L178 & L188 and thanks to await everything should be synchronous here.... but there is then in L155 which could be executed after the L192

if you move block L156-174 after L188 the test should properly fail and prove I am right... (if you don't fix ...parsed.data before ;-)

eoln

@kleyow I suggest fixing this false positive test in separate PR, at the end of merging with the latest master branch. If there will be no time, or there will be unexpected complications, please create a separate story ticket to expose this hidden work.

eoln · 2021-01-04T08:58:55Z

src/lib/model/OutboundAuthorizationsModel.js

            // where this event is fired but only if env ENABLE_PISP_MODE=true
            subId = await cache.subscribe(channel, async (channel, message, sid) => {
-                try { 
+                try {
                    const parsed = JSON.parse(message);
                    this.context.data = {
                        ...parsed,


nice finding @kleyow

themessage is published to the channel here:

sdk-scheme-adapter/src/InboundServer/handlers.js

Line 339 in 734e0fa

await ctx.state.cache.publish(authorizationChannel, {

so model.context.data will store the whole published message and request payload body will be model.context.data.data

but here we are expecting this.context.data to be the request payload

sdk-scheme-adapter/src/lib/model/OutboundAuthorizationsModel.js

Line 40 in 734e0fa

const { data, logger } = this.context;

so you are right there should be `...parsed.data``` in L140

but why the test is false positive.... ?
for this test important is how cache.publish called here:

sdk-scheme-adapter/src/test/unit/lib/model/OutboundAuthorizationsModel.test.js

Line 185 in 734e0fa

await cache.publish(channel, JSON.stringify(message));

is mocked:

sdk-scheme-adapter/src/test/unit/lib/model/OutboundAuthorizationsModel.test.js

Line 51 in 734e0fa

publish: jest.fn(async (channel, message) => await handler(channel, message, subId)),

so the expect in L167 is called when handler is called what we check L178 & L188 and thanks to await everything should be synchronous here.... but there is then in L155 which could be executed after the L192

if you move block L156-174 after L188 the test should properly fail and prove I am right... (if you don't fix ...parsed.data before ;-)

kleyow · 2021-01-04T11:00:07Z

Will do.

Vijay Kumar and others added 30 commits June 30, 2020 17:29

Renamed ALS_ENDPOINT_HOST to ALS_ENDPOINT

c89f21b

Bumped up the version

7b28e97

Merge pull request mojaloop#174 from vijayg10/bugfix/rename_als_endpo…

49a906e

…int_env_name Renamed ALS_ENDPOINT_HOST to ALS_ENDPOINT

upstream merge

8cea416

Merge branch 'master' of github.com:mojaloop/sdk-scheme-adapter

48d38c4

Fix misspelt environment variable

2aa5930

Bug fixes with golden path

f48d9f8

Update unit test

5804dc3

Add bulk transfers and bulk quotes to the list of valid headers

788ba6a

added functionality for reserve notificaiton by payee

e6ec75b

added enum for support of transfer reserve notification

11584a3

removed local certs and keys

90a127f

Merge pull request mojaloop#176 from oderayi/bugfix/#1386-config-fixes

928f21c

#1386: Bug fixes

Merge branch 'master' of github.com:mojaloop/sdk-scheme-adapter into …

a284b97

…feature/#1462-request-for-notif

updated version

4880e74

requests now respond with .data instead of .body (mojaloop#182)

b94ae0b

* requests now respond with .data instead of .body * Fixed test. Fixed (not in the broken sense, but sort of) package version.

fixed lint errors

4bb0703

Merge branch 'master' of github.com:mojaloop/sdk-scheme-adapter into …

47a2bd4

…feature/#1462-request-for-notif

corrected version

a2d2954

Related to mojaloop#182, no longer need to parse response data

bc4bf14

Updated test

b285313

Merge pull request mojaloop#184 from mojaloop/bugfix/json-parsing-object

a8efec4

Do not JSON parse already-parsed response data

WIP

fcb271b

Basically functions. Needs a little tidy-up.

f373414

Made Cache constants read-only on the prototype. Set Redis config whe…

8483a05

…n in test mode. Tidied up websocket server creation. Removed koa-websocket and added ws.

Rearranged to make diff easier

fc13111

Linting

64a0678

Update sdk-standard-component

08bef19

Merge pull request mojaloop#186 from oderayi/bugfix/#1386-update-sdk-sc

80eb418

#1386: Update sdk-standard-component

partiallyordered and others added 20 commits October 7, 2020 09:12

bugfix

3fc91f9

Merge pull request mojaloop#218 from mojaloop/refactor-oauth-test-ser…

1d28685

…ver-constructor Refactored OAuth test server constructor

Incorporated new sdk-standard-components functionality into SDK

e5767b3

Bumped package version

cbb1923

Merge pull request mojaloop#224 from mojaloop/incorporate-new-sdk-sta…

326ccd9

…ndard-components-functionality Incorporated new sdk-standard-components functionality into SDK

Run all tests

ac2d1af

Merge pull request mojaloop#225 from mojaloop/run-all-tests

92055a4

Run all tests

Log request retries

f0f4b5f

Bumped package version

1b8e353

Merge pull request mojaloop#226 from mojaloop/logging-request-retries

b8873fb

Log request retries

Remove redundant example env vars

99e23c1

Merge pull request mojaloop#227 from mojaloop/remove-redundant-exampl…

d9006e7

…e-env-vars Remove redundant example env vars

fixed config refactoring issue

2a8e54f

fixedt typo

e00f542

Merge pull request mojaloop#232 from vgenev/fix/#1884

5be117a

fixed config refactoring issue

Added GET /quotes/{ID} to the inbound API (mojaloop#228)

9b4d48e

* Added GET /quotes{ID} * added the error callback * update readme

Added PUT /participants/{Type}/{ID}/{SubId} and PUT /participants/{Ty…

91971b7

…pe}/{ID}/{SubId}/error (mojaloop#233) * Added GET /quotes{ID} * added PUT /participants * merge master * delete accidentally added files

Merge tag 'v11.10.1' into chore/sync-v11.10.1

7276e6c

chore: update package-lock

d09d369

chore: fix bad merge code block

8f4f87c

chore: fix linting issues

38f2779

kleyow requested review from eoln and elnyry-sam-k December 31, 2020 05:19

kleyow marked this pull request as ready for review December 31, 2020 05:19

chore: fix faulty test

734e0fa

kleyow commented Jan 3, 2021

View reviewed changes

eoln approved these changes Jan 4, 2021

View reviewed changes

kleyow merged commit 8d1baab into mojaloop:pisp/master Jan 4, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: sync pisp/master to v11.10.1 #237

chore: sync pisp/master to v11.10.1 #237

kleyow commented Dec 31, 2020

CLAassistant commented Dec 31, 2020 •

edited

Loading

kleyow Jan 3, 2021

eoln Jan 4, 2021

eoln left a comment

eoln Jan 4, 2021

kleyow commented Jan 4, 2021

chore: sync pisp/master to v11.10.1 #237

chore: sync pisp/master to v11.10.1 #237

Conversation

kleyow commented Dec 31, 2020

CLAassistant commented Dec 31, 2020 • edited Loading

kleyow Jan 3, 2021

Choose a reason for hiding this comment

eoln Jan 4, 2021

Choose a reason for hiding this comment

eoln left a comment

Choose a reason for hiding this comment

eoln Jan 4, 2021

Choose a reason for hiding this comment

kleyow commented Jan 4, 2021

CLAassistant commented Dec 31, 2020 •

edited

Loading