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

content-type and accept header versions are configurable #94

Merged
merged 8 commits into from
Sep 1, 2020
Merged

content-type and accept header versions are configurable #94

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d301ac0
converted versions to resources versions
Aug 27, 2020
11c3195
added ts definition of the resource version config
Aug 27, 2020
92f81b9
fixed headers to check for config
Aug 28, 2020
12376b6
fixed lint error
Aug 28, 2020
f00d8c3
refactored to have defaults resourceVersions
Aug 31, 2020
27b506b
Merge branch 'master' of github.com:mojaloop/sdk-standard-components …
Aug 31, 2020
d0989e0
linter fixes
Aug 31, 2020
eef82dd
Merge branch 'master' into feature/#1615-content-headers
vgenev Sep 1, 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
9 changes: 9 additions & 0 deletions src/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,14 @@ declare namespace SDKStandardComponents {
RECEIVE = 'RECEIVE',
}

/* hashmap of versions of various resources */
type TResourceVersions = {
[resource: string]: {
contentVersion: string,
acceptVersion: string
}
}

/* Base Request Types */
type GenericRequestResponse = {
statusCode: number;
Expand All @@ -118,6 +126,7 @@ declare namespace SDKStandardComponents {
bulkTransfersEndpoint?: string;
transactionRequestsEndpoint?: string;
thirdpartyRequestsEndpoint?: string;
resourceVersions?: TResourceVersions;
}

/* Individual Request Types */
Expand Down
50 changes: 48 additions & 2 deletions src/lib/requests/baseRequests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,52 @@ class BaseRequests {
});
}

this.resourceVersions = {
...{
parties: {
contentVersion: '1.0',
acceptVersion: '1',
},
participants: {
contentVersion: '1.0',
acceptVersion: '1',
},
quotes: {
contentVersion: '1.0',
acceptVersion: '1',
},
bulkQuotes: {
contentVersion: '1.0',
acceptVersion: '1',
},
bulkTransfers: {
contentVersion: '1.0',
acceptVersion: '1',
},
transactionRequests: {
contentVersion: '1.0',
acceptVersion: '1',
},
authorizations: {
contentVersion: '1.0',
acceptVersion: '1',
},
transfers: {
contentVersion: '1.0',
acceptVersion: '1',
},
custom: {
contentVersion: '1.0',
acceptVersion: '1',
},
thirdparty: {
contentVersion: '1.0',
acceptVersion: '1',
}
},
...config.resourceVersions
};

this.peerEndpoint = `${this.transportScheme}://${config.peerEndpoint}`;
this.resourceEndpoints = {
parties: formatEndpointOrDefault(config.alsEndpoint, this.transportScheme, this.peerEndpoint),
Expand Down Expand Up @@ -269,7 +315,7 @@ class BaseRequests {
*/
_buildHeaders(method, resourceType, dest) {
let headers = {
'content-type': `application/vnd.interoperability.${resourceType}+json;version=1.0`,
'content-type': `application/vnd.interoperability.${resourceType}+json;version=${this.resourceVersions[resourceType].contentVersion}`,
'date': new Date().toUTCString(),
};

Expand All @@ -291,7 +337,7 @@ class BaseRequests {

// dont add accept header to PUT requests
if(method.toUpperCase() !== 'PUT') {
headers['accept'] = `application/vnd.interoperability.${resourceType}+json;version=1.0`;
headers['accept'] = `application/vnd.interoperability.${resourceType}+json;version=${this.resourceVersions[resourceType].acceptVersion}`;
}

return headers;
Expand Down
5 changes: 3 additions & 2 deletions src/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mojaloop/sdk-standard-components",
"version": "11.2.1",
"version": "11.3.0",
"description": "A set of standard components for connecting to Mojaloop API enabled Switches",
"main": "index.js",
"types": "index.d.ts",
Expand All @@ -14,7 +14,8 @@
"author": "James Bush, ModusBox Inc.",
"contributors": [
"Steven Oderayi <steven.oderayi@modusbox.com>",
"Paweł Marzec <pawel.marzec@modusbox.com>"
"Paweł Marzec <pawel.marzec@modusbox.com>",
"Valentin Genev <valentin.genev@#modusbox.com"
],
"license": "Apache-2.0",
"licenses": [
Expand Down