@webex/webex-core 2.59.3-next.1 → 2.59.4

package/src/interceptors/redirect.js

@@ -1,106 +1,106 @@
-/* eslint-disable prefer-destructuring */
-
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import {clone} from 'lodash';
-import {Interceptor} from '@webex/http-core';
-
-const requestHeaderName = 'cisco-no-http-redirect';
-const responseHeaderName = 'cisco-location';
-const LOCUS_REDIRECT_ERROR = 2000002;
-
-/**
- * @class
- */
-export default class RedirectInterceptor extends Interceptor {
-  /**
-   * @returns {RedirectInterceptor}
-   */
-  static create() {
-    return new RedirectInterceptor({webex: this});
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @returns {Object}
-   */
-  onRequest(options) {
-    if (options && options.uri && typeof options.uri === 'string') {
-      if (
-        options.uri.includes('https://idbroker') ||
-        options.uri.includes(this.webex.config.credentials.samlUrl) ||
-        options.uri.includes(this.webex.config.credentials.tokenUrl) ||
-        options.uri.includes(this.webex.config.credentials.authorizeUrl)
-      ) {
-        return options;
-      }
-    }
-
-    // If cisco-no-http-redirect is already set, don't overwrite it
-    if (requestHeaderName in options.headers) {
-      // If cisco-no-http-redirect is set to null, false, or undefined, delete
-      // it to prevent a CORS preflight.
-      if (!options.headers[requestHeaderName]) {
-        Reflect.deleteProperty(options.headers, requestHeaderName);
-      }
-
-      return options;
-    }
-    options.headers[requestHeaderName] = true;
-    options.$redirectCount = options.$redirectCount || 0;
-
-    return options;
-  }
-
-  /**
-   * @see Interceptor#onResponse
-   * @param {Object} options
-   * @param {HttpResponse} response
-   * @returns {Object}
-   */
-  onResponse(options, response) {
-    /* eslint-disable no-else-return */
-    if (response.headers && response.headers[responseHeaderName]) {
-      options = clone(options);
-      options.uri = response.headers[responseHeaderName];
-      options.$redirectCount += 1;
-      if (options.$redirectCount > this.webex.config.maxAppLevelRedirects) {
-        return Promise.reject(new Error('Maximum redirects exceeded'));
-      }
-
-      return this.webex.request(options);
-    } else if (
-      response.headers &&
-      response.body &&
-      response.body.errorCode === LOCUS_REDIRECT_ERROR &&
-      response.body.location
-    ) {
-      options = clone(options);
-
-      this.webex.logger.warn('redirect: url redirects needed from', options.uri);
-      if (response.options && response.options.qs) {
-        // for POST requests
-        const newUrl = response.body.location.split('?');
-
-        options.uri = newUrl[0]; // params are already present in the qs
-      } else {
-        // for GET requests
-        options.uri = response.body.location;
-      }
-
-      this.webex.logger.warn('redirect: url redirects needed to', options.uri);
-      options.$redirectCount += 1;
-      if (options.$redirectCount > this.webex.config.maxLocusRedirects) {
-        return Promise.reject(new Error('Maximum redirects exceeded'));
-      }
-
-      return this.webex.request(options);
-    }
-    /* eslint-enable no-else-return */
-
-    return response;
-  }
-}
+/* eslint-disable prefer-destructuring */
+
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {clone} from 'lodash';
+import {Interceptor} from '@webex/http-core';
+
+const requestHeaderName = 'cisco-no-http-redirect';
+const responseHeaderName = 'cisco-location';
+const LOCUS_REDIRECT_ERROR = 2000002;
+
+/**
+ * @class
+ */
+export default class RedirectInterceptor extends Interceptor {
+  /**
+   * @returns {RedirectInterceptor}
+   */
+  static create() {
+    return new RedirectInterceptor({webex: this});
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @returns {Object}
+   */
+  onRequest(options) {
+    if (options && options.uri && typeof options.uri === 'string') {
+      if (
+        options.uri.includes('https://idbroker') ||
+        options.uri.includes(this.webex.config.credentials.samlUrl) ||
+        options.uri.includes(this.webex.config.credentials.tokenUrl) ||
+        options.uri.includes(this.webex.config.credentials.authorizeUrl)
+      ) {
+        return options;
+      }
+    }
+
+    // If cisco-no-http-redirect is already set, don't overwrite it
+    if (requestHeaderName in options.headers) {
+      // If cisco-no-http-redirect is set to null, false, or undefined, delete
+      // it to prevent a CORS preflight.
+      if (!options.headers[requestHeaderName]) {
+        Reflect.deleteProperty(options.headers, requestHeaderName);
+      }
+
+      return options;
+    }
+    options.headers[requestHeaderName] = true;
+    options.$redirectCount = options.$redirectCount || 0;
+
+    return options;
+  }
+
+  /**
+   * @see Interceptor#onResponse
+   * @param {Object} options
+   * @param {HttpResponse} response
+   * @returns {Object}
+   */
+  onResponse(options, response) {
+    /* eslint-disable no-else-return */
+    if (response.headers && response.headers[responseHeaderName]) {
+      options = clone(options);
+      options.uri = response.headers[responseHeaderName];
+      options.$redirectCount += 1;
+      if (options.$redirectCount > this.webex.config.maxAppLevelRedirects) {
+        return Promise.reject(new Error('Maximum redirects exceeded'));
+      }
+
+      return this.webex.request(options);
+    } else if (
+      response.headers &&
+      response.body &&
+      response.body.errorCode === LOCUS_REDIRECT_ERROR &&
+      response.body.location
+    ) {
+      options = clone(options);
+
+      this.webex.logger.warn('redirect: url redirects needed from', options.uri);
+      if (response.options && response.options.qs) {
+        // for POST requests
+        const newUrl = response.body.location.split('?');
+
+        options.uri = newUrl[0]; // params are already present in the qs
+      } else {
+        // for GET requests
+        options.uri = response.body.location;
+      }
+
+      this.webex.logger.warn('redirect: url redirects needed to', options.uri);
+      options.$redirectCount += 1;
+      if (options.$redirectCount > this.webex.config.maxLocusRedirects) {
+        return Promise.reject(new Error('Maximum redirects exceeded'));
+      }
+
+      return this.webex.request(options);
+    }
+    /* eslint-enable no-else-return */
+
+    return response;
+  }
+}

package/src/interceptors/request-event.js

@@ -1,93 +1,93 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import {get} from 'lodash';
-import {Interceptor} from '@webex/http-core';
-
-/**
- * @class
- */
-export default class RequestEventInterceptor extends Interceptor {
-  /**
-   * @returns {RequestEventInterceptor}
-   */
-  static create() {
-    return new RequestEventInterceptor({webex: this});
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @returns {Object}
-   */
-  onRequest(options) {
-    const logger = get(this, 'webex.logger', console);
-
-    try {
-      this.webex.trigger('request:start', options);
-    } catch (error) {
-      logger.warn('event handler for request:start failed ', error);
-    }
-
-    return Promise.resolve(options);
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @param {Error} reason
-   * @returns {Object}
-   */
-  onRequestError(options, reason) {
-    // We need to do the normal onRequest logging, but then log how the request
-    // failed since the response logger won't be called.
-    const logger = get(this, 'webex.logger', console);
-
-    try {
-      this.webex.trigger('request:end', options, reason);
-      this.webex.trigger('request:failure', options, reason);
-    } catch (error) {
-      logger.warn('event handler for request:end failed ', error);
-    }
-
-    return Promise.reject(reason);
-  }
-
-  /**
-   * @see Interceptor#onResponse
-   * @param {Object} options
-   * @param {HttpResponse} response
-   * @returns {Object}
-   */
-  onResponse(options, response) {
-    const logger = get(this, 'webex.logger', console);
-
-    try {
-      this.webex.trigger('request:success', response.options, response);
-    } catch (error) {
-      logger.warn('event handler for request:success failed ', error);
-    }
-
-    return Promise.resolve(response);
-  }
-
-  /**
-   * @see Interceptor#onResponseError
-   * @param {Object} options
-   * @param {Error} reason
-   * @returns {Object}
-   */
-  onResponseError(options, reason) {
-    const logger = get(this, 'webex.logger', console);
-
-    try {
-      this.webex.trigger('request:end', options, reason);
-      this.webex.trigger('request:failure', options, reason);
-    } catch (error) {
-      logger.warn('event handler for request:failure failed ', error);
-    }
-
-    return Promise.reject(reason);
-  }
-}
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {get} from 'lodash';
+import {Interceptor} from '@webex/http-core';
+
+/**
+ * @class
+ */
+export default class RequestEventInterceptor extends Interceptor {
+  /**
+   * @returns {RequestEventInterceptor}
+   */
+  static create() {
+    return new RequestEventInterceptor({webex: this});
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @returns {Object}
+   */
+  onRequest(options) {
+    const logger = get(this, 'webex.logger', console);
+
+    try {
+      this.webex.trigger('request:start', options);
+    } catch (error) {
+      logger.warn('event handler for request:start failed ', error);
+    }
+
+    return Promise.resolve(options);
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @param {Error} reason
+   * @returns {Object}
+   */
+  onRequestError(options, reason) {
+    // We need to do the normal onRequest logging, but then log how the request
+    // failed since the response logger won't be called.
+    const logger = get(this, 'webex.logger', console);
+
+    try {
+      this.webex.trigger('request:end', options, reason);
+      this.webex.trigger('request:failure', options, reason);
+    } catch (error) {
+      logger.warn('event handler for request:end failed ', error);
+    }
+
+    return Promise.reject(reason);
+  }
+
+  /**
+   * @see Interceptor#onResponse
+   * @param {Object} options
+   * @param {HttpResponse} response
+   * @returns {Object}
+   */
+  onResponse(options, response) {
+    const logger = get(this, 'webex.logger', console);
+
+    try {
+      this.webex.trigger('request:success', response.options, response);
+    } catch (error) {
+      logger.warn('event handler for request:success failed ', error);
+    }
+
+    return Promise.resolve(response);
+  }
+
+  /**
+   * @see Interceptor#onResponseError
+   * @param {Object} options
+   * @param {Error} reason
+   * @returns {Object}
+   */
+  onResponseError(options, reason) {
+    const logger = get(this, 'webex.logger', console);
+
+    try {
+      this.webex.trigger('request:end', options, reason);
+      this.webex.trigger('request:failure', options, reason);
+    } catch (error) {
+      logger.warn('event handler for request:failure failed ', error);
+    }
+
+    return Promise.reject(reason);
+  }
+}

package/src/interceptors/request-logger.js

@@ -1,78 +1,78 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import util from 'util';
-
-import {get, has, isArray, isString, omit} from 'lodash';
-import {Interceptor} from '@webex/http-core';
-
-/**
- * @class
- */
-export default class RequestLoggerInterceptor extends Interceptor {
-  /**
-   * @returns {RequestLoggerInterceptor}
-   */
-  static create() {
-    return new RequestLoggerInterceptor({webex: this});
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @returns {Object}
-   */
-  onRequest(options) {
-    const logger = get(this, 'webex.logger', console);
-
-    logger.info('/**********************************************************************\\ ');
-    logger.info('Request:', options.method || 'GET', options.uri);
-    logger.info('WEBEX_TRACKINGID: ', get(options, 'headers.trackingid'));
-    /* istanbul ignore next */
-    if (has(options, 'headers.x-trans-id')) {
-      logger.info('X-Trans-ID: ', get(options, 'headers.x-trans-id'));
-    }
-    const now = new Date();
-
-    if (process.env.ENABLE_VERBOSE_NETWORK_LOGGING) {
-      logger.info('timestamp (start): ', now.getTime(), now.toISOString());
-      try {
-        // Determine if body is a buffer without relying on Buffer to avoid
-        // node/browser conflicts.
-        if (
-          options.body &&
-          options.body.length &&
-          !isArray(options.body) &&
-          !isString(options.body)
-        ) {
-          logger.info('Request Options:', util.inspect(omit(options, 'body'), {depth: null}));
-        } else {
-          logger.info('Request Options:', util.inspect(options, {depth: null}));
-        }
-      } catch (e) {
-        logger.warn('Could not stringify request options:', e);
-      }
-    }
-
-    return Promise.resolve(options);
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @param {Error} reason
-   * @returns {Object}
-   */
-  onRequestError(options, reason) {
-    // We need to do the normal onRequest logging, but then log how the request
-    // failed since the response logger won't be called.
-    this.onRequest(options);
-    const logger = get(this, 'webex.logger', console);
-
-    logger.error('Request Failed: ', reason.stack);
-    logger.info('\\**********************************************************************/');
-
-    return Promise.reject(reason);
-  }
-}
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import util from 'util';
+
+import {get, has, isArray, isString, omit} from 'lodash';
+import {Interceptor} from '@webex/http-core';
+
+/**
+ * @class
+ */
+export default class RequestLoggerInterceptor extends Interceptor {
+  /**
+   * @returns {RequestLoggerInterceptor}
+   */
+  static create() {
+    return new RequestLoggerInterceptor({webex: this});
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @returns {Object}
+   */
+  onRequest(options) {
+    const logger = get(this, 'webex.logger', console);
+
+    logger.info('/**********************************************************************\\ ');
+    logger.info('Request:', options.method || 'GET', options.uri);
+    logger.info('WEBEX_TRACKINGID: ', get(options, 'headers.trackingid'));
+    /* istanbul ignore next */
+    if (has(options, 'headers.x-trans-id')) {
+      logger.info('X-Trans-ID: ', get(options, 'headers.x-trans-id'));
+    }
+    const now = new Date();
+
+    if (process.env.ENABLE_VERBOSE_NETWORK_LOGGING) {
+      logger.info('timestamp (start): ', now.getTime(), now.toISOString());
+      try {
+        // Determine if body is a buffer without relying on Buffer to avoid
+        // node/browser conflicts.
+        if (
+          options.body &&
+          options.body.length &&
+          !isArray(options.body) &&
+          !isString(options.body)
+        ) {
+          logger.info('Request Options:', util.inspect(omit(options, 'body'), {depth: null}));
+        } else {
+          logger.info('Request Options:', util.inspect(options, {depth: null}));
+        }
+      } catch (e) {
+        logger.warn('Could not stringify request options:', e);
+      }
+    }
+
+    return Promise.resolve(options);
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @param {Error} reason
+   * @returns {Object}
+   */
+  onRequestError(options, reason) {
+    // We need to do the normal onRequest logging, but then log how the request
+    // failed since the response logger won't be called.
+    this.onRequest(options);
+    const logger = get(this, 'webex.logger', console);
+
+    logger.error('Request Failed: ', reason.stack);
+    logger.info('\\**********************************************************************/');
+
+    return Promise.reject(reason);
+  }
+}