ibm-cloud-sdk-core 3.2.2-beta → 3.2.2-beta-2

package/es/lib/cookie-support.d.ts

@@ -0,0 +1,23 @@
+/**
+ * (C) Copyright IBM Corp. 2022.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { AxiosRequestConfig, AxiosResponse } from 'axios';
+import { CookieJar } from 'tough-cookie';
+export declare class CookieInterceptor {
+    private readonly cookieJar;
+    constructor(cookieJar: CookieJar | boolean);
+    requestInterceptor(config: AxiosRequestConfig): Promise<AxiosRequestConfig<any>>;
+    responseInterceptor(response: AxiosResponse): Promise<AxiosResponse<any, any>>;
+}

package/es/lib/cookie-support.js

@@ -0,0 +1,87 @@
+/**
+ * (C) Copyright IBM Corp. 2022.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import extend from 'extend';
+import { CookieJar } from 'tough-cookie';
+import logger from './logger';
+export class CookieInterceptor {
+    constructor(cookieJar) {
+        if (cookieJar) {
+            if (cookieJar === true) {
+                logger.debug('CookieInterceptor: creating new CookieJar');
+                this.cookieJar = new CookieJar();
+            }
+            else {
+                logger.debug('CookieInterceptor: using supplied CookieJar');
+                this.cookieJar = cookieJar;
+            }
+        }
+        else {
+            throw new Error('Must supply a cookie jar or true.');
+        }
+    }
+    requestInterceptor(config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            logger.debug('CookieInterceptor: intercepting request');
+            if (config && config.url) {
+                logger.debug(`CookieInterceptor: getting cookies for: ${config.url}`);
+                const cookieHeaderValue = yield this.cookieJar.getCookieString(config.url);
+                if (cookieHeaderValue) {
+                    logger.debug('CookieInterceptor: setting cookie header');
+                    const cookieHeader = { cookie: cookieHeaderValue };
+                    config.headers = extend(true, {}, config.headers, cookieHeader);
+                }
+                else {
+                    logger.debug(`CookieInterceptor: no cookies for: ${config.url}`);
+                }
+            }
+            else {
+                logger.debug('CookieInterceptor: no request URL.');
+            }
+            return config;
+        });
+    }
+    responseInterceptor(response) {
+        return __awaiter(this, void 0, void 0, function* () {
+            logger.debug('CookieInterceptor: intercepting response.');
+            if (response && response.headers) {
+                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);
+                    }));
+                }
+                else {
+                    logger.debug('CookieInterceptor: no set-cookie headers.');
+                }
+            }
+            else {
+                logger.debug('CookieInterceptor: no response headers.');
+            }
+            return response;
+        });
+    }
+}

package/{dist/es → es}/lib/request-wrapper.d.ts

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2014, 2021.
+ * (C) Copyright IBM Corp. 2014, 2022.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/{dist/es → es}/lib/request-wrapper.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 /**
- * (C) Copyright IBM Corp. 2014, 2021.
+ * (C) Copyright IBM Corp. 2014, 2022.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,17 +25,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
  */
 import axios from 'axios';
 import * as rax from 'retry-axios';
-import { wrapper as axiosCookieJarSupport } from 'axios-cookiejar-support';
 import extend from 'extend';
 import FormData from 'form-data';
 import { Agent } from 'https';
 import isStream from 'isstream';
 import { stringify } from 'querystring';
 import { gzipSync } from 'zlib';
-import { CookieJar } from 'tough-cookie';
 import { buildRequestFileObject, isEmptyObject, isFileData, isFileWithMetadata, stripTrailingSlash, } from './helper';
 import logger from './logger';
 import { streamToPromise } from './stream-to-promise';
+import { CookieInterceptor } from './cookie-support';
 export class RequestWrapper {
     constructor(axiosOptions) {
         axiosOptions = axiosOptions || {};
@@ -73,16 +72,9 @@ export class RequestWrapper {
         });
         // if a cookie jar is provided, wrap the axios instance and update defaults
         if (axiosOptions.jar) {
-            axiosCookieJarSupport(this.axiosInstance);
-            // axios-cookiejar-support < 2.x accepted a boolean
-            // some SDKs might be using that, so create a default
-            // CookieJar if detecting true.
-            if (axiosOptions.jar === true) {
-                this.axiosInstance.defaults.jar = new CookieJar();
-            }
-            else {
-                this.axiosInstance.defaults.jar = 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));
         }
         // get retry config properties and conditionally enable retries
         if (axiosOptions.enableRetries) {

package/lib/cookie-support.d.ts

@@ -0,0 +1,23 @@
+/**
+ * (C) Copyright IBM Corp. 2022.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { AxiosRequestConfig, AxiosResponse } from 'axios';
+import { CookieJar } from 'tough-cookie';
+export declare class CookieInterceptor {
+    private readonly cookieJar;
+    constructor(cookieJar: CookieJar | boolean);
+    requestInterceptor(config: AxiosRequestConfig): Promise<AxiosRequestConfig<any>>;
+    responseInterceptor(response: AxiosResponse): Promise<AxiosResponse<any, any>>;
+}