@webex/webex-core 2.60.1-next.9 → 2.60.2

package/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@webex/webex-core",
+  "version": "2.60.2",
   "description": "Plugin handling for Cisco Webex",
   "license": "MIT",
   "contributors": [
@@ -20,7 +21,7 @@
     "directory": "packages/@webex/webex-core"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=14"
   },
   "browserify": {
     "transform": [
@@ -31,16 +32,16 @@
   "devDependencies": {
     "@babel/core": "^7.17.10",
     "@sinonjs/fake-timers": "^6.0.1",
-    "@webex/babel-config-legacy": "0.0.0",
-    "@webex/eslint-config-legacy": "0.0.0",
-    "@webex/jest-config-legacy": "0.0.0",
-    "@webex/legacy-tools": "0.0.0",
-    "@webex/test-helper-chai": "2.60.1-next.9",
-    "@webex/test-helper-make-local-url": "2.60.1-next.9",
-    "@webex/test-helper-mocha": "2.60.1-next.9",
-    "@webex/test-helper-mock-webex": "2.60.1-next.9",
-    "@webex/test-helper-refresh-callback": "2.60.1-next.9",
-    "@webex/test-helper-test-users": "2.60.1-next.9",
+    "@webex/babel-config-legacy": "2.60.2",
+    "@webex/eslint-config-legacy": "2.60.2",
+    "@webex/jest-config-legacy": "2.60.2",
+    "@webex/legacy-tools": "2.60.2",
+    "@webex/test-helper-chai": "2.60.2",
+    "@webex/test-helper-make-local-url": "2.60.2",
+    "@webex/test-helper-mocha": "2.60.2",
+    "@webex/test-helper-mock-webex": "2.60.2",
+    "@webex/test-helper-refresh-callback": "2.60.2",
+    "@webex/test-helper-test-users": "2.60.2",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.24.0",
@@ -48,12 +49,12 @@
     "sinon": "^9.2.4"
   },
   "dependencies": {
-    "@webex/common": "2.60.1-next.9",
-    "@webex/common-timers": "2.60.1-next.9",
-    "@webex/http-core": "2.60.1-next.9",
-    "@webex/internal-plugin-device": "2.60.1-next.9",
-    "@webex/plugin-logger": "2.60.1-next.9",
-    "@webex/storage-adapter-spec": "2.60.1-next.9",
+    "@webex/common": "2.60.2",
+    "@webex/common-timers": "2.60.2",
+    "@webex/http-core": "2.60.2",
+    "@webex/internal-plugin-device": "2.60.2",
+    "@webex/plugin-logger": "2.60.2",
+    "@webex/storage-adapter-spec": "2.60.2",
     "ampersand-collection": "^2.0.2",
     "ampersand-events": "^2.0.2",
     "ampersand-state": "^5.0.3",
@@ -66,12 +67,10 @@
   "scripts": {
     "build": "yarn build:src",
     "build:src": "webex-legacy-tools build -dest \"./dist\" -src \"./src\" -js -ts -maps",
-    "deploy:npm": "yarn npm publish",
     "test": "yarn test:style && yarn test:unit && yarn test:integration && yarn test:browser",
     "test:browser:broken": "webex-legacy-tools test --integration --unit --runner karma",
     "test:integration:broken": "webex-legacy-tools test --integration --runner mocha",
     "test:style": "eslint ./src/**/*.*",
     "test:unit": "webex-legacy-tools test --unit --runner jest"
-  },
-  "version": "2.60.1-next.9"
-}
+  }
+}

package/src/lib/credentials/credentials.js

@@ -13,11 +13,10 @@ import {clone, cloneDeep, isObject, isEmpty} from 'lodash';
 import WebexPlugin from '../webex-plugin';
 import {persist, waitForValue} from '../storage/decorators';
 
-import grantErrors, {OAuthError} from './grant-errors';
-import {filterScope, diffScopes, sortScope} from './scope';
+import grantErrors from './grant-errors';
+import {filterScope, sortScope} from './scope';
 import Token from './token';
 import TokenCollection from './token-collection';
-import {METRICS} from '../constants';
 
 /**
  * @class
@@ -49,25 +48,6 @@ const Credentials = WebexPlugin.extend({
         return Boolean(this.supertoken && this.supertoken.canRefresh);
       },
     },
-    isUnverifiedGuest: {
-      deps: ['supertoken'],
-      /**
-       * Returns true if the user is an unverified guest
-       * @returns {boolean}
-       */
-      fn() {
-        let isGuest = false;
-        try {
-          isGuest =
-            JSON.parse(base64.decode(this.supertoken.access_token.split('.')[1])).user_type ===
-            'guest';
-        } catch {
-          /* the non-guest token is formatted differently so catch is expected */
-        }
-
-        return isGuest;
-      },
-    },
   },
 
   props: {
@@ -260,15 +240,8 @@ const Credentials = WebexPlugin.extend({
    */
   downscope(scope) {
     return this.supertoken.downscope(scope).catch((reason) => {
-      const failReason = reason?.body ?? reason;
-      this.logger.warn(`credentials: failed to downscope supertoken to "${scope}"`, failReason);
+      this.logger.trace(`credentials: failed to downscope supertoken to ${scope}`, reason);
       this.logger.trace(`credentials: falling back to supertoken for ${scope}`);
-      this.webex.internal.metrics.submitClientMetrics(METRICS.JS_SDK_CREDENTIALS_DOWNSCOPE_FAILED, {
-        fields: {
-          requestedScope: scope,
-          failReason,
-        },
-      });
 
       return Promise.resolve(new Token({scope, ...this.supertoken.serialize()}), {
         parent: this,
@@ -349,12 +322,12 @@ const Credentials = WebexPlugin.extend({
       }
 
       if (!scope) {
-        scope = filterScope('spark:kms', this.supertoken.scope);
+        scope = filterScope('spark:kms', this.config.scope);
       }
 
       scope = sortScope(scope);
 
-      if (scope === sortScope(this.supertoken.scope)) {
+      if (scope === sortScope(this.config.scope)) {
         return Promise.resolve(this.supertoken);
       }
 
@@ -504,23 +477,6 @@ const Credentials = WebexPlugin.extend({
 
     return supertoken
       .refresh()
-      .catch((error) => {
-        if (error instanceof OAuthError) {
-          // Error: super token refresh failed with 400 status code.
-          // Hence emit an event to the client, an opportunity to logout.
-          this.unset('supertoken');
-          while (this.userTokens.models.length) {
-            try {
-              this.userTokens.remove(this.userTokens.models[0]);
-            } catch (err) {
-              this.logger.warn('credentials: failed to remove user token', err);
-            }
-          }
-          this.webex.trigger('client:InvalidRequestError');
-        }
-
-        return Promise.reject(error);
-      })
       .then((st) => {
         // clear refresh timer
         if (this.refreshTimer) {
@@ -529,44 +485,46 @@ const Credentials = WebexPlugin.extend({
         }
         this.supertoken = st;
 
-        const invalidScopes = diffScopes(this.config.scope, st.scope);
-
-        if (invalidScopes !== '') {
-          this.logger.warn(
-            `credentials: "${invalidScopes}" scope(s) are invalid because not listed in the supertoken, they will be excluded from user token requests.`
-          );
-          this.webex.internal.metrics.submitClientMetrics(
-            METRICS.JS_SDK_CREDENTIALS_TOKEN_REFRESH_SCOPE_MISMATCH,
-            {fields: {invalidScopes}}
-          );
-        }
-
         return Promise.all(
-          tokens.map((token) => {
-            const tokenScope = filterScope(diffScopes(token.scope, st.scope), token.scope);
-
-            return (
-              this.downscope(tokenScope)
-                // eslint-disable-next-line max-nested-callbacks
-                .then((t) => {
-                  this.logger.info(`credentials: revoking token for ${token.scope}`);
-
-                  return token
-                    .revoke()
-                    .catch((err) => {
-                      this.logger.warn('credentials: failed to revoke user token', err);
-                    })
-                    .then(() => {
-                      this.userTokens.remove(token.scope);
-                      this.userTokens.add(t);
-                    });
-                })
-            );
-          })
+          tokens.map((token) =>
+            this.downscope(token.scope)
+              // eslint-disable-next-line max-nested-callbacks
+              .then((t) => {
+                this.logger.info(`credentials: revoking token for ${token.scope}`);
+
+                return token
+                  .revoke()
+                  .catch((err) => {
+                    this.logger.warn('credentials: failed to revoke user token', err);
+                  })
+                  .then(() => {
+                    this.userTokens.remove(token.scope);
+                    this.userTokens.add(t);
+                  });
+              })
+          )
         );
       })
       .then(() => {
         this.scheduleRefresh(this.supertoken.expires);
+      })
+      .catch((error) => {
+        const {InvalidRequestError} = grantErrors;
+
+        if (error instanceof InvalidRequestError) {
+          // Error: The refresh token provided is expired, revoked, malformed, or invalid. Hence emit an event to the client, an opportunity to logout.
+          this.unset('supertoken');
+          while (this.userTokens.models.length) {
+            try {
+              this.userTokens.remove(this.userTokens.models[0]);
+            } catch (err) {
+              this.logger.warn('credentials: failed to remove user token', err);
+            }
+          }
+          this.webex.trigger('client:InvalidRequestError');
+        }
+
+        return Promise.reject(error);
       });
   },
 

package/src/lib/credentials/scope.js

@@ -2,10 +2,6 @@
  * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
  */
 
-import {difference} from 'lodash';
-
-const SCOPE_SEPARATOR = ' ';
-
 /**
  * sorts a list of scopes
  * @param {string} scope
@@ -16,12 +12,12 @@ export function sortScope(scope) {
     return '';
   }
 
-  return scope.split(SCOPE_SEPARATOR).sort().join(SCOPE_SEPARATOR);
+  return scope.split(' ').sort().join(' ');
 }
 
 /**
  * sorts a list of scopes and filters the specified scope
- * @param {string|string[]} toFilter
+ * @param {string} toFilter
  * @param {string} scope
  * @returns {string}
  */
@@ -29,25 +25,10 @@ export function filterScope(toFilter, scope) {
   if (!scope) {
     return '';
   }
-  const toFilterArr = Array.isArray(toFilter) ? toFilter : [toFilter];
 
   return scope
-    .split(SCOPE_SEPARATOR)
-    .filter((item) => !toFilterArr.includes(item))
+    .split(' ')
+    .filter((item) => item !== toFilter)
     .sort()
-    .join(SCOPE_SEPARATOR);
-}
-
-/**
- * Returns a string containing all items in scopeA that are not in scopeB, or an empty string if there are none.
- *
- * @param {string} scopeA
- * @param {string} scopeB
- * @returns {string}
- */
-export function diffScopes(scopeA, scopeB) {
-  const a = scopeA?.split(SCOPE_SEPARATOR) ?? [];
-  const b = scopeB?.split(SCOPE_SEPARATOR) ?? [];
-
-  return difference(a, b).sort().join(SCOPE_SEPARATOR);
+    .join(' ');
 }

package/src/lib/credentials/token.js

@@ -9,7 +9,7 @@ import {safeSetTimeout} from '@webex/common-timers';
 import WebexHttpError from '../webex-http-error';
 import WebexPlugin from '../webex-plugin';
 
-import {sortScope, diffScopes} from './scope';
+import {sortScope} from './scope';
 import grantErrors, {OAuthError} from './grant-errors';
 
 /* eslint-disable camelcase */
@@ -259,14 +259,6 @@ const Token = WebexPlugin.extend({
       return Promise.reject(new Error('cannot downscope access token'));
     }
 
-    if (diffScopes(scope, this.config.scope) !== '') {
-      return Promise.reject(
-        new Error(
-          `new scope (${scope}) is not subset of the available scopes (${this.config.scope})`
-        )
-      );
-    }
-
     // Since we're going to use scope as the index in our token collection, it's
     // important scopes are always deterministically specified.
     if (scope) {

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

@@ -36,11 +36,11 @@ export default class ServiceInterceptor extends Interceptor {
 
     // Destructure commonly referenced namespaces.
     const {services} = this.webex.internal;
-    const {service, resource, waitForServiceTimeout} = options;
+    const {service, resource} = options;
 
     // Attempt to collect the service url.
     return services
-      .waitForService({name: service, timeout: waitForServiceTimeout})
+      .waitForService({name: service})
       .then((serviceUrl) => {
         // Generate the combined service url and resource.
         options.uri = this.generateUri(serviceUrl, resource);

package/src/lib/services/service-catalog.js

@@ -413,8 +413,6 @@ const ServiceCatalog = AmpState.extend({
         resolve();
       }
 
-      const validatedTimeout = typeof timeout === 'number' && timeout >= 0 ? timeout : 60;
-
       const timeoutTimer = setTimeout(
         () =>
           reject(
@@ -422,7 +420,7 @@ const ServiceCatalog = AmpState.extend({
               `services: timeout occured while waiting for '${serviceGroup}' catalog to populate`
             )
           ),
-        validatedTimeout * 1000
+        timeout ? timeout * 1000 : 60000
       );
 
       this.once(serviceGroup, () => {

package/src/lib/services/services.js

@@ -682,7 +682,6 @@ const Services = WebexPlugin.extend({
    * @returns {object}
    */
   _formatReceivedHostmap(serviceHostmap) {
-    this._updateHostCatalog(serviceHostmap.hostCatalog);
     // map the host catalog items to a formatted hostmap
     const formattedHostmap = Object.keys(serviceHostmap.hostCatalog).reduce((accumulator, key) => {
       if (serviceHostmap.hostCatalog[key].length === 0) {

package/src/webex-core.js

@@ -6,12 +6,7 @@ import {EventEmitter} from 'events';
 import util from 'util';
 
 import {proxyEvents, retry, transferEvents} from '@webex/common';
-import {
-  HttpStatusInterceptor,
-  defaults as requestDefaults,
-  protoprepareFetchOptions as prepareFetchOptions,
-  setTimingsAndFetch as _setTimingsAndFetch,
-} from '@webex/http-core';
+import {HttpStatusInterceptor, defaults as requestDefaults} from '@webex/http-core';
 import {defaultsDeep, get, isFunction, isString, last, merge, omit, set, unset} from 'lodash';
 import AmpState from 'ampersand-state';
 import uuid from 'uuid';
@@ -407,13 +402,6 @@ const WebexCore = AmpState.extend({
       interceptors: ints,
     });
 
-    this.prepareFetchOptions = prepareFetchOptions({
-      json: true,
-      interceptors: ints,
-    });
-
-    this.setTimingsAndFetch = _setTimingsAndFetch;
-
     let sessionId = `${get(this, 'config.trackingIdPrefix', 'webex-js-sdk')}_${get(
       this,
       'config.trackingIdBase',