ibm-cloud-sdk-core - npm Package Compare versions

Comparing version 2.4.2 to 2.4.3

auth/authenticators/basic-authenticator.js

@@ -32,3 +32,2 @@ "use strict";
 exports.BasicAuthenticator = void 0;
-var extend = require("extend");
 var utils_1 = require("../utils");
@@ -77,3 +76,3 @@ var authenticator_1 = require("./authenticator");
         return new Promise(function (resolve) {
-            requestOptions.headers = extend(true, {}, requestOptions.headers, _this.authHeader);
+            requestOptions.headers = Object.assign({}, requestOptions.headers, _this.authHeader);
             resolve();
@@ -80,0 +79,0 @@ });

auth/authenticators/bearer-token-authenticator.js

@@ -32,3 +32,2 @@ "use strict";
 exports.BearerTokenAuthenticator = void 0;
-var extend = require("extend");
 var utils_1 = require("../utils");
@@ -85,3 +84,3 @@ var authenticator_1 = require("./authenticator");
             var authHeader = { Authorization: "Bearer " + _this.bearerToken };
-            requestOptions.headers = extend(true, {}, requestOptions.headers, authHeader);
+            requestOptions.headers = Object.assign({}, requestOptions.headers, authHeader);
             resolve();
@@ -88,0 +87,0 @@ });

auth/authenticators/token-request-based-authenticator.js

@@ -32,3 +32,2 @@ "use strict";
 exports.TokenRequestBasedAuthenticator = void 0;
-var extend = require("extend");
 var token_managers_1 = require("../token-managers");
@@ -111,3 +110,3 @@ var authenticator_1 = require("./authenticator");
             var authHeader = { Authorization: "Bearer " + token };
-            requestOptions.headers = extend(true, {}, requestOptions.headers, authHeader);
+            requestOptions.headers = Object.assign({}, requestOptions.headers, authHeader);
             return;
@@ -114,0 +113,0 @@ });

auth/token-managers/cp4d-token-manager.js

@@ -32,3 +32,2 @@ "use strict";
 exports.Cp4dTokenManager = void 0;
-var extend = require("extend");
 var utils_1 = require("../utils");
@@ -81,3 +80,3 @@ var jwt_token_manager_1 = require("./jwt-token-manager");
                 method: 'GET',
-                headers: extend(true, {}, this.headers, requiredHeaders),
+                headers: Object.assign({}, this.headers, requiredHeaders),
                 rejectUnauthorized: !this.disableSslVerification,
@@ -84,0 +83,0 @@ }

auth/token-managers/iam-token-manager.js

@@ -32,3 +32,2 @@ "use strict";
 exports.IamTokenManager = void 0;
-var extend = require("extend");
 var logger_1 = require("../../lib/logger");
@@ -131,3 +130,3 @@ var utils_1 = require("../utils");
                 method: 'POST',
-                headers: extend(true, {}, this.headers, requiredHeaders),
+                headers: Object.assign({}, this.headers, requiredHeaders),
                 form: {
@@ -134,0 +133,0 @@ grant_type: 'urn:ibm:params:oauth:grant-type:apikey',

auth/token-managers/jwt-token-manager.js

@@ -32,3 +32,2 @@ "use strict";
 exports.JwtTokenManager = void 0;
-var extend = require("extend");
 var jwt = require("jsonwebtoken");
@@ -111,3 +110,3 @@ var logger_1 = require("../../lib/logger");
         }
-        this.tokenInfo = extend({}, responseBody);
+        this.tokenInfo = Object.assign({}, responseBody);
     };
@@ -114,0 +113,0 @@ return JwtTokenManager;

CHANGELOG.md

@@ -0,1 +1,8 @@
+## [2.4.3](https://github.com/IBM/node-sdk-core/compare/v2.4.2...v2.4.3) (2020-08-05)
+
+
+### Bug Fixes
+
+* support `disableSslVerification` when user provides custom httpsAgent ([#104](https://github.com/IBM/node-sdk-core/issues/104)) ([ef39327](https://github.com/IBM/node-sdk-core/commit/ef39327947a42ed357f19fa0db7f5edd063698c4))
+
 ## [2.4.2](https://github.com/IBM/node-sdk-core/compare/v2.4.1...v2.4.2) (2020-07-22)
@@ -2,0 +9,0 @@

lib/base-service.js

@@ -19,3 +19,2 @@ "use strict";
 exports.BaseService = void 0;
-var extend = require("extend");
 var auth_1 = require("../auth");
@@ -52,3 +51,3 @@ var helper_1 = require("./helper");
         var _options = {};
-        var options = extend({}, userOptions);
+        var options = Object.assign({}, userOptions);
         // for compatibility
@@ -73,3 +72,3 @@ if (options.url && !options.serviceUrl) {
         var serviceClass = this.constructor;
-        this.baseOptions = extend({ qs: {}, serviceUrl: serviceClass.DEFAULT_SERVICE_URL }, options, _options);
+        this.baseOptions = Object.assign({ qs: {}, serviceUrl: serviceClass.DEFAULT_SERVICE_URL }, options, _options);
         this.requestWrapperInstance = new request_wrapper_1.RequestWrapper(this.baseOptions);
@@ -112,3 +111,3 @@ // enforce that an authenticator is set
         }
-        extend(this.baseOptions, this.readOptionsFromExternalConfig(serviceName));
+        Object.assign(this.baseOptions, this.readOptionsFromExternalConfig(serviceName));
         // overwrite the requestWrapperInstance with the new base options if applicable
@@ -115,0 +114,0 @@ this.requestWrapperInstance = new request_wrapper_1.RequestWrapper(this.baseOptions);

lib/helper.js

@@ -26,3 +26,2 @@ "use strict";
 exports.toLowerKeys = exports.buildRequestFileObject = exports.getFormat = exports.isHTML = exports.getMissingParams = exports.stripTrailingSlash = exports.getContentType = exports.isEmptyObject = exports.isFileData = exports.isFileWithMetadata = void 0;
-var extend = require("extend");
 var fileType = require("file-type");
@@ -207,3 +206,3 @@ var isstream_1 = require("isstream");
     if (obj) {
-        _obj = extend.apply(void 0, __spreadArrays([{}], Object.keys(obj).map(function (key) {
+        _obj = Object.assign.apply(Object, __spreadArrays([{}], Object.keys(obj).map(function (key) {
             var _a;
@@ -210,0 +209,0 @@ return (_a = {},

lib/request-wrapper.js

@@ -21,3 +21,2 @@ "use strict";
 var axios_cookiejar_support_1 = require("axios-cookiejar-support");
-var extend = require("extend");
 var FormData = require("form-data");
@@ -30,4 +29,2 @@ var https = require("https");
 var globalTransactionId = 'x-global-transaction-id';
-// Limit the type of axios configs to be customizable
-var allowedAxiosConfig = ['transformRequest', 'transformResponse', 'paramsSerializer', 'paramsSerializer', 'timeout', 'withCredentials', 'adapter', 'responseType', 'responseEncoding', 'xsrfCookieName', 'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'maxContentLength', 'validateStatus', 'maxRedirects', 'socketPath', 'httpAgent', 'httpsAgent', 'proxy', 'cancelToken', 'jar'];
 var RequestWrapper = /** @class */ (function () {
@@ -41,7 +38,2 @@ function RequestWrapper(axiosOptions) {
         var axiosConfig = {
-            httpsAgent: new https.Agent({
-                // disableSslVerification is the parameter we expose to the user,
-                // it is the opposite of rejectUnauthorized
-                rejectUnauthorized: !axiosOptions.disableSslVerification
-            }),
             maxContentLength: Infinity,
@@ -60,7 +52,21 @@ headers: {
         };
-        // merge valid Axios Config into default.
-        extend(true, axiosConfig, allowedAxiosConfig.reduce(function (reducedConfig, key) {
-            reducedConfig[key] = axiosOptions[key];
-            return reducedConfig;
-        }, {}));
+        // merge axios config into default
+        Object.assign(axiosConfig, axiosOptions);
+        // if the user explicitly sets `disableSslVerification` to true,
+        // `rejectUnauthorized` must be set to false in the https agent
+        if (axiosOptions.disableSslVerification === true) {
+            // the user may have already provided a custom agent. if so, update it
+            if (axiosConfig.httpsAgent) {
+                // check for presence of `options` field for "type safety"
+                if (axiosConfig.httpsAgent.options) {
+                    axiosConfig.httpsAgent.options.rejectUnauthorized = false;
+                }
+            }
+            else {
+                // if no agent is present, create a new one
+                axiosConfig.httpsAgent = new https.Agent({
+                    rejectUnauthorized: false,
+                });
+            }
+        }
         this.axiosInstance = axios_1.default.create(axiosConfig);
@@ -127,3 +133,3 @@ // if a cookie jar is provided, wrap the axios instance and update defaults
         var _this = this;
-        var options = extend(true, {}, parameters.defaultOptions, parameters.options);
+        var options = Object.assign({}, parameters.defaultOptions, parameters.options);
         var path = options.path, body = options.body, form = options.form, formData = options.formData, qs = options.qs, method = options.method, serviceUrl = options.serviceUrl;
@@ -158,3 +164,3 @@ var headers = options.headers, url = options.url;
         // Headers
-        options.headers = extend({}, options.headers);
+        options.headers = Object.assign({}, options.headers);
         // Convert array-valued query params to strings
@@ -177,3 +183,3 @@ if (qs && Object.keys(qs).length > 0) {
             // form-data generates headers that MUST be included or the request will fail
-            headers = extend(true, {}, headers, multipartForm.getHeaders());
+            headers = Object.assign({}, headers, multipartForm.getHeaders());
         }
@@ -180,0 +186,0 @@ // TEMPORARY: Disabling gzipping due to bug in axios until fix is released:

package.json

 {
   "name": "ibm-cloud-sdk-core",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Core functionality to support SDKs generated with IBM's OpenAPI 3 SDK Generator.",
@@ -32,3 +32,2 @@ "main": "index",
   "dependencies": {
-    "@types/extend": "~3.0.0",
     "@types/file-type": "~5.2.1",
@@ -43,3 +42,2 @@ "@types/isstream": "^0.1.0",
     "expect": "^26.1.0",
-    "extend": "~3.0.2",
     "file-type": "^7.7.1",
@@ -46,0 +44,0 @@ "form-data": "^2.3.3",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Dependency count

19

decreased by-9.52%

Worsened metrics

Total package byte prevSize

213010

decreased by-0.01%

Lines of code

4035

decreased by-0.07%

Dependency changes

• - Removed@types/extend@~3.0.0

• - Removedextend@~3.0.2

• - Removed@types/extend@3.0.4(transitive)

• - Removedextend@3.0.2(transitive)