Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35,397 changes: 18,871 additions & 16,526 deletions app/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/package-lock.json

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

21 changes: 10 additions & 11 deletions core/src/http/AuthContext.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import config from '../config.json';
import type {CustomerTrackingMetadata, MiscHeaders} from '../types';

/**
* Handles the auth context when using access tokens.
Expand Down Expand Up @@ -91,17 +90,17 @@ class AuthContext {
* Gets misc headers
* @returns {MiscHeaders}
*/
get miscHeaders() {
return this._miscHeaders;
}
get miscHeaders() {
return this._miscHeaders;
}

/**
* Sets misc headers
* @param {MiscHeaders} value
*/
set miscHeaders(value) {
this._miscHeaders = value;
}
/**
* Sets misc headers
* @param {MiscHeaders} value
*/
set miscHeaders(value) {
this._miscHeaders = value;
}
}

export default AuthContext;
3 changes: 1 addition & 2 deletions core/src/http/AuthHttpClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -627,9 +627,8 @@ export class AuthHttpClient {
versionHeader.addVersionHeader(request);
developerHeader.addDeveloperHeader(request);
customerTrackingMetadataHeader.addCustomerTrackingMetadata(request, this._context);
miscHeaders.setMiscHeaders(request, this._context)
miscHeaders.setMiscHeaders(request, this._context);
setAdditionalHeaders(request);

return request;
});
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/http/HttpClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export class HttpClient {
// Optional tpp member id
memberId: options.memberId || '',
// Optional add headers such as dev key to this request
headers: options.headers
headers: options.headers,
});
const {
ids,
Expand Down Expand Up @@ -143,7 +143,7 @@ export class HttpClient {
const request = {
method: 'get',
url: url,
requestHeaders: headers
requestHeaders: headers,
};
return this._instance(request);
}
Expand Down
28 changes: 14 additions & 14 deletions core/src/http/MiscHeaders.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/**
* Class to add misc headers
*/
class MiscHeaders {
/**
* Adds the misc headers
*
* @param {Object} config - config of the request
* @param {AuthContext} context - auth context for access token redemption
*/
setMiscHeaders(config, context) {
if(context && Object.keys(context.miscHeaders).length > 0){
if (context.miscHeaders.jsonError){
config.headers['token-json-error'] = context.miscHeaders.jsonError;
}
}
}
class MiscHeaders {
/**
* Adds the misc headers
*
* @param {Object} config - config of the request
* @param {AuthContext} context - auth context for access token redemption
*/
setMiscHeaders(config, context) {
if(context && Object.keys(context.miscHeaders).length > 0){
if (context.miscHeaders.jsonError){
config.headers['token-json-error'] = context.miscHeaders.jsonError;
}
}
}
}

export default MiscHeaders;
10 changes: 5 additions & 5 deletions core/src/http/setAdditionalHeaders.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default function setAdditionalHeaders(config) {
// requestHeaders are set when a method fires and applies to only one request
if (config.requestHeaders) {
config.headers = {...config.headers, ...config.requestHeaders}
}
};
// requestHeaders are set when a method fires and applies to only one request
if (config.requestHeaders) {
config.headers = {...config.headers, ...config.requestHeaders};
}
}
4 changes: 2 additions & 2 deletions core/src/main/TokenClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export class TokenClient {
const member = new Member({
memberId: response.data.memberId,
cryptoEngine: engine,
...this.options
...this.options,
});
alias && await member.addAlias(alias);
return member;
Expand Down Expand Up @@ -126,7 +126,7 @@ export class TokenClient {
return new Member({
memberId,
cryptoEngine: engine,
...this.options
...this.options,
});
});
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/security/Base64UrlCodec.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const base64ToBase64Url = input => {
.replace(/=/g, '')
.replace(/\+/g, '-')
.replace(/\//g, '_');
}
};

function base64UrlToBase64(input) {
return pad(input.toString())
Expand Down
2 changes: 1 addition & 1 deletion core/src/types.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ export type CustomerTrackingMetadata = {
};

export type MiscHeaders = {
jsonError: boolean
jsonError: boolean,
};

export type StandingOrder = {
Expand Down
Loading