ibm-cloud-sdk-core 3.2.2-beta-3 → 3.2.2-beta-5

package/auth/authenticators/basic-authenticator.d.ts

@@ -16,7 +16,7 @@
 import { Authenticator } from './authenticator';
 import { AuthenticateOptions } from './authenticator-interface';
 /** Configuration options for basic authentication. */
-export declare type Options = {
+export type Options = {
     /** The username to be used in basic authorization. */
     username: string;
     /** The password to be used in basic authorization. */

package/auth/authenticators/bearer-token-authenticator.d.ts

@@ -16,7 +16,7 @@
 import { Authenticator } from './authenticator';
 import { AuthenticateOptions } from './authenticator-interface';
 /** Configuration options for bearer authentication. */
-export declare type Options = {
+export type Options = {
     /** The bearer token to be added to requests. */
     bearerToken: string;
 };

package/auth/authenticators/token-request-based-authenticator.d.ts

@@ -19,7 +19,7 @@ import { JwtTokenManager } from '../token-managers';
 import { Authenticator } from './authenticator';
 import { AuthenticateOptions } from './authenticator-interface';
 /** Configuration options for token-based authentication. */
-export declare type BaseOptions = {
+export type BaseOptions = {
     /** Headers to be sent with every outbound HTTP requests to token services. */
     headers?: OutgoingHttpHeaders;
     /**

package/auth/token-managers/container-token-manager.js

@@ -44,7 +44,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/auth/token-managers/jwt-token-manager.d.ts

@@ -1,6 +1,6 @@
 import { TokenManager, TokenManagerOptions } from './token-manager';
 /** Configuration options for JWT token retrieval. */
-export declare type JwtTokenManagerOptions = TokenManagerOptions;
+export type JwtTokenManagerOptions = TokenManagerOptions;
 /**
  * A class for shared functionality for parsing, storing, and requesting
  * JWT tokens. Intended to be used as a parent to be extended for token

package/auth/token-managers/token-manager.d.ts

@@ -17,7 +17,7 @@
 import { OutgoingHttpHeaders } from 'http';
 import { RequestWrapper } from '../../lib/request-wrapper';
 /** Configuration options for token retrieval. */
-export declare type TokenManagerOptions = {
+export type TokenManagerOptions = {
     /** The endpoint for token requests. */
     url?: string;
     /** Headers to be sent with every service token request. */

package/auth/token-managers/vpc-instance-token-manager.js

@@ -44,7 +44,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/docs/ibm-cloud-sdk-core.api.json

@@ -4894,7 +4894,7 @@
           "excerptTokens": [
             {
               "kind": "Content",
-              "text": "export declare type JwtTokenManagerOptions = "
+              "text": "export type JwtTokenManagerOptions = "
             },
             {
               "kind": "Reference",
@@ -6020,7 +6020,7 @@
           "excerptTokens": [
             {
               "kind": "Content",
-              "text": "export declare type TokenManagerOptions = "
+              "text": "export type TokenManagerOptions = "
             },
             {
               "kind": "Content",

package/es/auth/authenticators/basic-authenticator.d.ts

@@ -16,7 +16,7 @@
 import { Authenticator } from './authenticator';
 import { AuthenticateOptions } from './authenticator-interface';
 /** Configuration options for basic authentication. */
-export declare type Options = {
+export type Options = {
     /** The username to be used in basic authorization. */
     username: string;
     /** The password to be used in basic authorization. */

package/es/auth/authenticators/bearer-token-authenticator.d.ts

@@ -16,7 +16,7 @@
 import { Authenticator } from './authenticator';
 import { AuthenticateOptions } from './authenticator-interface';
 /** Configuration options for bearer authentication. */
-export declare type Options = {
+export type Options = {
     /** The bearer token to be added to requests. */
     bearerToken: string;
 };

package/es/auth/authenticators/token-request-based-authenticator.d.ts

@@ -19,7 +19,7 @@ import { JwtTokenManager } from '../token-managers';
 import { Authenticator } from './authenticator';
 import { AuthenticateOptions } from './authenticator-interface';
 /** Configuration options for token-based authentication. */
-export declare type BaseOptions = {
+export type BaseOptions = {
     /** Headers to be sent with every outbound HTTP requests to token services. */
     headers?: OutgoingHttpHeaders;
     /**

package/es/auth/token-managers/jwt-token-manager.d.ts

@@ -1,6 +1,6 @@
 import { TokenManager, TokenManagerOptions } from './token-manager';
 /** Configuration options for JWT token retrieval. */
-export declare type JwtTokenManagerOptions = TokenManagerOptions;
+export type JwtTokenManagerOptions = TokenManagerOptions;
 /**
  * A class for shared functionality for parsing, storing, and requesting
  * JWT tokens. Intended to be used as a parent to be extended for token

package/es/auth/token-managers/token-manager.d.ts

@@ -17,7 +17,7 @@
 import { OutgoingHttpHeaders } from 'http';
 import { RequestWrapper } from '../../lib/request-wrapper';
 /** Configuration options for token retrieval. */
-export declare type TokenManagerOptions = {
+export type TokenManagerOptions = {
     /** The endpoint for token requests. */
     url?: string;
     /** Headers to be sent with every service token request. */

package/es/lib/cookie-support.js

@@ -69,10 +69,9 @@ export class CookieInterceptor {
                 logger.debug('CookieInterceptor: checking for set-cookie headers.');
                 const cookies = response.headers['set-cookie'];
                 if (cookies) {
-                    logger.debug('CookieInterceptor: setting cookies in jar.');
-                    cookies.forEach((cookie) => __awaiter(this, void 0, void 0, function* () {
-                        yield this.cookieJar.setCookie(cookie, response.request.url);
-                    }));
+                    logger.debug(`CookieInterceptor: setting cookies in jar for URL ${response.config.url}.`);
+                    // Write cookies sequentially by chaining the promises in a reduce
+                    yield cookies.reduce((cookiePromise, cookie) => cookiePromise.then(() => this.cookieJar.setCookie(cookie, response.config.url)), Promise.resolve(null));
                 }
                 else {
                     logger.debug('CookieInterceptor: no set-cookie headers.');

package/es/lib/request-wrapper.js

@@ -73,8 +73,10 @@ export class RequestWrapper {
         // if a cookie jar is provided, wrap the axios instance and update defaults
         if (axiosOptions.jar) {
             const cookieInterceptor = new CookieInterceptor(axiosOptions.jar);
-            this.axiosInstance.interceptors.request.use((config) => cookieInterceptor.requestInterceptor(config));
-            this.axiosInstance.interceptors.response.use((response) => cookieInterceptor.responseInterceptor(response));
+            const requestCookieInterceptor = (config) => cookieInterceptor.requestInterceptor(config);
+            const responseCookieInterceptor = (response) => cookieInterceptor.responseInterceptor(response);
+            this.axiosInstance.interceptors.request.use(requestCookieInterceptor);
+            this.axiosInstance.interceptors.response.use(responseCookieInterceptor);
         }
         // get retry config properties and conditionally enable retries
         if (axiosOptions.enableRetries) {

package/lib/cookie-support.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -108,31 +108,31 @@ var CookieInterceptor = /** @class */ (function () {
             var cookies;
             var _this = this;
             return __generator(this, function (_a) {
-                logger_1.default.debug('CookieInterceptor: intercepting response.');
-                if (response && response.headers) {
-                    logger_1.default.debug('CookieInterceptor: checking for set-cookie headers.');
-                    cookies = response.headers['set-cookie'];
-                    if (cookies) {
-                        logger_1.default.debug('CookieInterceptor: setting cookies in jar.');
-                        cookies.forEach(function (cookie) { return __awaiter(_this, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, this.cookieJar.setCookie(cookie, response.request.url)];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); });
-                    }
-                    else {
+                switch (_a.label) {
+                    case 0:
+                        logger_1.default.debug('CookieInterceptor: intercepting response.');
+                        if (!(response && response.headers)) return [3 /*break*/, 4];
+                        logger_1.default.debug('CookieInterceptor: checking for set-cookie headers.');
+                        cookies = response.headers['set-cookie'];
+                        if (!cookies) return [3 /*break*/, 2];
+                        logger_1.default.debug("CookieInterceptor: setting cookies in jar for URL ".concat(response.config.url, "."));
+                        // Write cookies sequentially by chaining the promises in a reduce
+                        return [4 /*yield*/, cookies.reduce(function (cookiePromise, cookie) {
+                                return cookiePromise.then(function () { return _this.cookieJar.setCookie(cookie, response.config.url); });
+                            }, Promise.resolve(null))];
+                    case 1:
+                        // Write cookies sequentially by chaining the promises in a reduce
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
                         logger_1.default.debug('CookieInterceptor: no set-cookie headers.');
-                    }
-                }
-                else {
-                    logger_1.default.debug('CookieInterceptor: no response headers.');
+                        _a.label = 3;
+                    case 3: return [3 /*break*/, 5];
+                    case 4:
+                        logger_1.default.debug('CookieInterceptor: no response headers.');
+                        _a.label = 5;
+                    case 5: return [2 /*return*/, response];
                 }
-                return [2 /*return*/, response];
             });
         });
     };

package/lib/helper.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/lib/request-wrapper.js

@@ -49,7 +49,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -141,12 +141,12 @@ var RequestWrapper = /** @class */ (function () {
         // if a cookie jar is provided, wrap the axios instance and update defaults
         if (axiosOptions.jar) {
             var cookieInterceptor_1 = new cookie_support_1.CookieInterceptor(axiosOptions.jar);
-            this.axiosInstance.interceptors.request.use(function (config) {
-                return cookieInterceptor_1.requestInterceptor(config);
-            });
-            this.axiosInstance.interceptors.response.use(function (response) {
+            var requestCookieInterceptor = function (config) { return cookieInterceptor_1.requestInterceptor(config); };
+            var responseCookieInterceptor = function (response) {
                 return cookieInterceptor_1.responseInterceptor(response);
-            });
+            };
+            this.axiosInstance.interceptors.request.use(requestCookieInterceptor);
+            this.axiosInstance.interceptors.response.use(responseCookieInterceptor);
         }
         // get retry config properties and conditionally enable retries
         if (axiosOptions.enableRetries) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ibm-cloud-sdk-core",
-  "version": "3.2.2-beta-3",
+  "version": "3.2.2-beta-5",
   "description": "Core functionality to support SDKs generated with IBM's OpenAPI SDK Generator.",
   "main": "./index.js",
   "typings": "./es/index.d.ts",
@@ -62,21 +62,21 @@
     "eslint-plugin-node": "^9.0.0",
     "eslint-plugin-prettier": "^3.0.1",
     "jest": "^29.3.1",
-    "nock": "^13.1.2",
+    "nock": "^13.2.9",
     "npm-run-all": "^4.1.5",
     "object.assign": "~4.1.0",
     "package-json-reducer": "^1.0.18",
     "prettier": "~2.3.0",
     "rimraf": "^3.0.2",
     "semantic-release": "19.0.3",
-    "typescript": "4.8.4"
+    "typescript": "~4.9.4"
   },
   "dependencies": {
     "@types/file-type": "~5.2.1",
     "@types/isstream": "^0.1.0",
     "@types/node": "~10.14.19",
     "@types/tough-cookie": "^4.0.0",
-    "axios": "1.2.0",
+    "axios": "1.2.1",
     "camelcase": "^5.3.1",
     "debug": "^4.1.1",
     "dotenv": "^6.2.0",