@webex/webex-core 3.0.0-beta.2 → 3.0.0-beta.21

package/src/lib/credentials/token.js

@@ -55,7 +55,7 @@ const Token = WebexPlugin.extend({
       deps: ['access_token', 'isExpired'],
       fn() {
         return !!this.access_token && !this.isExpired;
-      }
+      },
     },
 
     /**
@@ -76,7 +76,7 @@ const Token = WebexPlugin.extend({
       deps: ['canAuthorize'],
       fn() {
         return this.canAuthorize && !!this.config.client_id;
-      }
+      },
     },
 
     /**
@@ -101,7 +101,7 @@ const Token = WebexPlugin.extend({
         }
 
         return !!this.refresh_token && !!this.config.client_secret;
-      }
+      },
     },
 
     /**
@@ -118,7 +118,7 @@ const Token = WebexPlugin.extend({
         // in order to avoid setting `cache:false`, we'll use a private property
         // and a timer rather than comparing to `Date.now()`;
         return !!this.expires && this._isExpired;
-      }
+      },
     },
 
     /**
@@ -137,8 +137,8 @@ const Token = WebexPlugin.extend({
         }
 
         return `${this.token_type} ${this.access_token}`;
-      }
-    }
+      },
+    },
   },
 
   namespace: 'Credentials',
@@ -196,8 +196,8 @@ const Token = WebexPlugin.extend({
      */
     token_type: {
       default: 'Bearer',
-      type: 'string'
-    }
+      type: 'string',
+    },
   },
 
   session: {
@@ -210,7 +210,7 @@ const Token = WebexPlugin.extend({
      */
     _isExpired: {
       default: false,
-      type: 'boolean'
+      type: 'boolean',
     },
     /**
      * Handle to the previous token that we'll revoke when we refresh this
@@ -224,14 +224,14 @@ const Token = WebexPlugin.extend({
      * @type {Object}
      */
     previousToken: {
-      type: 'state'
-    }
+      type: 'state',
+    },
   },
 
   @oneFlight({
     keyFactory(scope) {
       return scope;
-    }
+    },
   })
   /**
    * Uses this token to request a new Token with a subset of this Token's scopes
@@ -252,8 +252,7 @@ const Token = WebexPlugin.extend({
     if (!this.canDownscope) {
       if (this.config.client_id) {
         this.logger.info('token: request received to downscope invalid access_token');
-      }
-      else {
+      } else {
         this.logger.trace('token: cannot downscope without client_id');
       }
 
@@ -273,18 +272,19 @@ const Token = WebexPlugin.extend({
       return Promise.reject(new Error('token: scope reduction requires a reduced scope'));
     }
 
-    return this.webex.request({
-      method: 'POST',
-      uri: this.config.tokenUrl,
-      addAuthHeader: false,
-      form: {
-        grant_type: 'urn:cisco:oauth:grant-type:scope-reduction',
-        token: this.access_token,
-        scope,
-        client_id: this.config.client_id,
-        self_contained_token: true
-      }
-    })
+    return this.webex
+      .request({
+        method: 'POST',
+        uri: this.config.tokenUrl,
+        addAuthHeader: false,
+        form: {
+          grant_type: 'urn:cisco:oauth:grant-type:scope-reduction',
+          token: this.access_token,
+          scope,
+          client_id: this.config.client_id,
+          self_contained_token: true,
+        },
+      })
       .then((res) => {
         this.logger.info(`token: downscoped token to ${scope}`);
 
@@ -317,8 +317,7 @@ const Token = WebexPlugin.extend({
     if (this.expires) {
       if (this.expires < Date.now()) {
         this._isExpired = true;
-      }
-      else {
+      } else {
         safeSetTimeout(() => {
           this._isExpired = true;
         }, this.expires - Date.now());
@@ -349,22 +348,26 @@ const Token = WebexPlugin.extend({
       promise = Promise.resolve(this.config.refreshCallback(this.webex, this));
     }
 
-    return (promise || this.webex.request({
-      method: 'POST',
-      uri: this.config.tokenUrl,
-      form: {
-        grant_type: 'refresh_token',
-        redirect_uri: this.config.redirect_uri,
-        refresh_token: this.refresh_token
-      },
-      auth: {
-        user: this.config.client_id,
-        pass: this.config.client_secret,
-        sendImmediately: true
-      },
-      shouldRefreshAccessToken: false
-    })
-      .then((res) => res.body))
+    return (
+      promise ||
+      this.webex
+        .request({
+          method: 'POST',
+          uri: this.config.tokenUrl,
+          form: {
+            grant_type: 'refresh_token',
+            redirect_uri: this.config.redirect_uri,
+            refresh_token: this.refresh_token,
+          },
+          auth: {
+            user: this.config.client_id,
+            pass: this.config.client_secret,
+            sendImmediately: true,
+          },
+          shouldRefreshAccessToken: false,
+        })
+        .then((res) => res.body)
+    )
       .then((obj) => {
         if (!obj) {
           throw new Error('token: refreshCallback() did not produce an object');
@@ -373,7 +376,10 @@ const Token = WebexPlugin.extend({
         // the current refresh token and related values to the response (note:
         // at time of implementation, CI never sends a new refresh token)
         if (!obj.refresh_token) {
-          Object.assign(obj, pick(this, 'refresh_token', 'refresh_token_expires', 'refresh_token_expires_in'));
+          Object.assign(
+            obj,
+            pick(this, 'refresh_token', 'refresh_token_expires', 'refresh_token_expires_in')
+          );
         }
 
         // If the new token is the same as the previous token, then we may have
@@ -436,27 +442,23 @@ const Token = WebexPlugin.extend({
 
     this.logger.info('token: revoking access token');
 
-    return this.webex.request({
-      method: 'POST',
-      uri: this.config.revokeUrl,
-      form: {
-        token: this.access_token,
-        token_type_hint: 'access_token'
-      },
-      auth: {
-        user: this.config.client_id,
-        pass: this.config.client_secret,
-        sendImmediately: true
-      },
-      shouldRefreshAccessToken: false
-    })
+    return this.webex
+      .request({
+        method: 'POST',
+        uri: this.config.revokeUrl,
+        form: {
+          token: this.access_token,
+          token_type_hint: 'access_token',
+        },
+        auth: {
+          user: this.config.client_id,
+          pass: this.config.client_secret,
+          sendImmediately: true,
+        },
+        shouldRefreshAccessToken: false,
+      })
       .then(() => {
-        this.unset([
-          'access_token',
-          'expires',
-          'expires_in',
-          'token_type'
-        ]);
+        this.unset(['access_token', 'expires', 'expires_in', 'token_type']);
         this.logger.info('token: access token revoked');
       })
       .catch(processGrantError);
@@ -469,7 +471,7 @@ const Token = WebexPlugin.extend({
     if (!attrs.token_type && attrs.access_token && attrs.access_token.includes(' ')) {
       const [token_type, access_token] = attrs.access_token.split(' ');
 
-      attrs = Object.assign({}, attrs, {access_token, token_type});
+      attrs = {...attrs, access_token, token_type};
     }
     const now = Date.now();
 
@@ -516,38 +518,42 @@ const Token = WebexPlugin.extend({
       throw new Error('Token#validate() must not be used in production');
     }
 
-    return this.webex.request({
-      method: 'POST',
-      service: 'conversation',
-      resource: 'users/validateAuthToken',
-      body: {
-        token: this.access_token
-      }
-    })
+    return this.webex
+      .request({
+        method: 'POST',
+        service: 'conversation',
+        resource: 'users/validateAuthToken',
+        body: {
+          token: this.access_token,
+        },
+      })
       .catch((reason) => {
         if ('statusCode' in reason) {
           return Promise.reject(reason);
         }
-        this.logger.info('REMINDER: If you\'re investigating a network error here, it\'s normal');
+        this.logger.info("REMINDER: If you're investigating a network error here, it's normal");
 
         // If we got an error that isn't a WebexHttpError, assume the problem is
         // that we don't have the wdm plugin loaded and service/resource isn't
         // a valid means of identifying a request.
-        const convApi = process.env.CONVERSATION_SERVICE || process.env.CONVERSATION_SERVICE_URL || 'https://conv-a.wbx2.com/conversation/api/v1';
+        const convApi =
+          process.env.CONVERSATION_SERVICE ||
+          process.env.CONVERSATION_SERVICE_URL ||
+          'https://conv-a.wbx2.com/conversation/api/v1';
 
         return this.webex.request({
           method: 'POST',
           uri: `${convApi}/users/validateAuthToken`,
           body: {
-            token: this.access_token
+            token: this.access_token,
           },
           headers: {
-            authorization: `Bearer ${this.access_token}`
-          }
+            authorization: `Bearer ${this.access_token}`,
+          },
         });
       })
       .then((res) => res.body);
-  }
+  },
 });
 
 export default Token;

package/src/lib/page.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-constructor-return */
+
 /*!
  * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
  */
@@ -69,12 +71,8 @@ export default class Page {
 
     return linkHeaders.reduce((links, linkHeader) => {
       linkHeader = linkHeader.split(';');
-      const link = linkHeader[0]
-        .replace('<', '')
-        .replace('>', '');
-      const rel = linkHeader[1]
-        .split('=')[1]
-        .replace(/"/g, '');
+      const link = linkHeader[0].replace('<', '').replace('>', '');
+      const rel = linkHeader[1].split('=')[1].replace(/"/g, '');
 
       links[rel] = link;
 
@@ -121,9 +119,10 @@ export default class Page {
    * @returns {Promise<Page>}
    */
   getLink(link) {
-    return this.webex.request({
-      uri: this.links[link]
-    })
+    return this.webex
+      .request({
+        uri: this.links[link],
+      })
       .then((res) => new Page(res, this.webex));
   }
 
@@ -149,12 +148,12 @@ export default class Page {
         i += 1;
         if (i < this.length) {
           return {
-            value: this.items[i]
+            value: this.items[i],
           };
         }
 
         return {done: true};
-      }
+      },
     };
   }
 }

package/src/lib/services/constants.js

@@ -1,19 +1,9 @@
 const NAMESPACE = 'services';
-const SERVICE_CATALOGS = [
-  'discovery',
-  'limited',
-  'signin',
-  'postauth',
-  'custom'
-];
+const SERVICE_CATALOGS = ['discovery', 'limited', 'signin', 'postauth', 'custom'];
 
 const SERVICE_CATALOGS_ENUM_TYPES = {
   STRING: 'SERVICE_CATALOGS_ENUM_TYPES_STRING',
-  NUMBER: 'SERVICE_CATALOGS_ENUM_TYPES_NUMBER'
+  NUMBER: 'SERVICE_CATALOGS_ENUM_TYPES_NUMBER',
 };
 
-export {
-  SERVICE_CATALOGS_ENUM_TYPES,
-  NAMESPACE,
-  SERVICE_CATALOGS
-};
+export {SERVICE_CATALOGS_ENUM_TYPES, NAMESPACE, SERVICE_CATALOGS};

package/src/lib/services/index.js

@@ -11,8 +11,8 @@ import ServiceInterceptor from './interceptors/service';
 registerInternalPlugin('services', Services, {
   interceptors: {
     ServiceInterceptor: ServiceInterceptor.create,
-    ServerErrorInterceptor: ServerErrorInterceptor.create
-  }
+    ServerErrorInterceptor: ServerErrorInterceptor.create,
+  },
 });
 
 export {constants};

package/src/lib/services/interceptors/server-error.js

@@ -9,14 +9,13 @@ import {WebexHttpError} from '@webex/webex-core';
  */
 export default class ServerErrorInterceptor extends Interceptor {
   /**
-  * @returns {HAMessagingInterceptor}
-  */
+   * @returns {HAMessagingInterceptor}
+   */
   static create() {
     // eslint-disable-next-line no-invalid-this
     return new ServerErrorInterceptor({webex: this});
   }
 
-
   /**
    * @see Interceptor#onResponseError
    * @param {Object} options
@@ -24,17 +23,23 @@ export default class ServerErrorInterceptor extends Interceptor {
    * @returns {Object}
    */
   onResponseError(options, reason) {
-    if ((reason instanceof WebexHttpError.InternalServerError || reason instanceof WebexHttpError.BadGateway || reason instanceof WebexHttpError.ServiceUnavailable) && options.uri) {
+    if (
+      (reason instanceof WebexHttpError.InternalServerError ||
+        reason instanceof WebexHttpError.BadGateway ||
+        reason instanceof WebexHttpError.ServiceUnavailable) &&
+      options.uri
+    ) {
       const feature = this.webex.internal.device.features.developer.get('web-high-availability');
 
       if (feature && feature.value) {
         this.webex.internal.metrics.submitClientMetrics('web-ha', {
           fields: {success: false},
-          tags: {action: 'failed', error: reason.message, url: options.uri}
+          tags: {action: 'failed', error: reason.message, url: options.uri},
         });
 
-        return Promise.resolve(this.webex.internal.services.markFailedUrl(options.uri))
-          .then(() => Promise.reject(reason));
+        return Promise.resolve(this.webex.internal.services.markFailedUrl(options.uri)).then(() =>
+          Promise.reject(reason)
+        );
       }
     }
 

package/src/lib/services/interceptors/service.js

@@ -39,16 +39,17 @@ export default class ServiceInterceptor extends Interceptor {
     const {service, resource} = options;
 
     // Attempt to collect the service url.
-    return services.waitForService({name: service})
+    return services
+      .waitForService({name: service})
       .then((serviceUrl) => {
         // Generate the combined service url and resource.
         options.uri = this.generateUri(serviceUrl, resource);
 
         return options;
       })
-      .catch(() => Promise.reject(new Error(
-        `service-interceptor: '${service}' is not a known service`
-      )));
+      .catch(() =>
+        Promise.reject(new Error(`service-interceptor: '${service}' is not a known service`))
+      );
   }
 
   /* eslint-disable class-methods-use-this */
@@ -93,7 +94,7 @@ export default class ServiceInterceptor extends Interceptor {
     }
 
     if (!options.service) {
-      throw new Error('a valid \'service\' parameter is required');
+      throw new Error("a valid 'service' parameter is required");
     }
   }
   /* eslint-enable class-methods-use-this, no-param-reassign */

package/src/lib/services/metrics.js

@@ -1,4 +1,4 @@
 // Metrics for service catalog
 export default {
-  JS_SDK_SERVICE_NOT_FOUND: 'JS_SDK_SERVICE_NOT_FOUND'
+  JS_SDK_SERVICE_NOT_FOUND: 'JS_SDK_SERVICE_NOT_FOUND',
 };