Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/fix participant lookup to use currency #227

Merged
merged 11 commits into from
Jul 2, 2020
Merged

Bugfix/fix participant lookup to use currency #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6510e54
updated to newly released version of event-sdk
rmothilal Mar 2, 2020
680f0fd
Merge branch 'master' of https://github.com/mojaloop/quoting-service
rmothilal Mar 2, 2020
c0b645b
updated dependencies and version
rmothilal Mar 2, 2020
5aa9b6b
Merge branch 'master' of https://github.com/mojaloop/quoting-service
rmothilal Mar 3, 2020
7939283
Merge branch 'master' of https://github.com/mojaloop/quoting-service
rmothilal Mar 17, 2020
308babe
Merge branch 'master' of https://github.com/mojaloop/quoting-service
rmothilal Mar 19, 2020
a2f221c
Merge branch 'master' of https://github.com/mojaloop/quoting-service
rmothilal May 29, 2020
d583ced
Merge branch 'master' of https://github.com/mojaloop/quoting-service
rmothilal Jun 8, 2020
52a7c31
Merge branch 'master' of https://github.com/mojaloop/quoting-service
rmothilal Jun 30, 2020
3cf3910
Merge branch 'master' of https://github.com/mojaloop/quoting-service
rmothilal Jul 1, 2020
b9fd596
fix for accept header and content-type header versions being hardcoded
rmothilal Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 76 additions & 0 deletions audit-resolve.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"decisions": {
"1523|@mojaloop/central-services-error-handling>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/central-services-shared>@mojaloop/central-services-error-handling>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/central-services-logger>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/central-services-shared>@mojaloop/central-services-logger>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/central-services-shared>@mojaloop/event-sdk>@mojaloop/central-services-logger>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/event-sdk>@mojaloop/central-services-logger>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/central-services-shared>@mojaloop/event-sdk>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/event-sdk>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/central-services-shared>@mojaloop/event-sdk>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/event-sdk>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/central-services-shared>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/central-services-shared>openapi-backend>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|@mojaloop/central-services-shared>openapi-backend>mock-json-schema>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
},
"1523|knex>lodash": {
"decision": "ignore",
"madeAt": 1593690759717,
"expiresAt": 1594295539291
}
},
"rules": {},
"version": 1
}
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "quoting-service",
"description": "Quoting Service hosted by a scheme",
"license": "Apache-2.0",
"version": "10.5.1",
"version": "10.5.2",
"author": "ModusBox",
"contributors": [
"James Bush <james.bush@modusbox.com>",
Expand Down
8 changes: 4 additions & 4 deletions src/model/quotes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@ class QuotesModel {
*/
generateRequestHeaders (headers, noAccept) {
const ret = {
'Content-Type': 'application/vnd.interoperability.quotes+json;version=1.0',
'Content-Type': headers['content-type'] || headers['Content-Type'],
Date: headers.date,
'FSPIOP-Source': headers['fspiop-source'],
'FSPIOP-Destination': headers['fspiop-destination'],
Expand All @@ -1119,7 +1119,7 @@ class QuotesModel {
}

if (!noAccept) {
ret.Accept = 'application/vnd.interoperability.quotes+json;version=1'
ret.Accept = headers.accept || headers.Accept
}

return this.removeEmptyKeys(ret)
Expand All @@ -1132,7 +1132,7 @@ class QuotesModel {
*/
generateRequestHeadersForJWS (headers, noAccept) {
const ret = {
'Content-Type': 'application/vnd.interoperability.quotes+json;version=1.0',
'Content-Type': headers['content-type'] || headers['Content-Type'],
date: headers.date,
'fspiop-source': headers['fspiop-source'],
'fspiop-destination': headers['fspiop-destination'],
Expand All @@ -1143,7 +1143,7 @@ class QuotesModel {
}

if (!noAccept) {
ret.Accept = 'application/vnd.interoperability.quotes+json;version=1'
ret.Accept = headers.accept || headers.Accept
}

return this.removeEmptyKeys(ret)
Expand Down
6 changes: 4 additions & 2 deletions test/unit/model/quotes.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ describe('QuotesModel', () => {
longitude: '23.32415'
},
headers: {
Accept: 'application/vnd.interoperability.quotes+json;version=1.0',
'Content-Type': 'application/vnd.interoperability.quotes+json;version=1.0',
'fspiop-source': 'dfsp1',
'fspiop-destination': 'dfsp2'
},
Expand Down Expand Up @@ -2493,7 +2495,7 @@ describe('QuotesModel', () => {
it('generates default request headers, including the Accept', () => {
// Arrange
const expected = {
Accept: 'application/vnd.interoperability.quotes+json;version=1',
Accept: 'application/vnd.interoperability.quotes+json;version=1.0',
'Content-Type': 'application/vnd.interoperability.quotes+json;version=1.0',
'FSPIOP-Destination': 'dfsp2',
'FSPIOP-Source': 'dfsp1'
Expand Down Expand Up @@ -2532,7 +2534,7 @@ describe('QuotesModel', () => {
it('generates default request headers, including the Accept', () => {
// Arrange
const expected = {
Accept: 'application/vnd.interoperability.quotes+json;version=1',
Accept: 'application/vnd.interoperability.quotes+json;version=1.0',
'Content-Type': 'application/vnd.interoperability.quotes+json;version=1.0',
'fspiop-destination': 'dfsp2',
'fspiop-source': 'dfsp1'
Expand Down