@webex/webex-core - npm Package Compare versions

Comparing version 3.3.0 to 3.3.1-next.1

dist/config.js

@@ -62,3 +62,3 @@ "use strict";
      */
-    allowedDomains: ['wbx2.com', 'ciscospark.com', 'webex.com', 'webexapis.com', 'broadcloudpbx.com', 'broadcloud.eu', 'broadcloud.com.au', 'broadcloudpbx.net']
+    allowedDomains: []
   },
@@ -65,0 +65,0 @@ device: {

dist/lib/batcher.js

@@ -289,5 +289,5 @@ "use strict";
   },
-  version: "3.3.0"
+  version: "3.3.1-next.1"
 });
 var _default2 = exports.default = Batcher;
 //# sourceMappingURL=batcher.js.map

dist/lib/credentials/credentials.js

@@ -561,5 +561,5 @@ "use strict";
   },
-  version: "3.3.0"
+  version: "3.3.1-next.1"
 }, ((0, _applyDecoratedDescriptor2.default)(_obj, "getUserToken", [_dec, _dec2], (0, _getOwnPropertyDescriptor.default)(_obj, "getUserToken"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "initialize", [_dec3], (0, _getOwnPropertyDescriptor.default)(_obj, "initialize"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "invalidate", [_common.oneFlight, _dec4], (0, _getOwnPropertyDescriptor.default)(_obj, "invalidate"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "refresh", [_common.oneFlight, _dec5, _dec6], (0, _getOwnPropertyDescriptor.default)(_obj, "refresh"), _obj)), _obj)));
 var _default = exports.default = Credentials;
 //# sourceMappingURL=credentials.js.map

dist/lib/credentials/token.js

@@ -535,5 +535,5 @@ "use strict";
   },
-  version: "3.3.0"
+  version: "3.3.1-next.1"
 }, ((0, _applyDecoratedDescriptor2.default)(_obj, "downscope", [_dec], (0, _getOwnPropertyDescriptor.default)(_obj, "downscope"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "refresh", [_common.oneFlight], (0, _getOwnPropertyDescriptor.default)(_obj, "refresh"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "revoke", [_common.oneFlight], (0, _getOwnPropertyDescriptor.default)(_obj, "revoke"), _obj)), _obj)));
 var _default = exports.default = Token;
 //# sourceMappingURL=token.js.map

dist/lib/services/constants.js

@@ -7,3 +7,3 @@ "use strict";
 });
-exports.SERVICE_CATALOGS_ENUM_TYPES = exports.SERVICE_CATALOGS = exports.NAMESPACE = void 0;
+exports.SERVICE_CATALOGS_ENUM_TYPES = exports.SERVICE_CATALOGS = exports.NAMESPACE = exports.COMMERCIAL_ALLOWED_DOMAINS = void 0;
 var NAMESPACE = exports.NAMESPACE = 'services';
@@ -15,2 +15,5 @@ var SERVICE_CATALOGS = exports.SERVICE_CATALOGS = ['discovery', 'limited', 'signin', 'postauth', 'custom'];
 };
+
+// The default allowed domains that SDK can make requests to outside of service catalog
+var COMMERCIAL_ALLOWED_DOMAINS = exports.COMMERCIAL_ALLOWED_DOMAINS = ['wbx2.com', 'ciscospark.com', 'webex.com', 'webexapis.com', 'broadcloudpbx.com', 'broadcloud.eu', 'broadcloud.com.au', 'broadcloudpbx.net'];
 //# sourceMappingURL=constants.js.map

dist/lib/services/service-catalog.js

@@ -24,2 +24,3 @@ "use strict";
 var _ampersandState = _interopRequireDefault(require("ampersand-state"));
+var _lodash = require("lodash");
 var _serviceUrl = _interopRequireDefault(require("./service-url"));
@@ -354,2 +355,10 @@ function ownKeys(e, r) { var t = _Object$keys3(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
   /**
+   *
+   * @param {Array<string>} newAllowedDomains - new allowed domains to add to existing set of allowed domains
+   * @returns {void}
+   */
+  addAllowedDomains: function addAllowedDomains(newAllowedDomains) {
+    this.allowedDomains = (0, _lodash.union)(this.allowedDomains, newAllowedDomains);
+  },
+  /**
    * Update the current list of `ServiceUrl`s against a provided
@@ -356,0 +365,0 @@ * service hostmap.

dist/lib/services/services.js

@@ -22,2 +22,3 @@ "use strict";
 var _sha = _interopRequireDefault(require("crypto-js/sha256"));
+var _lodash = require("lodash");
 var _webexPlugin = _interopRequireDefault(require("../webex-plugin"));
@@ -29,2 +30,3 @@ var _metrics = _interopRequireDefault(require("./metrics"));
 var _serviceFedRamp = _interopRequireDefault(require("./service-fed-ramp"));
+var _constants = require("./constants");
 function ownKeys(e, r) { var t = _Object$keys2(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -934,2 +936,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 
+      // if not fedramp, append on the commercialAllowedDomains
+      if (!fedramp) {
+        services.allowedDomains = (0, _lodash.union)(services.allowedDomains, _constants.COMMERCIAL_ALLOWED_DOMAINS);
+      }
+
       // Check for allowed host domains.
@@ -1026,3 +1033,3 @@ if (services.allowedDomains) {
   },
-  version: "3.3.0"
+  version: "3.3.1-next.1"
 });
@@ -1029,0 +1036,0 @@ /* eslint-enable no-underscore-dangle */

dist/plugins/logger.js

@@ -60,3 +60,3 @@ "use strict";
   trace: wrapConsoleMethod('trace'),
-  version: "3.3.0"
+  version: "3.3.1-next.1"
 });
@@ -63,0 +63,0 @@ (0, _webexCore.registerPlugin)('logger', Logger);

dist/webex-core.js

@@ -97,3 +97,3 @@ "use strict";
 var WebexCore = _ampersandState.default.extend((_obj = {
-  version: "3.3.0",
+  version: "3.3.1-next.1",
   children: {
@@ -640,3 +640,3 @@ internal: _webexInternalCore.default
 }, ((0, _applyDecoratedDescriptor2.default)(_obj, "_uploadPhaseUpload", [_common.retry], (0, _getOwnPropertyDescriptor.default)(_obj, "_uploadPhaseUpload"), _obj)), _obj));
-WebexCore.version = "3.3.0";
+WebexCore.version = "3.3.1-next.1";
 (0, _webexInternalCorePluginMixin.default)(_webexInternalCore.default, _config.default, interceptors);
@@ -643,0 +643,0 @@ (0, _webexCorePluginMixin.default)(WebexCore, _config.default, interceptors);

package.json

@@ -38,8 +38,8 @@ {
     "@webex/legacy-tools": "0.0.0",
-    "@webex/test-helper-chai": "3.3.0",
-    "@webex/test-helper-make-local-url": "3.3.0",
-    "@webex/test-helper-mocha": "3.3.0",
-    "@webex/test-helper-mock-webex": "3.3.0",
-    "@webex/test-helper-refresh-callback": "3.3.0",
-    "@webex/test-helper-test-users": "3.3.0",
+    "@webex/test-helper-chai": "3.3.1-next.1",
+    "@webex/test-helper-make-local-url": "3.3.1-next.1",
+    "@webex/test-helper-mocha": "3.3.1-next.1",
+    "@webex/test-helper-mock-webex": "3.3.1-next.1",
+    "@webex/test-helper-refresh-callback": "3.3.1-next.1",
+    "@webex/test-helper-test-users": "3.3.1-next.1",
     "chai": "^4.3.4",
@@ -52,8 +52,8 @@ "chai-as-promised": "^7.1.1",
   "dependencies": {
-    "@webex/common": "3.3.0",
-    "@webex/common-timers": "3.3.0",
-    "@webex/http-core": "3.3.0",
-    "@webex/internal-plugin-device": "3.3.0",
-    "@webex/plugin-logger": "3.3.0",
-    "@webex/storage-adapter-spec": "3.3.0",
+    "@webex/common": "3.3.1-next.1",
+    "@webex/common-timers": "3.3.1-next.1",
+    "@webex/http-core": "3.3.1-next.1",
+    "@webex/internal-plugin-device": "3.3.1-next.1",
+    "@webex/plugin-logger": "3.3.1-next.1",
+    "@webex/storage-adapter-spec": "3.3.1-next.1",
     "ampersand-collection": "^2.0.2",
@@ -78,3 +78,3 @@ "ampersand-events": "^2.0.2",
   },
-  "version": "3.3.0"
+  "version": "3.3.1-next.1"
 }

src/config.js

@@ -61,12 +61,3 @@ /*!
      */
-    allowedDomains: [
-      'wbx2.com',
-      'ciscospark.com',
-      'webex.com',
-      'webexapis.com',
-      'broadcloudpbx.com',
-      'broadcloud.eu',
-      'broadcloud.com.au',
-      'broadcloudpbx.net',
-    ],
+    allowedDomains: [],
   },
@@ -73,0 +64,0 @@ device: {

src/lib/services/constants.js

@@ -9,2 +9,14 @@ const NAMESPACE = 'services';
 
-export {SERVICE_CATALOGS_ENUM_TYPES, NAMESPACE, SERVICE_CATALOGS};
+// The default allowed domains that SDK can make requests to outside of service catalog
+const COMMERCIAL_ALLOWED_DOMAINS = [
+  'wbx2.com',
+  'ciscospark.com',
+  'webex.com',
+  'webexapis.com',
+  'broadcloudpbx.com',
+  'broadcloud.eu',
+  'broadcloud.com.au',
+  'broadcloudpbx.net',
+];
+
+export {SERVICE_CATALOGS_ENUM_TYPES, NAMESPACE, SERVICE_CATALOGS, COMMERCIAL_ALLOWED_DOMAINS};

src/lib/services/service-catalog.js

@@ -5,2 +5,3 @@ import Url from 'url';
 
+import {union} from 'lodash';
 import ServiceUrl from './service-url';
@@ -366,2 +367,11 @@
   /**
+   *
+   * @param {Array<string>} newAllowedDomains - new allowed domains to add to existing set of allowed domains
+   * @returns {void}
+   */
+  addAllowedDomains(newAllowedDomains) {
+    this.allowedDomains = union(this.allowedDomains, newAllowedDomains);
+  },
+
+  /**
    * Update the current list of `ServiceUrl`s against a provided
@@ -368,0 +378,0 @@ * service hostmap.

src/lib/services/services.js

@@ -5,2 +5,3 @@ import Url from 'url';
 
+import {union} from 'lodash';
 import WebexPlugin from '../webex-plugin';
@@ -13,2 +14,3 @@
 import fedRampServices from './service-fed-ramp';
+import {COMMERCIAL_ALLOWED_DOMAINS} from './constants';
 
@@ -946,2 +948,7 @@ const trailingSlashes = /(?:^\/)|(?:\/$)/;
 
+      // if not fedramp, append on the commercialAllowedDomains
+      if (!fedramp) {
+        services.allowedDomains = union(services.allowedDomains, COMMERCIAL_ALLOWED_DOMAINS);
+      }
+
       // Check for allowed host domains.
@@ -948,0 +955,0 @@ if (services.allowedDomains) {

test/integration/spec/services/services.js

@@ -14,2 +14,3 @@ /*!
   ServiceUrl,
+  serviceConstants,
 } from '@webex/webex-core';
@@ -367,3 +368,5 @@ import testUsers from '@webex/test-helper-test-users';
 
-        assert.deepEqual(allowedDomains, services._getCatalog().allowedDomains);
+        const expectedResult = [...allowedDomains, ...serviceConstants.COMMERCIAL_ALLOWED_DOMAINS];
+
+        assert.deepEqual(expectedResult, services._getCatalog().allowedDomains);
       });
@@ -370,0 +373,0 @@ });

test/unit/spec/interceptors/auth.js

@@ -13,3 +13,10 @@ /*!
 import MockWebex from '@webex/test-helper-mock-webex';
-import {AuthInterceptor, config, Credentials, WebexHttpError, Token} from '@webex/webex-core';
+import {
+  AuthInterceptor,
+  config,
+  Credentials,
+  WebexHttpError,
+  Token,
+  serviceConstants,
+} from '@webex/webex-core';
 import {cloneDeep, merge} from 'lodash';
@@ -126,3 +133,3 @@ import Metrics from '@webex/internal-plugin-metrics';
               isAllowedDomainUrl: (uri) =>
-                !!config.services.allowedDomains.find((host) => uri.includes(host)),
+                !!serviceConstants.COMMERCIAL_ALLOWED_DOMAINS.find((host) => uri.includes(host)),
               getServiceFromUrl: (uri) => {
@@ -254,3 +261,3 @@ let targetKey;
             isAllowedDomainUrl: (uri) =>
-              !!config.services.allowedDomains.find((host) => uri.includes(host)),
+              !!serviceConstants.COMMERCIAL_ALLOWED_DOMAINS.find((host) => uri.includes(host)),
             validateDomains: true,
@@ -329,3 +336,3 @@ };
             .requiresCredentials({
-              uri: `https://${config.services.allowedDomains[0]}/resource`,
+              uri: `https://${serviceConstants.COMMERCIAL_ALLOWED_DOMAINS[0]}/resource`,
             })
@@ -346,3 +353,3 @@ .then((response) => assert.isTrue(response)));
           const result = isAllowedDomainUrl(
-            `https://${config.services.allowedDomains[0]}/resource`
+            `https://${serviceConstants.COMMERCIAL_ALLOWED_DOMAINS[0]}/resource`
           );
@@ -358,3 +365,3 @@
             .requiresCredentials({
-              uri: `https://${config.services.allowedDomains[0]}/resource`,
+              uri: `https://${serviceConstants.COMMERCIAL_ALLOWED_DOMAINS[0]}/resource`,
             })
@@ -370,3 +377,5 @@ .then((res) => {
 
-          waitForService.resolves(`https://${config.services.allowedDomains[0]}/resource`);
+          waitForService.resolves(
+            `https://${serviceConstants.COMMERCIAL_ALLOWED_DOMAINS[0]}/resource`
+          );
 
@@ -373,0 +382,0 @@ return interceptor

test/unit/spec/services/service-catalog.js

@@ -104,7 +104,3 @@ /*!
       beforeEach(() => {
-        domains.push(
-          'example-a',
-          'example-b',
-          'example-c'
-        );
+        domains.push('example-a', 'example-b', 'example-c');
 
@@ -129,7 +125,3 @@ catalog.setAllowedDomains(domains);
       beforeEach(() => {
-        domains.push(
-          'example-a',
-          'example-b',
-          'example-c'
-        );
+        domains.push('example-a', 'example-b', 'example-c');
 
@@ -173,7 +165,3 @@ catalog.setAllowedDomains(domains);
       beforeEach(() => {
-        domains.push(
-          'example-a',
-          'example-b',
-          'example-c'
-        );
+        domains.push('example-a', 'example-b', 'example-c');
 
@@ -195,4 +183,28 @@ catalog.setAllowedDomains(domains);
     });
+
+    describe('#addAllowedDomains()', () => {
+      const domains = [];
+
+      beforeEach(() => {
+        domains.push('example-a', 'example-b', 'example-c');
+
+        catalog.setAllowedDomains(domains);
+      });
+
+      afterEach(() => {
+        domains.length = 0;
+      });
+
+      it('merge the allowed domain entries with new values', () => {
+        const newValues = ['example-c', 'example-e', 'example-f'];
+
+        catalog.addAllowedDomains(newValues);
+
+        const list = catalog.getAllowedDomains();
+
+        assert.match(['example-a', 'example-b', 'example-c', 'example-e', 'example-f'], list);
+      });
+    });
   });
 });
 /* eslint-enable no-underscore-dangle */

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1370796

increased by0.27%

Lines of code

23971

increased by0.2%

Worsened metrics

Number of low quality alerts

2

increased by100%

Dependency changes

• + Added@webex/common@3.3.1-next.1(transitive)

• + Added@webex/common-timers@3.3.1-next.1(transitive)

• + Added@webex/http-core@3.3.1-next.1(transitive)

• + Added@webex/internal-plugin-device@3.3.1-next.1(transitive)

• + Added@webex/internal-plugin-metrics@3.3.1-next.1(transitive)

• + Added@webex/plugin-logger@3.3.1-next.1(transitive)

• + Added@webex/storage-adapter-spec@3.3.1-next.1(transitive)

• + Added@webex/test-helper-chai@3.3.1-next.1(transitive)

• + Added@webex/test-helper-file@3.3.1-next.1(transitive)

• + Added@webex/test-helper-make-local-url@3.3.1-next.1(transitive)

• + Added@webex/test-helper-mocha@3.3.1-next.1(transitive)

• + Added@webex/test-helper-mock-webex@3.3.1-next.1(transitive)

• + Added@webex/test-helper-retry@3.3.1-next.1(transitive)

• + Added@webex/test-helper-test-users@3.3.1-next.1(transitive)

• + Added@webex/test-users@3.3.1-next.1(transitive)

• - Removed@webex/common@3.3.0(transitive)

• - Removed@webex/common-timers@3.3.0(transitive)

• - Removed@webex/http-core@3.3.0(transitive)

• - Removed@webex/internal-plugin-device@3.3.0(transitive)

• - Removed@webex/internal-plugin-metrics@3.3.0(transitive)

• - Removed@webex/plugin-logger@3.3.0(transitive)

• - Removed@webex/storage-adapter-spec@3.3.0(transitive)

• - Removed@webex/test-helper-chai@3.3.0(transitive)

• - Removed@webex/test-helper-file@3.3.0(transitive)

• - Removed@webex/test-helper-make-local-url@3.3.0(transitive)

• - Removed@webex/test-helper-mocha@3.3.0(transitive)

• - Removed@webex/test-helper-mock-webex@3.3.0(transitive)

• - Removed@webex/test-helper-retry@3.3.0(transitive)

• - Removed@webex/test-helper-test-users@3.3.0(transitive)

• - Removed@webex/test-users@3.3.0(transitive)

• Updated@webex/common@3.3.1-next.1

• Updated@webex/common-timers@3.3.1-next.1

• Updated@webex/http-core@3.3.1-next.1

• Updated@webex/internal-plugin-device@3.3.1-next.1

• Updated@webex/plugin-logger@3.3.1-next.1

• Updated@webex/storage-adapter-spec@3.3.1-next.1