@webex/webex-core 3.10.0-webex-services-ready.5 → 3.10.0-webex-services-ready.6

package/dist/lib/batcher.js

@@ -286,7 +286,7 @@ var Batcher = _webexPlugin.default.extend({
   fingerprintResponse: function fingerprintResponse(item) {
     throw new Error('fingerprintResponse() must be implemented');
   },
-  version: "3.10.0-webex-services-ready.5"
+  version: "3.10.0-webex-services-ready.6"
 });
 var _default2 = exports.default = Batcher;
 //# sourceMappingURL=batcher.js.map

package/dist/lib/credentials/credentials.js

@@ -556,7 +556,7 @@ var Credentials = _webexPlugin.default.extend((_dec = (0, _common.oneFlight)({
       this.refresh();
     }
   },
-  version: "3.10.0-webex-services-ready.5"
+  version: "3.10.0-webex-services-ready.6"
 }, (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

package/dist/lib/credentials/token.js

@@ -532,7 +532,7 @@ var Token = _webexPlugin.default.extend((_dec = (0, _common.oneFlight)({
       return res.body;
     });
   },
-  version: "3.10.0-webex-services-ready.5"
+  version: "3.10.0-webex-services-ready.6"
 }, (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

package/dist/lib/services/services.js

@@ -1454,7 +1454,7 @@ var Services = _webexPlugin.default.extend({
       }, _callee4);
     })));
   },
-  version: "3.10.0-webex-services-ready.5"
+  version: "3.10.0-webex-services-ready.6"
 });
 /* eslint-enable no-underscore-dangle */
 var _default = exports.default = Services;

package/dist/lib/services-v2/services-v2.js

@@ -1385,7 +1385,7 @@ var Services = _webexPlugin.default.extend({
       }, _callee3);
     })));
   },
-  version: "3.10.0-webex-services-ready.5"
+  version: "3.10.0-webex-services-ready.6"
 });
 /* eslint-enable no-underscore-dangle */
 var _default = exports.default = Services;

package/dist/plugins/logger.js

@@ -57,7 +57,7 @@ var Logger = _webexPlugin.default.extend({
   info: wrapConsoleMethod('info'),
   debug: wrapConsoleMethod('debug'),
   trace: wrapConsoleMethod('trace'),
-  version: "3.10.0-webex-services-ready.5"
+  version: "3.10.0-webex-services-ready.6"
 });
 (0, _webexCore.registerPlugin)('logger', Logger);
 var _default = exports.default = Logger;

package/dist/webex-core.js

@@ -96,7 +96,7 @@ var MAX_FILE_SIZE_IN_MB = 2048;
  * @class
  */
 var WebexCore = _ampersandState.default.extend((_obj = {
-  version: "3.10.0-webex-services-ready.5",
+  version: "3.10.0-webex-services-ready.6",
   children: {
     internal: _webexInternalCore.default
   },
@@ -634,7 +634,7 @@ var WebexCore = _ampersandState.default.extend((_obj = {
     });
   }
 }, (0, _applyDecoratedDescriptor2.default)(_obj, "_uploadPhaseUpload", [_common.retry], (0, _getOwnPropertyDescriptor.default)(_obj, "_uploadPhaseUpload"), _obj), _obj));
-WebexCore.version = "3.10.0-webex-services-ready.5";
+WebexCore.version = "3.10.0-webex-services-ready.6";
 (0, _webexInternalCorePluginMixin.default)(_webexInternalCore.default, _config.default, interceptors);
 (0, _webexCorePluginMixin.default)(WebexCore, _config.default, interceptors);
 var _default = exports.default = WebexCore;

package/package.json

@@ -33,10 +33,10 @@
     "@sinonjs/fake-timers": "^6.0.1",
     "@webex/babel-config-legacy": "0.0.0",
     "@webex/eslint-config-legacy": "0.0.0",
-    "@webex/internal-plugin-device": "3.10.0-webex-services-ready.5",
+    "@webex/internal-plugin-device": "3.10.0-webex-services-ready.6",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/plugin-logger": "3.10.0-webex-services-ready.5",
+    "@webex/plugin-logger": "3.10.0-webex-services-ready.6",
     "@webex/test-helper-chai": "3.10.0-webex-services-ready.2",
     "@webex/test-helper-make-local-url": "3.10.0-webex-services-ready.2",
     "@webex/test-helper-mocha": "3.10.0-webex-services-ready.2",
@@ -73,5 +73,5 @@
     "test:style": "eslint ./src/**/*.*",
     "test:unit": "webex-legacy-tools test --unit --runner jest"
   },
-  "version": "3.10.0-webex-services-ready.5"
+  "version": "3.10.0-webex-services-ready.6"
 }

package/test/integration/spec/services/service-catalog.js

@@ -509,13 +509,19 @@ describe('webex-core', () => {
       );
 
       it('resolves to an authed u2c hostmap when no params specified', () => {
-        assert.typeOf(fullRemoteHM, 'array');
-        assert.isAbove(fullRemoteHM.length, 0);
+        assert.typeOf(fullRemoteHM, 'object');
+        assert.property(fullRemoteHM, 'serviceLinks');
+        assert.property(fullRemoteHM, 'hostCatalog');
+        assert.equal(fullRemoteHM.format, 'hostmap');
+        assert.isAbove(Object.keys(fullRemoteHM.serviceLinks).length, 0);
       });
 
       it('resolves to a limited u2c hostmap when params specified', () => {
-        assert.typeOf(limitedRemoteHM, 'array');
-        assert.isAbove(limitedRemoteHM.length, 0);
+        assert.typeOf(limitedRemoteHM, 'object');
+        assert.property(limitedRemoteHM, 'serviceLinks');
+        assert.property(limitedRemoteHM, 'hostCatalog');
+        assert.equal(limitedRemoteHM.format, 'hostmap');
+        assert.isAbove(Object.keys(limitedRemoteHM.serviceLinks).length, 0);
       });
 
       it('rejects if the params provided are invalid', () =>

package/test/integration/spec/services/services.js

@@ -404,10 +404,12 @@ describe('webex-core', () => {
         assert.isTrue(catalog.isReady);
       });
 
-      it('should call services#initServiceCatalogs() on webex loaded', () => {
+      it('should call services#initServiceCatalogs() on webex loaded', async () => {
         services.initServiceCatalogs = sinon.stub().resolves();
         services.initialize();
         webex.trigger('loaded');
+        // Wait for the async callback to execute
+        await new Promise((resolve) => setTimeout(resolve, 10));
         assert.called(services.initServiceCatalogs);
       });
 
@@ -709,7 +711,11 @@ describe('webex-core', () => {
 
       it('updates query.email to be emailhash-ed using SHA256', (done) => {
         catalog.updateServiceUrls = sinon.stub().returns({}); // returns `this`
-        services._fetchNewServiceHostmap = sinon.stub().resolves();
+        services._fetchNewServiceHostmap = sinon.stub().resolves({
+          serviceLinks: {},
+          hostCatalog: {},
+          format: 'hostmap',
+        });
 
         services
           .updateServices({
@@ -839,9 +845,12 @@ describe('webex-core', () => {
 
       const getActivationRequest = (requestStub, useUserOnboarding = false) => {
         const expectedService = useUserOnboarding ? 'user-onboarding' : 'license';
-        const expectedResource = useUserOnboarding ? 'api/v1/users/activations' : 'users/activations';
+        const expectedResource = useUserOnboarding
+          ? 'api/v1/users/activations'
+          : 'users/activations';
         const requests = requestStub.args.filter(
-          ([request]) => request.service === expectedService && request.resource === expectedResource
+          ([request]) =>
+            request.service === expectedService && request.resource === expectedResource
         );
 
         assert.strictEqual(requests.length, 1);
@@ -920,7 +929,7 @@ describe('webex-core', () => {
             assert.equal(Object.keys(unauthServices.list(false, 'postauth')).length, 0);
           }));
 
-      it.skip('validates new user with activationOptions suppressEmail true', () =>
+      it('validates new user with activationOptions suppressEmail true', () =>
         unauthServices
           .validateUser({
             email: `Collabctg+webex-js-sdk-${uuid.v4()}@gmail.com`,
@@ -1266,13 +1275,19 @@ describe('webex-core', () => {
       );
 
       it('resolves to an authed u2c hostmap when no params specified', () => {
-        assert.typeOf(fullRemoteHM, 'array');
-        assert.isAbove(fullRemoteHM.length, 0);
+        assert.typeOf(fullRemoteHM, 'object');
+        assert.property(fullRemoteHM, 'serviceLinks');
+        assert.property(fullRemoteHM, 'hostCatalog');
+        assert.equal(fullRemoteHM.format, 'hostmap');
+        assert.isAbove(Object.keys(fullRemoteHM.serviceLinks).length, 0);
       });
 
       it('resolves to a limited u2c hostmap when params specified', () => {
-        assert.typeOf(limitedRemoteHM, 'array');
-        assert.isAbove(limitedRemoteHM.length, 0);
+        assert.typeOf(limitedRemoteHM, 'object');
+        assert.property(limitedRemoteHM, 'serviceLinks');
+        assert.property(limitedRemoteHM, 'hostCatalog');
+        assert.equal(limitedRemoteHM.format, 'hostmap');
+        assert.isAbove(Object.keys(limitedRemoteHM.serviceLinks).length, 0);
       });
 
       it('rejects if the params provided are invalid', () =>

package/test/integration/spec/services-v2/services-v2.js

@@ -23,7 +23,7 @@ import {
   formattedServiceHostmapEntryConv,
   formattedServiceHostmapEntryMercury,
   formattedServiceHostmapEntryTest,
-  serviceHostmapV2
+  serviceHostmapV2,
 } from '../../../fixtures/host-catalog-v2';
 
 // /* eslint-disable no-underscore-dangle */
@@ -316,10 +316,12 @@ describe('webex-core', () => {
         assert.isTrue(catalog.isReady);
       });
 
-      it('should call services#initServiceCatalogs() on webex loaded', () => {
+      it('should call services#initServiceCatalogs() on webex loaded', async () => {
         services.initServiceCatalogs = sinon.stub().resolves();
         services.initialize();
         webex.trigger('loaded');
+        // Wait for the async callback to execute
+        await new Promise((resolve) => setTimeout(resolve, 10));
         assert.called(services.initServiceCatalogs);
       });
 
@@ -425,7 +427,11 @@ describe('webex-core', () => {
             .initServiceCatalogs(true)
             // services#updateServices() gets called once by the limited catalog
             // retrieval and should get called again when authorized.
-            .then(() => assert.calledTwice(services.updateServices) && assert.calledWith(services.updateServices, sinon.match({forceRefresh: true})))
+            .then(
+              () =>
+                assert.calledTwice(services.updateServices) &&
+                assert.calledWith(services.updateServices, sinon.match({forceRefresh: true}))
+            )
         );
       });
     });
@@ -762,9 +768,12 @@ describe('webex-core', () => {
 
       const getActivationRequest = (requestStub, useUserOnboarding = false) => {
         const expectedService = useUserOnboarding ? 'user-onboarding' : 'license';
-        const expectedResource = useUserOnboarding ? 'api/v1/users/activations' : 'users/activations';
+        const expectedResource = useUserOnboarding
+          ? 'api/v1/users/activations'
+          : 'users/activations';
         const requests = requestStub.args.filter(
-          ([request]) => request.service === expectedService && request.resource === expectedResource
+          ([request]) =>
+            request.service === expectedService && request.resource === expectedResource
         );
 
         assert.strictEqual(requests.length, 1);
@@ -837,7 +846,7 @@ describe('webex-core', () => {
             assert.equal(r.user.verificationEmailTriggered, true);
           }));
 
-      it.skip('validates new user with activationOptions suppressEmail true', () =>
+      it('validates new user with activationOptions suppressEmail true', () =>
         unauthServices
           .validateUser({
             email: `Collabctg+webex-js-sdk-${uuid.v4()}@gmail.com`,