ibm-cloud-sdk-core 2.4.3 → 2.4.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/auth/authenticators/basic-authenticator.js +2 -1
- package/auth/authenticators/bearer-token-authenticator.js +2 -1
- package/auth/authenticators/token-request-based-authenticator.js +2 -1
- package/auth/token-managers/cp4d-token-manager.js +2 -1
- package/auth/token-managers/iam-token-manager.js +2 -1
- package/lib/request-wrapper.js +4 -3
- package/package.json +3 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [2.4.4](https://github.com/IBM/node-sdk-core/compare/v2.4.3...v2.4.4) (2020-08-06)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* use `extend` with deep copy where necessary ([#106](https://github.com/IBM/node-sdk-core/issues/106)) ([566b81f](https://github.com/IBM/node-sdk-core/commit/566b81ffea3e88d148d1a7471b01e436432efb75))
|
|
7
|
+
|
|
1
8
|
## [2.4.3](https://github.com/IBM/node-sdk-core/compare/v2.4.2...v2.4.3) (2020-08-05)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -29,6 +29,7 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
29
29
|
})();
|
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
31
|
exports.BasicAuthenticator = void 0;
|
|
32
|
+
var extend = require("extend");
|
|
32
33
|
var utils_1 = require("../utils");
|
|
33
34
|
var authenticator_1 = require("./authenticator");
|
|
34
35
|
/**
|
|
@@ -72,7 +73,7 @@ var BasicAuthenticator = /** @class */ (function (_super) {
|
|
|
72
73
|
BasicAuthenticator.prototype.authenticate = function (requestOptions) {
|
|
73
74
|
var _this = this;
|
|
74
75
|
return new Promise(function (resolve) {
|
|
75
|
-
requestOptions.headers =
|
|
76
|
+
requestOptions.headers = extend(true, {}, requestOptions.headers, _this.authHeader);
|
|
76
77
|
resolve();
|
|
77
78
|
});
|
|
78
79
|
};
|
|
@@ -29,6 +29,7 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
29
29
|
})();
|
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
31
|
exports.BearerTokenAuthenticator = void 0;
|
|
32
|
+
var extend = require("extend");
|
|
32
33
|
var utils_1 = require("../utils");
|
|
33
34
|
var authenticator_1 = require("./authenticator");
|
|
34
35
|
/**
|
|
@@ -80,7 +81,7 @@ var BearerTokenAuthenticator = /** @class */ (function (_super) {
|
|
|
80
81
|
var _this = this;
|
|
81
82
|
return new Promise(function (resolve) {
|
|
82
83
|
var authHeader = { Authorization: "Bearer " + _this.bearerToken };
|
|
83
|
-
requestOptions.headers =
|
|
84
|
+
requestOptions.headers = extend(true, {}, requestOptions.headers, authHeader);
|
|
84
85
|
resolve();
|
|
85
86
|
});
|
|
86
87
|
};
|
|
@@ -29,6 +29,7 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
29
29
|
})();
|
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
31
|
exports.TokenRequestBasedAuthenticator = void 0;
|
|
32
|
+
var extend = require("extend");
|
|
32
33
|
var token_managers_1 = require("../token-managers");
|
|
33
34
|
var authenticator_1 = require("./authenticator");
|
|
34
35
|
/**
|
|
@@ -106,7 +107,7 @@ var TokenRequestBasedAuthenticator = /** @class */ (function (_super) {
|
|
|
106
107
|
TokenRequestBasedAuthenticator.prototype.authenticate = function (requestOptions) {
|
|
107
108
|
return this.tokenManager.getToken().then(function (token) {
|
|
108
109
|
var authHeader = { Authorization: "Bearer " + token };
|
|
109
|
-
requestOptions.headers =
|
|
110
|
+
requestOptions.headers = extend(true, {}, requestOptions.headers, authHeader);
|
|
110
111
|
return;
|
|
111
112
|
});
|
|
112
113
|
};
|
|
@@ -29,6 +29,7 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
29
29
|
})();
|
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
31
|
exports.Cp4dTokenManager = void 0;
|
|
32
|
+
var extend = require("extend");
|
|
32
33
|
var utils_1 = require("../utils");
|
|
33
34
|
var jwt_token_manager_1 = require("./jwt-token-manager");
|
|
34
35
|
/**
|
|
@@ -76,7 +77,7 @@ var Cp4dTokenManager = /** @class */ (function (_super) {
|
|
|
76
77
|
options: {
|
|
77
78
|
url: this.url,
|
|
78
79
|
method: 'GET',
|
|
79
|
-
headers:
|
|
80
|
+
headers: extend(true, {}, this.headers, requiredHeaders),
|
|
80
81
|
rejectUnauthorized: !this.disableSslVerification,
|
|
81
82
|
}
|
|
82
83
|
};
|
|
@@ -29,6 +29,7 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
29
29
|
})();
|
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
31
|
exports.IamTokenManager = void 0;
|
|
32
|
+
var extend = require("extend");
|
|
32
33
|
var logger_1 = require("../../lib/logger");
|
|
33
34
|
var utils_1 = require("../utils");
|
|
34
35
|
var jwt_token_manager_1 = require("./jwt-token-manager");
|
|
@@ -126,7 +127,7 @@ var IamTokenManager = /** @class */ (function (_super) {
|
|
|
126
127
|
options: {
|
|
127
128
|
url: this.url,
|
|
128
129
|
method: 'POST',
|
|
129
|
-
headers:
|
|
130
|
+
headers: extend(true, {}, this.headers, requiredHeaders),
|
|
130
131
|
form: {
|
|
131
132
|
grant_type: 'urn:ibm:params:oauth:grant-type:apikey',
|
|
132
133
|
apikey: this.apikey,
|
package/lib/request-wrapper.js
CHANGED
|
@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
exports.RequestWrapper = void 0;
|
|
19
19
|
var axios_1 = require("axios");
|
|
20
20
|
var axios_cookiejar_support_1 = require("axios-cookiejar-support");
|
|
21
|
+
var extend = require("extend");
|
|
21
22
|
var FormData = require("form-data");
|
|
22
23
|
var https = require("https");
|
|
23
24
|
var querystring = require("querystring");
|
|
@@ -47,7 +48,7 @@ var RequestWrapper = /** @class */ (function () {
|
|
|
47
48
|
}
|
|
48
49
|
};
|
|
49
50
|
// merge axios config into default
|
|
50
|
-
|
|
51
|
+
extend(true, axiosConfig, axiosOptions);
|
|
51
52
|
// if the user explicitly sets `disableSslVerification` to true,
|
|
52
53
|
// `rejectUnauthorized` must be set to false in the https agent
|
|
53
54
|
if (axiosOptions.disableSslVerification === true) {
|
|
@@ -126,7 +127,7 @@ var RequestWrapper = /** @class */ (function () {
|
|
|
126
127
|
*/
|
|
127
128
|
RequestWrapper.prototype.sendRequest = function (parameters) {
|
|
128
129
|
var _this = this;
|
|
129
|
-
var options =
|
|
130
|
+
var options = extend(true, {}, parameters.defaultOptions, parameters.options);
|
|
130
131
|
var path = options.path, body = options.body, form = options.form, formData = options.formData, qs = options.qs, method = options.method, serviceUrl = options.serviceUrl;
|
|
131
132
|
var headers = options.headers, url = options.url;
|
|
132
133
|
var multipartForm = new FormData();
|
|
@@ -174,7 +175,7 @@ var RequestWrapper = /** @class */ (function () {
|
|
|
174
175
|
if (formData) {
|
|
175
176
|
data = multipartForm;
|
|
176
177
|
// form-data generates headers that MUST be included or the request will fail
|
|
177
|
-
headers =
|
|
178
|
+
headers = extend(true, {}, headers, multipartForm.getHeaders());
|
|
178
179
|
}
|
|
179
180
|
// TEMPORARY: Disabling gzipping due to bug in axios until fix is released:
|
|
180
181
|
// https://github.com/axios/axios/pull/1129
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ibm-cloud-sdk-core",
|
|
3
|
-
"version": "2.4.
|
|
3
|
+
"version": "2.4.4",
|
|
4
4
|
"description": "Core functionality to support SDKs generated with IBM's OpenAPI 3 SDK Generator.",
|
|
5
5
|
"main": "index",
|
|
6
6
|
"repository": {
|
|
@@ -32,12 +32,14 @@
|
|
|
32
32
|
"@types/file-type": "~5.2.1",
|
|
33
33
|
"@types/isstream": "^0.1.0",
|
|
34
34
|
"@types/node": "~10.14.19",
|
|
35
|
+
"@types/tough-cookie": "^4.0.0",
|
|
35
36
|
"axios": "^0.18.1",
|
|
36
37
|
"axios-cookiejar-support": "^1.0.0",
|
|
37
38
|
"camelcase": "^5.3.1",
|
|
38
39
|
"debug": "^4.1.1",
|
|
39
40
|
"dotenv": "^6.2.0",
|
|
40
41
|
"expect": "^26.1.0",
|
|
42
|
+
"extend": "^3.0.2",
|
|
41
43
|
"file-type": "^7.7.1",
|
|
42
44
|
"form-data": "^2.3.3",
|
|
43
45
|
"isstream": "~0.1.2",
|