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

package/package.json

@@ -1,6 +1,5 @@
 {
   "name": "@webex/webex-core",
-  "version": "2.59.2",
   "description": "Plugin handling for Cisco Webex",
   "license": "MIT",
   "contributors": [
@@ -32,16 +31,16 @@
   "devDependencies": {
     "@babel/core": "^7.17.10",
     "@sinonjs/fake-timers": "^6.0.1",
-    "@webex/babel-config-legacy": "2.59.2",
-    "@webex/eslint-config-legacy": "2.59.2",
-    "@webex/jest-config-legacy": "2.59.2",
-    "@webex/legacy-tools": "2.59.2",
-    "@webex/test-helper-chai": "2.59.2",
-    "@webex/test-helper-make-local-url": "2.59.2",
-    "@webex/test-helper-mocha": "2.59.2",
-    "@webex/test-helper-mock-webex": "2.59.2",
-    "@webex/test-helper-refresh-callback": "2.59.2",
-    "@webex/test-helper-test-users": "2.59.2",
+    "@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.59.3-next.1",
+    "@webex/test-helper-make-local-url": "^2.59.3-next.1",
+    "@webex/test-helper-mocha": "^2.59.3-next.1",
+    "@webex/test-helper-mock-webex": "^2.59.3-next.1",
+    "@webex/test-helper-refresh-callback": "^2.59.3-next.1",
+    "@webex/test-helper-test-users": "^2.59.3-next.1",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.24.0",
@@ -49,12 +48,12 @@
     "sinon": "^9.2.4"
   },
   "dependencies": {
-    "@webex/common": "2.59.2",
-    "@webex/common-timers": "2.59.2",
-    "@webex/http-core": "2.59.2",
-    "@webex/internal-plugin-device": "2.59.2",
-    "@webex/plugin-logger": "2.59.2",
-    "@webex/storage-adapter-spec": "2.59.2",
+    "@webex/common": "^2.59.3-next.1",
+    "@webex/common-timers": "^2.59.3-next.1",
+    "@webex/http-core": "^2.59.3-next.1",
+    "@webex/internal-plugin-device": "^2.59.3-next.1",
+    "@webex/plugin-logger": "^2.59.3-next.1",
+    "@webex/storage-adapter-spec": "^2.59.3-next.1",
     "ampersand-collection": "^2.0.2",
     "ampersand-events": "^2.0.2",
     "ampersand-state": "^5.0.3",
@@ -67,10 +66,12 @@
   "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.59.3-next.1"
+}

package/process

@@ -1 +1 @@
-module.exports = {browser: true};
+module.exports = {browser: true};

package/src/config.js

@@ -1,90 +1,90 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-/* eslint camelcase: [0] */
-
-import {MemoryStoreAdapter} from './lib/storage';
-import CredentialsConfig from './credentials-config';
-
-export default {
-  maxAppLevelRedirects: 10,
-  maxLocusRedirects: 5,
-  maxAuthenticationReplays: 1,
-  maxReconnectAttempts: 1,
-  onBeforeLogout: [],
-  trackingIdPrefix: 'webex-js-sdk',
-  trackingIdSuffix: '',
-  AlternateLogger: undefined,
-  credentials: new CredentialsConfig(),
-  fedramp: process.env.ENABLE_FEDRAMP || false,
-  services: {
-    /**
-     * A list of services that are available prior to catalog collection.
-     *
-     * @type {Object}
-     */
-    discovery: {
-      /**
-       * The hydra discovery url.
-       *
-       * @type {string}
-       */
-      hydra: process.env.HYDRA_SERVICE_URL || 'https://api.ciscospark.com/v1',
-
-      /**
-       * The u2c discovery url
-       *
-       * @type {string}
-       */
-      u2c: process.env.U2C_SERVICE_URL || 'https://u2c.wbx2.com/u2c/api/v1',
-    },
-
-    /**
-     * When true, considers all urls in `allowedDomains` as safe for auth tokens
-     *
-     * @type {boolean}
-     */
-    validateDomains: true,
-
-    /**
-     * services that don't need auth validation
-     */
-
-    servicesNotNeedValidation: ['webex-appapi-service'],
-
-    /**
-     * Contains a list of allowed domain host addresses.
-     *
-     * @type {Array<string>}
-     */
-    allowedDomains: [
-      'wbx2.com',
-      'ciscospark.com',
-      'webex.com',
-      'webexapis.com',
-      'broadcloudpbx.com',
-      'broadcloud.eu',
-      'broadcloud.com.au',
-      'broadcloudpbx.net',
-    ],
-  },
-  device: {
-    preDiscoveryServices: {
-      hydra: process.env.HYDRA_SERVICE_URL || 'https://api.ciscospark.com/v1',
-      hydraServiceUrl: process.env.HYDRA_SERVICE_URL || 'https://api.ciscospark.com/v1',
-    },
-    validateDomains: true,
-  },
-  metrics: {
-    type: ['behavioral', 'operational'],
-  },
-  payloadTransformer: {
-    predicates: [],
-    transforms: [],
-  },
-  storage: {
-    boundedAdapter: MemoryStoreAdapter,
-    unboundedAdapter: MemoryStoreAdapter,
-  },
-};
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+/* eslint camelcase: [0] */
+
+import {MemoryStoreAdapter} from './lib/storage';
+import CredentialsConfig from './credentials-config';
+
+export default {
+  maxAppLevelRedirects: 10,
+  maxLocusRedirects: 5,
+  maxAuthenticationReplays: 1,
+  maxReconnectAttempts: 1,
+  onBeforeLogout: [],
+  trackingIdPrefix: 'webex-js-sdk',
+  trackingIdSuffix: '',
+  AlternateLogger: undefined,
+  credentials: new CredentialsConfig(),
+  fedramp: process.env.ENABLE_FEDRAMP || false,
+  services: {
+    /**
+     * A list of services that are available prior to catalog collection.
+     *
+     * @type {Object}
+     */
+    discovery: {
+      /**
+       * The hydra discovery url.
+       *
+       * @type {string}
+       */
+      hydra: process.env.HYDRA_SERVICE_URL || 'https://api.ciscospark.com/v1',
+
+      /**
+       * The u2c discovery url
+       *
+       * @type {string}
+       */
+      u2c: process.env.U2C_SERVICE_URL || 'https://u2c.wbx2.com/u2c/api/v1',
+    },
+
+    /**
+     * When true, considers all urls in `allowedDomains` as safe for auth tokens
+     *
+     * @type {boolean}
+     */
+    validateDomains: true,
+
+    /**
+     * services that don't need auth validation
+     */
+
+    servicesNotNeedValidation: ['webex-appapi-service'],
+
+    /**
+     * Contains a list of allowed domain host addresses.
+     *
+     * @type {Array<string>}
+     */
+    allowedDomains: [
+      'wbx2.com',
+      'ciscospark.com',
+      'webex.com',
+      'webexapis.com',
+      'broadcloudpbx.com',
+      'broadcloud.eu',
+      'broadcloud.com.au',
+      'broadcloudpbx.net',
+    ],
+  },
+  device: {
+    preDiscoveryServices: {
+      hydra: process.env.HYDRA_SERVICE_URL || 'https://api.ciscospark.com/v1',
+      hydraServiceUrl: process.env.HYDRA_SERVICE_URL || 'https://api.ciscospark.com/v1',
+    },
+    validateDomains: true,
+  },
+  metrics: {
+    type: ['behavioral', 'operational'],
+  },
+  payloadTransformer: {
+    predicates: [],
+    transforms: [],
+  },
+  storage: {
+    boundedAdapter: MemoryStoreAdapter,
+    unboundedAdapter: MemoryStoreAdapter,
+  },
+};

package/src/credentials-config.js

@@ -1,212 +1,212 @@
-import AmpState from 'ampersand-state';
-
-// The credentials config which includes the CI server info and derived
-// URL properties from them for the various CI services.  The URL's
-// will be updated when the CI changes.
-const CredentialsConfig = AmpState.extend({
-  // we need to allow extra props for dynamic props like jwtRefreshCallback
-  extraProperties: 'allow',
-
-  props: {
-    /**
-     * The idbroker base host name
-     * @returns {object}
-     */
-    idbroker: [
-      'object',
-      false,
-      () => ({
-        url: process.env.IDBROKER_BASE_URL || 'https://idbroker.webex.com',
-      }),
-    ],
-
-    /**
-     * The identity base host name
-     * @returns {object}
-     */
-    identity: [
-      'object',
-      false,
-      () => ({
-        url: process.env.IDENTITY_BASE_URL || 'https://identity.webex.com',
-      }),
-    ],
-
-    /**
-     * This is the authorization url displayed on the
-     * {@link developer portal|https://developer.webex.com}
-     * @type {string}
-     */
-    authorizationString: [
-      'string',
-      false,
-      process.env.WEBEX_AUTHORIZATION_STRING || process.env.AUTHORIZATION_STRING,
-    ],
-
-    /**
-     * Authorization URL which prompts for user's password. Inferred from
-     * {@link config.credentials.authorizationString}. This config value will
-     * be automatically set if `authorizationString` config value is specified.
-     *
-     * @type {string}
-     */
-    authorizeUrl: [
-      'string',
-      false,
-      process.env.WEBEX_AUTHORIZE_URL ||
-        `${process.env.IDBROKER_BASE_URL || 'https://idbroker.webex.com'}/idb/oauth2/v1/authorize`,
-    ],
-
-    /**
-     * {@see https://tools.ietf.org/html/rfc6749#section-4.1.4}
-     * @type {string}
-     */
-    client_id: [
-      'string',
-      false,
-      process.env.WEBEX_CLIENT_ID || process.env.COMMON_IDENTITY_CLIENT_ID || process.env.CLIENT_ID,
-    ],
-
-    /**
-     * {@see https://tools.ietf.org/html/rfc6749#section-4.1.4}
-     * @type {string}
-     */
-    client_secret: [
-      'string',
-      false,
-      process.env.WEBEX_CLIENT_SECRET ||
-        process.env.COMMON_IDENTITY_CLIENT_SECRET ||
-        process.env.CLIENT_SECRET,
-    ],
-
-    /**
-     * {@see https://tools.ietf.org/html/rfc6749#section-4.1.4}
-     * @type {string}
-     */
-    redirect_uri: [
-      'string',
-      false,
-      process.env.WEBEX_REDIRECT_URI ||
-        process.env.COMMON_IDENTITY_REDIRECT_URI ||
-        process.env.REDIRECT_URI,
-    ],
-
-    /**
-     * {@see https://tools.ietf.org/html/rfc6749#section-4.1.4}
-     * @type {string}
-     */
-    scope: [
-      'string',
-      false,
-      process.env.WEBEX_SCOPE ||
-        process.env.WEBEX_SCOPES ||
-        process.env.COMMON_IDENTITY_SCOPE ||
-        process.env.SCOPE,
-    ],
-
-    /**
-     * Controls the UI of the CI login page.
-     * @private
-     * @type {string}
-     */
-    cisService: ['string', false, 'webex'],
-  },
-
-  derived: {
-    /**
-     * User activation URL
-     * {@link config.credentials.activationUrl}
-     * @type {string}
-     */
-    activationUrl: {
-      deps: ['idbroker.url'],
-      fn() {
-        return `${
-          this.idbroker.url || 'https://idbroker.webex.com'
-        }/idb/token/v1/actions/UserActivation/invoke`;
-      },
-      cache: false,
-    },
-
-    /**
-     * Generate OTP URL
-     * {@link config.credentials.generateOtpUrl}
-     * @type {string}
-     */
-    generateOtpUrl: {
-      deps: ['idbroker.url'],
-      fn() {
-        return `${
-          this.idbroker.url || 'https://idbroker.webex.com'
-        }/idb/token/v1/actions/UserOTP/Generate/invoke`;
-      },
-      cache: false,
-    },
-
-    /**
-     * Validate OTP URL
-     * {@link config.credentials.validateOtpUrl}
-     * @type {string}
-     */
-    validateOtpUrl: {
-      deps: ['idbroker.url'],
-      fn() {
-        return `${
-          this.idbroker.url || 'https://idbroker.webex.com'
-        }/idb/token/v1/actions/UserOTP/Validate/invoke`;
-      },
-      cache: false,
-    },
-
-    // TODO does hydra also have an access_token endpoint?
-    /**
-     * Token URL used for token refresh and auth code exchange
-     * @type {string}
-     */
-    tokenUrl: {
-      deps: ['idbroker.url'],
-      fn() {
-        return process.env.TOKEN_URL || `${this.idbroker.url}/idb/oauth2/v1/access_token`;
-      },
-      cache: false,
-    },
-
-    /**
-     * URL to revoke token
-     * @type {string}
-     */
-    revokeUrl: {
-      deps: ['idbroker.url'],
-      fn() {
-        return process.env.REVOKE_URL || `${this.idbroker.url}/idb/oauth2/v1/revoke`;
-      },
-      cache: false,
-    },
-
-    /**
-     * URL to load when the app logs out
-     * @type {string}
-     */
-    logoutUrl: {
-      deps: ['idbroker.url'],
-      fn() {
-        return `${this.idbroker.url}/idb/oauth2/v1/logout`;
-      },
-      cache: false,
-    },
-
-    /**
-     * Set password URL
-     * @type {string}
-     */
-    setPasswordUrl: {
-      deps: ['identity.url'],
-      fn() {
-        return `${this.identity.url || 'https://identity.webex.com'}/identity/scim/v1/Users`;
-      },
-      cache: false,
-    },
-  },
-});
-
-export default CredentialsConfig;
+import AmpState from 'ampersand-state';
+
+// The credentials config which includes the CI server info and derived
+// URL properties from them for the various CI services.  The URL's
+// will be updated when the CI changes.
+const CredentialsConfig = AmpState.extend({
+  // we need to allow extra props for dynamic props like jwtRefreshCallback
+  extraProperties: 'allow',
+
+  props: {
+    /**
+     * The idbroker base host name
+     * @returns {object}
+     */
+    idbroker: [
+      'object',
+      false,
+      () => ({
+        url: process.env.IDBROKER_BASE_URL || 'https://idbroker.webex.com',
+      }),
+    ],
+
+    /**
+     * The identity base host name
+     * @returns {object}
+     */
+    identity: [
+      'object',
+      false,
+      () => ({
+        url: process.env.IDENTITY_BASE_URL || 'https://identity.webex.com',
+      }),
+    ],
+
+    /**
+     * This is the authorization url displayed on the
+     * {@link developer portal|https://developer.webex.com}
+     * @type {string}
+     */
+    authorizationString: [
+      'string',
+      false,
+      process.env.WEBEX_AUTHORIZATION_STRING || process.env.AUTHORIZATION_STRING,
+    ],
+
+    /**
+     * Authorization URL which prompts for user's password. Inferred from
+     * {@link config.credentials.authorizationString}. This config value will
+     * be automatically set if `authorizationString` config value is specified.
+     *
+     * @type {string}
+     */
+    authorizeUrl: [
+      'string',
+      false,
+      process.env.WEBEX_AUTHORIZE_URL ||
+        `${process.env.IDBROKER_BASE_URL || 'https://idbroker.webex.com'}/idb/oauth2/v1/authorize`,
+    ],
+
+    /**
+     * {@see https://tools.ietf.org/html/rfc6749#section-4.1.4}
+     * @type {string}
+     */
+    client_id: [
+      'string',
+      false,
+      process.env.WEBEX_CLIENT_ID || process.env.COMMON_IDENTITY_CLIENT_ID || process.env.CLIENT_ID,
+    ],
+
+    /**
+     * {@see https://tools.ietf.org/html/rfc6749#section-4.1.4}
+     * @type {string}
+     */
+    client_secret: [
+      'string',
+      false,
+      process.env.WEBEX_CLIENT_SECRET ||
+        process.env.COMMON_IDENTITY_CLIENT_SECRET ||
+        process.env.CLIENT_SECRET,
+    ],
+
+    /**
+     * {@see https://tools.ietf.org/html/rfc6749#section-4.1.4}
+     * @type {string}
+     */
+    redirect_uri: [
+      'string',
+      false,
+      process.env.WEBEX_REDIRECT_URI ||
+        process.env.COMMON_IDENTITY_REDIRECT_URI ||
+        process.env.REDIRECT_URI,
+    ],
+
+    /**
+     * {@see https://tools.ietf.org/html/rfc6749#section-4.1.4}
+     * @type {string}
+     */
+    scope: [
+      'string',
+      false,
+      process.env.WEBEX_SCOPE ||
+        process.env.WEBEX_SCOPES ||
+        process.env.COMMON_IDENTITY_SCOPE ||
+        process.env.SCOPE,
+    ],
+
+    /**
+     * Controls the UI of the CI login page.
+     * @private
+     * @type {string}
+     */
+    cisService: ['string', false, 'webex'],
+  },
+
+  derived: {
+    /**
+     * User activation URL
+     * {@link config.credentials.activationUrl}
+     * @type {string}
+     */
+    activationUrl: {
+      deps: ['idbroker.url'],
+      fn() {
+        return `${
+          this.idbroker.url || 'https://idbroker.webex.com'
+        }/idb/token/v1/actions/UserActivation/invoke`;
+      },
+      cache: false,
+    },
+
+    /**
+     * Generate OTP URL
+     * {@link config.credentials.generateOtpUrl}
+     * @type {string}
+     */
+    generateOtpUrl: {
+      deps: ['idbroker.url'],
+      fn() {
+        return `${
+          this.idbroker.url || 'https://idbroker.webex.com'
+        }/idb/token/v1/actions/UserOTP/Generate/invoke`;
+      },
+      cache: false,
+    },
+
+    /**
+     * Validate OTP URL
+     * {@link config.credentials.validateOtpUrl}
+     * @type {string}
+     */
+    validateOtpUrl: {
+      deps: ['idbroker.url'],
+      fn() {
+        return `${
+          this.idbroker.url || 'https://idbroker.webex.com'
+        }/idb/token/v1/actions/UserOTP/Validate/invoke`;
+      },
+      cache: false,
+    },
+
+    // TODO does hydra also have an access_token endpoint?
+    /**
+     * Token URL used for token refresh and auth code exchange
+     * @type {string}
+     */
+    tokenUrl: {
+      deps: ['idbroker.url'],
+      fn() {
+        return process.env.TOKEN_URL || `${this.idbroker.url}/idb/oauth2/v1/access_token`;
+      },
+      cache: false,
+    },
+
+    /**
+     * URL to revoke token
+     * @type {string}
+     */
+    revokeUrl: {
+      deps: ['idbroker.url'],
+      fn() {
+        return process.env.REVOKE_URL || `${this.idbroker.url}/idb/oauth2/v1/revoke`;
+      },
+      cache: false,
+    },
+
+    /**
+     * URL to load when the app logs out
+     * @type {string}
+     */
+    logoutUrl: {
+      deps: ['idbroker.url'],
+      fn() {
+        return `${this.idbroker.url}/idb/oauth2/v1/logout`;
+      },
+      cache: false,
+    },
+
+    /**
+     * Set password URL
+     * @type {string}
+     */
+    setPasswordUrl: {
+      deps: ['identity.url'],
+      fn() {
+        return `${this.identity.url || 'https://identity.webex.com'}/identity/scim/v1/Users`;
+      },
+      cache: false,
+    },
+  },
+});
+
+export default CredentialsConfig;