Skip to content

Commit 1490224

Browse files
committed
Release 2.1.0
1 parent c1f3623 commit 1490224

6 files changed

Lines changed: 42 additions & 32 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## [v2.1.0](https://github.com/uphold/uphold-sdk-javascript/releases/tag/v2.1.0) (2018-04-13)
4+
- Add ability to pass extra options on each request [\#12](https://github.com/uphold/uphold-sdk-javascript/pull/12) ([pgom](https://github.com/pgom))
5+
- Add entire response object on each request response [\#14](https://github.com/uphold/uphold-sdk-javascript/pull/14) ([pgom](https://github.com/pgom))
6+
- Update build script [\#13](https://github.com/uphold/uphold-sdk-javascript/pull/13) ([pgom](https://github.com/pgom))
7+
38
## [v2.0.4](https://github.com/uphold/uphold-sdk-javascript/releases/tag/v2.0.4) (2017-11-23)
49
- Add support to invalid scope error [\#9](https://github.com/uphold/uphold-sdk-javascript/pull/9) ([SandroMachado](https://github.com/SandroMachado))
510

dist/browser/uphold-sdk-javascript.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core/sdk.js

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ class SDK {
4949
}
5050

5151
api(uri) {
52-
var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
53-
_ref$authenticate = _ref.authenticate;
54-
55-
let authenticate = _ref$authenticate === undefined ? true : _ref$authenticate,
56-
body = _ref.body;
57-
var _ref$headers = _ref.headers;
58-
let headers = _ref$headers === undefined ? {} : _ref$headers;
59-
var _ref$method = _ref.method;
60-
let method = _ref$method === undefined ? 'get' : _ref$method,
61-
queryParams = _ref.queryParams,
62-
raw = _ref.raw;
63-
var _ref$version = _ref.version;
64-
let version = _ref$version === undefined ? this.options.version : _ref$version;
52+
let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
53+
var _options$authenticate = options.authenticate;
54+
const authenticate = _options$authenticate === undefined ? true : _options$authenticate;
55+
var _options$headers = options.headers;
56+
const headers = _options$headers === undefined ? {} : _options$headers;
57+
var _options$method = options.method;
58+
const method = _options$method === undefined ? 'get' : _options$method,
59+
queryParams = options.queryParams,
60+
raw = options.raw;
61+
var _options$version = options.version;
62+
const version = _options$version === undefined ? this.options.version : _options$version;
63+
let body = options.body;
64+
6565

6666
const url = (0, _utils.buildUrl)(uri, this.options.baseUrl, version, queryParams);
6767

@@ -76,15 +76,15 @@ class SDK {
7676

7777
if (authenticate && !headers.authorization) {
7878
request = this.getToken().then(tokens => {
79-
return this.client.request(url, method, body, _extends({}, (0, _utils.buildBearerAuthorizationHeader)(tokens.access_token), headers));
79+
return this.client.request(url, method, body, _extends({}, (0, _utils.buildBearerAuthorizationHeader)(tokens.access_token), headers), options);
8080
});
8181
} else {
82-
request = this.client.request(url, method, body, headers);
82+
request = this.client.request(url, method, body, headers, options);
8383
}
8484

8585
return request.then(data => {
8686
return raw ? data : data.body;
87-
}).catch(this._refreshToken(url, method, body, headers));
87+
}).catch(this._refreshToken(url, method, body, headers, options));
8888
}
8989

9090
authorize(code) {
@@ -149,18 +149,19 @@ class SDK {
149149
}).then(() => token);
150150
}
151151

152-
_authenticationRequest(_ref2) {
153-
let body = _ref2.body,
154-
headers = _ref2.headers,
155-
url = _ref2.url;
152+
_authenticationRequest(_ref) {
153+
let body = _ref.body,
154+
headers = _ref.headers,
155+
url = _ref.url;
156156

157-
return this.client.request(url, 'post', body, headers).then((_ref3) => {
158-
let body = _ref3.body;
157+
return this.client.request(url, 'post', body, headers).then((_ref2) => {
158+
let body = _ref2.body;
159159
return this.setToken(body);
160160
});
161161
}
162162

163-
_refreshToken(url, method, body, headers) {
163+
_refreshToken(url, method, body, headers, options) {
164+
// eslint-disable-line max-params
164165
return response => {
165166
if (!response || !response.body || response.body.error !== 'invalid_token') {
166167
return Promise.reject(response);
@@ -171,7 +172,7 @@ class SDK {
171172
}
172173

173174
return this.refreshRequestPromise.then(tokens => {
174-
return this.client.request(url, method, body, _extends({}, (0, _utils.buildBearerAuthorizationHeader)(tokens.access_token), headers)).then(data => data.body);
175+
return this.client.request(url, method, body, _extends({}, (0, _utils.buildBearerAuthorizationHeader)(tokens.access_token), headers), options).then(data => data.body);
175176
});
176177
};
177178
}

dist/core/utils/error-factory.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
6+
7+
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
8+
69
exports.createError = createError;
710

811
var _errors = require('../errors');
@@ -11,10 +14,10 @@ var _errors2 = _interopRequireDefault(_errors);
1114

1215
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
1316

14-
function createError(response) {
17+
function createError(error, response) {
1518
for (const SDKError of _errors2.default) {
16-
if (SDKError.hasError && SDKError.hasError(response)) {
17-
return new SDKError(response);
19+
if (SDKError.hasError && SDKError.hasError(error)) {
20+
return new SDKError(_extends({}, error, { response: response }));
1821
}
1922
}
2023
}

dist/node/services/request-client.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
1919
class RequestClient extends _core.Client {
2020
request(url, method, body) {
2121
let headers = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
22-
23-
return (0, _requestPromise2.default)({
22+
let options = arguments[4];
23+
// eslint-disable-line max-params
24+
return (0, _requestPromise2.default)(_extends({}, options, {
2425
body: body,
2526
headers: _extends({}, this.defaultHeaders, headers),
2627
method: method,
2728
resolveWithFullResponse: true,
2829
strictSSL: false,
2930
url: url
30-
}).then(response => this._formatResponse(response)).catch(response => Promise.reject(response instanceof _errors.RequestError ? response : (0, _core.createError)(this._formatResponse(response.response))));
31+
})).then(response => this._formatResponse(response)).catch(response => Promise.reject(response instanceof _errors.RequestError ? response : (0, _core.createError)(this._formatResponse(response.response), response)));
3132
}
3233

3334
_formatResponse(_ref) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@uphold/uphold-sdk-javascript",
3-
"version": "2.0.4",
3+
"version": "2.1.0",
44
"description": "Uphold SDK for JavasScript",
55
"keywords": [
66
"api",

0 commit comments

Comments
 (0)