@webex/webex-core 3.0.0-beta.15 → 3.0.0-beta.17

package/dist/lib/services/services.js

@@ -1,67 +1,40 @@
 "use strict";
 
 var _Object$keys2 = require("@babel/runtime-corejs2/core-js/object/keys");
-
 var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs2/core-js/object/get-own-property-symbols");
-
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs2/core-js/object/get-own-property-descriptor");
-
 var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs2/core-js/object/get-own-property-descriptors");
-
 var _Object$defineProperties = require("@babel/runtime-corejs2/core-js/object/define-properties");
-
 var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports.default = void 0;
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/toConsumableArray"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/slicedToArray"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
-
 var _weakMap = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/weak-map"));
-
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
-
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
-
 var _url = _interopRequireDefault(require("url"));
-
 var _sha = _interopRequireDefault(require("crypto-js/sha256"));
-
 var _webexPlugin = _interopRequireDefault(require("../webex-plugin"));
-
 var _metrics = _interopRequireDefault(require("./metrics"));
-
 var _serviceCatalog = _interopRequireDefault(require("./service-catalog"));
-
 var _serviceRegistry = _interopRequireDefault(require("./service-registry"));
-
 var _serviceState = _interopRequireDefault(require("./service-state"));
-
 var _serviceFedRamp = _interopRequireDefault(require("./service-fed-ramp"));
-
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys2(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 var trailingSlashes = /(?:^\/)|(?:\/$)/;
-/* eslint-disable no-underscore-dangle */
 
+/* eslint-disable no-underscore-dangle */
 /**
  * @class
  */
-
 var Services = _webexPlugin.default.extend({
   namespace: 'Services',
-
   /**
    * The {@link WeakMap} of {@link ServiceRegistry} class instances that are
    * keyed with WebexCore instances.
@@ -72,7 +45,6 @@ var Services = _webexPlugin.default.extend({
    * @memberof Services
    */
   registries: new _weakMap.default(),
-
   /**
    * The {@link WeakMap} of {@link ServiceState} class instances that are
    * keyed with WebexCore instances.
@@ -88,7 +60,6 @@ var Services = _webexPlugin.default.extend({
   },
   _catalogs: new _weakMap.default(),
   _serviceUrls: null,
-
   /**
    * Get the registry associated with this webex instance.
    *
@@ -99,7 +70,6 @@ var Services = _webexPlugin.default.extend({
   getRegistry: function getRegistry() {
     return this.registries.get(this.webex);
   },
-
   /**
    * Get the state associated with this webex instance.
    *
@@ -110,7 +80,6 @@ var Services = _webexPlugin.default.extend({
   getState: function getState() {
     return this.states.get(this.webex);
   },
-
   /**
    * @private
    * Get the current catalog based on the assocaited
@@ -120,7 +89,6 @@ var Services = _webexPlugin.default.extend({
   _getCatalog: function _getCatalog() {
     return this._catalogs.get(this.webex);
   },
-
   /**
    * Get a service url from the current services list by name
    * from the associated instance catalog.
@@ -131,10 +99,8 @@ var Services = _webexPlugin.default.extend({
    */
   get: function get(name, priorityHost, serviceGroup) {
     var catalog = this._getCatalog();
-
     return catalog.get(name, priorityHost, serviceGroup);
   },
-
   /**
    * Determine if the catalog contains a specific service
    *
@@ -144,7 +110,6 @@ var Services = _webexPlugin.default.extend({
   hasService: function hasService(serviceName) {
     return !!this.get(serviceName);
   },
-
   /**
    * Determine if a whilelist exists in the service catalog.
    *
@@ -152,10 +117,8 @@ var Services = _webexPlugin.default.extend({
    */
   hasAllowedDomains: function hasAllowedDomains() {
     var catalog = this._getCatalog();
-
     return catalog.getAllowedDomains().length > 0;
   },
-
   /**
    * Generate a service catalog as an object from
    * the associated instance catalog.
@@ -165,10 +128,8 @@ var Services = _webexPlugin.default.extend({
    */
   list: function list(priorityHost, serviceGroup) {
     var catalog = this._getCatalog();
-
     return catalog.list(priorityHost, serviceGroup);
   },
-
   /**
    * Mark a priority host service url as failed.
    * This will mark the host associated with the
@@ -184,10 +145,8 @@ var Services = _webexPlugin.default.extend({
    */
   markFailedUrl: function markFailedUrl(url, noPriorityHosts) {
     var catalog = this._getCatalog();
-
     return catalog.markFailedUrl(url, noPriorityHosts);
   },
-
   /**
    * saves all the services from the pre and post catalog service
    * @param {Object} serviceUrls
@@ -196,7 +155,6 @@ var Services = _webexPlugin.default.extend({
   _updateServiceUrls: function _updateServiceUrls(serviceUrls) {
     this._serviceUrls = _objectSpread(_objectSpread({}, this._serviceUrls), serviceUrls);
   },
-
   /**
    * Update a list of `serviceUrls` to the most current
    * catalog via the defined `discoveryUrl` then returns the current
@@ -212,59 +170,49 @@ var Services = _webexPlugin.default.extend({
    */
   updateServices: function updateServices() {
     var _this = this;
-
     var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        from = _ref.from,
-        query = _ref.query,
-        token = _ref.token,
-        forceRefresh = _ref.forceRefresh;
-
+      from = _ref.from,
+      query = _ref.query,
+      token = _ref.token,
+      forceRefresh = _ref.forceRefresh;
     var catalog = this._getCatalog();
-
     var formattedQuery;
-    var serviceGroup; // map catalog name to service group name.
+    var serviceGroup;
 
+    // map catalog name to service group name.
     switch (from) {
       case 'limited':
         serviceGroup = 'preauth';
         break;
-
       case 'signin':
         serviceGroup = 'signin';
         break;
-
       default:
         serviceGroup = 'postauth';
         break;
-    } // confirm catalog update for group is not in progress.
-
+    }
 
+    // confirm catalog update for group is not in progress.
     if (catalog.status[serviceGroup].collecting) {
       return this.waitForCatalog(serviceGroup);
     }
-
     catalog.status[serviceGroup].collecting = true;
-
     if (serviceGroup === 'preauth') {
       var queryKey = query && (0, _keys.default)(query)[0];
-
       if (!['email', 'emailhash', 'userId', 'orgId', 'mode'].includes(queryKey)) {
         return _promise.default.reject(new Error('a query param of email, emailhash, userId, orgId, or mode is required'));
       }
-    } // encode email when query key is email
-
-
+    }
+    // encode email when query key is email
     if (serviceGroup === 'preauth' || serviceGroup === 'signin') {
       var _queryKey = (0, _keys.default)(query)[0];
       formattedQuery = {};
-
       if (_queryKey === 'email' && query.email) {
         formattedQuery.emailhash = (0, _sha.default)(query.email.toLowerCase()).toString();
       } else {
         formattedQuery[_queryKey] = query[_queryKey];
       }
     }
-
     return this._fetchNewServiceHostmap({
       from: from,
       token: token,
@@ -272,16 +220,13 @@ var Services = _webexPlugin.default.extend({
       forceRefresh: forceRefresh
     }).then(function (serviceHostMap) {
       catalog.updateServiceUrls(serviceGroup, serviceHostMap);
-
       _this.updateCredentialsConfig();
-
       catalog.status[serviceGroup].collecting = false;
     }).catch(function (error) {
       catalog.status[serviceGroup].collecting = false;
       return _promise.default.reject(error);
     });
   },
-
   /**
    * User validation parameter transfer object for {@link validateUser}.
    * @param {object} ValidateUserPTO
@@ -290,7 +235,6 @@ var Services = _webexPlugin.default.extend({
    * @property {object} [ValidateUserPTO.activationOptions] - Extra options to pass when sending the activation
    * @property {object} [ValidateUserPTO.preloginUserId] - The prelogin user id to set when sending the activation.
    */
-
   /**
    * User validation return transfer object for {@link validateUser}.
    * @param {object} ValidateUserRTO
@@ -299,7 +243,6 @@ var Services = _webexPlugin.default.extend({
    * @property {string} ValidateUserRTO.details - A descriptive status message.
    * @property {object} ValidateUserRTO.user - **License** service user object.
    */
-
   /**
    * Validate if a user is activated and update the service catalogs as needed
    * based on the user's activation status.
@@ -309,24 +252,25 @@ var Services = _webexPlugin.default.extend({
    */
   validateUser: function validateUser(_ref2) {
     var _this2 = this;
-
     var email = _ref2.email,
-        _ref2$reqId = _ref2.reqId,
-        reqId = _ref2$reqId === void 0 ? 'WEBCLIENT' : _ref2$reqId,
-        _ref2$forceRefresh = _ref2.forceRefresh,
-        forceRefresh = _ref2$forceRefresh === void 0 ? false : _ref2$forceRefresh,
-        _ref2$activationOptio = _ref2.activationOptions,
-        activationOptions = _ref2$activationOptio === void 0 ? {} : _ref2$activationOptio,
-        preloginUserId = _ref2.preloginUserId;
-    this.logger.info('services: validating a user'); // Validate that an email parameter key was provided.
-
+      _ref2$reqId = _ref2.reqId,
+      reqId = _ref2$reqId === void 0 ? 'WEBCLIENT' : _ref2$reqId,
+      _ref2$forceRefresh = _ref2.forceRefresh,
+      forceRefresh = _ref2$forceRefresh === void 0 ? false : _ref2$forceRefresh,
+      _ref2$activationOptio = _ref2.activationOptions,
+      activationOptions = _ref2$activationOptio === void 0 ? {} : _ref2$activationOptio,
+      preloginUserId = _ref2.preloginUserId;
+    this.logger.info('services: validating a user');
+
+    // Validate that an email parameter key was provided.
     if (!email) {
       return _promise.default.reject(new Error('`email` is required'));
-    } // Destructure the credentials object.
-
+    }
 
-    var canAuthorize = this.webex.credentials.canAuthorize; // Validate that the user is already authorized.
+    // Destructure the credentials object.
+    var canAuthorize = this.webex.credentials.canAuthorize;
 
+    // Validate that the user is already authorized.
     if (canAuthorize) {
       return this.updateServices({
         forceRefresh: forceRefresh
@@ -348,47 +292,49 @@ var Services = _webexPlugin.default.extend({
           user: userObj
         };
       });
-    } // Destructure the client authorization details.
+    }
 
+    // Destructure the client authorization details.
     /* eslint-disable camelcase */
-
-
     var _this$webex$credentia = this.webex.credentials.config,
-        client_id = _this$webex$credentia.client_id,
-        client_secret = _this$webex$credentia.client_secret; // Validate that client authentication details exist.
+      client_id = _this$webex$credentia.client_id,
+      client_secret = _this$webex$credentia.client_secret;
 
+    // Validate that client authentication details exist.
     if (!client_id || !client_secret) {
       return _promise.default.reject(new Error('client authentication details are not available'));
     }
     /* eslint-enable camelcase */
-    // Declare a class-memeber-scoped token for usage within the promise chain.
 
+    // Declare a class-memeber-scoped token for usage within the promise chain.
+    var token;
 
-    var token; // Begin client authentication user validation.
-
+    // Begin client authentication user validation.
     return this.collectPreauthCatalog({
       email: email
     }).then(function () {
       // Retrieve the service url from the updated catalog. This is required
       // since `WebexCore` is usually not fully initialized at the time this
       // request completes.
-      var idbrokerService = _this2.get('idbroker', true); // Collect the client auth token.
-
+      var idbrokerService = _this2.get('idbroker', true);
 
+      // Collect the client auth token.
       return _this2.webex.credentials.getClientToken({
         uri: "".concat(idbrokerService, "idb/oauth2/v1/access_token"),
         scope: 'webexsquare:admin webexsquare:get_conversation Identity:SCIM'
       });
     }).then(function (tokenObj) {
       // Generate the token string.
-      token = tokenObj.toString(); // Collect the signin catalog using the client auth information.
+      token = tokenObj.toString();
 
+      // Collect the signin catalog using the client auth information.
       return _this2.collectSigninCatalog({
         email: email,
         token: token,
         forceRefresh: forceRefresh
       });
-    }) // Validate if collecting the signin catalog failed and populate the RTO
+    })
+    // Validate if collecting the signin catalog failed and populate the RTO
     // with the appropriate content.
     .catch(function (error) {
       return {
@@ -396,7 +342,8 @@ var Services = _webexPlugin.default.extend({
         activated: false,
         details: error.name !== 'NotFound' ? 'user exists but is not activated' : 'user does not exist and is not activated'
       };
-    }) // Validate if the previous promise resolved with an RTO and populate the
+    })
+    // Validate if the previous promise resolved with an RTO and populate the
     // new RTO accordingly.
     .then(function (rto) {
       return _promise.default.all([rto || {
@@ -412,9 +359,8 @@ var Services = _webexPlugin.default.extend({
       })]);
     }).then(function (_ref3) {
       var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
-          rto = _ref4[0],
-          user = _ref4[1];
-
+        rto = _ref4[0],
+        user = _ref4[1];
       return _objectSpread(_objectSpread({}, rto), {}, {
         user: user
       });
@@ -427,7 +373,6 @@ var Services = _webexPlugin.default.extend({
       return _promise.default.reject(response);
     });
   },
-
   /**
    * Get user meeting preferences (preferred webex site).
    *
@@ -435,21 +380,18 @@ var Services = _webexPlugin.default.extend({
    */
   getMeetingPreferences: function getMeetingPreferences() {
     var _this3 = this;
-
     return this.request({
       method: 'GET',
       service: 'hydra',
       resource: 'meetingPreferences'
     }).then(function (res) {
       _this3.logger.info('services: received user region info');
-
       return res.body;
     }).catch(function (err) {
-      _this3.logger.info('services: was not able to fetch user login information', err); // resolve successfully even if request failed
-
+      _this3.logger.info('services: was not able to fetch user login information', err);
+      // resolve successfully even if request failed
     });
   },
-
   /**
    * Fetches client region info such as countryCode and timezone.
    *
@@ -457,7 +399,6 @@ var Services = _webexPlugin.default.extend({
    */
   fetchClientRegionInfo: function fetchClientRegionInfo() {
     var _this4 = this;
-
     return this.request({
       uri: 'https://ds.ciscospark.com/v1/region',
       addAuthHeader: false,
@@ -467,14 +408,12 @@ var Services = _webexPlugin.default.extend({
       timeout: 5000
     }).then(function (res) {
       _this4.logger.info('services: received user region info');
-
       return res.body;
     }).catch(function (err) {
-      _this4.logger.info('services: was not able to get user region info', err); // resolve successfully even if request failed
-
+      _this4.logger.info('services: was not able to get user region info', err);
+      // resolve successfully even if request failed
     });
   },
-
   /**
    * User activation parameter transfer object for {@link sendUserActivation}.
    * @typedef {object} SendUserActivationPTO
@@ -484,7 +423,6 @@ var Services = _webexPlugin.default.extend({
    * @property {object} SendUserActivationPTO.activationOptions - Extra options to pass when sending the activation.
    * @property {object} SendUserActivationPTO.preloginUserId - The prelogin user id to set when sending the activation.
    */
-
   /**
    * Send a request to activate a user using a client token.
    *
@@ -493,23 +431,23 @@ var Services = _webexPlugin.default.extend({
    */
   sendUserActivation: function sendUserActivation(_ref5) {
     var _this5 = this;
-
     var email = _ref5.email,
-        reqId = _ref5.reqId,
-        token = _ref5.token,
-        activationOptions = _ref5.activationOptions,
-        preloginUserId = _ref5.preloginUserId;
+      reqId = _ref5.reqId,
+      token = _ref5.token,
+      activationOptions = _ref5.activationOptions,
+      preloginUserId = _ref5.preloginUserId;
     this.logger.info('services: sending user activation request');
     var countryCode;
-    var timezone; // try to fetch client region info first
+    var timezone;
 
+    // try to fetch client region info first
     return this.fetchClientRegionInfo().then(function (clientRegionInfo) {
       if (clientRegionInfo) {
         countryCode = clientRegionInfo.countryCode;
         timezone = clientRegionInfo.timezone;
-      } // Send the user activation request to the **License** service.
-
+      }
 
+      // Send the user activation request to the **License** service.
       return _this5.request({
         service: 'license',
         resource: 'users/activations',
@@ -527,16 +465,17 @@ var Services = _webexPlugin.default.extend({
         }, activationOptions),
         shouldRefreshAccessToken: false
       });
-    }) // On success, return the **License** user object.
+    })
+    // On success, return the **License** user object.
     .then(function (_ref6) {
       var body = _ref6.body;
       return body;
-    }) // On failure, reject with error from **License**.
+    })
+    // On failure, reject with error from **License**.
     .catch(function (error) {
       return _promise.default.reject(error);
     });
   },
-
   /**
    * simplified method to update the preauth catalog via email
    *
@@ -548,7 +487,6 @@ var Services = _webexPlugin.default.extend({
    */
   collectPreauthCatalog: function collectPreauthCatalog(query) {
     var forceRefresh = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
     if (!query) {
       return this.updateServices({
         from: 'limited',
@@ -558,14 +496,12 @@ var Services = _webexPlugin.default.extend({
         forceRefresh: forceRefresh
       });
     }
-
     return this.updateServices({
       from: 'limited',
       query: query,
       forceRefresh: forceRefresh
     });
   },
-
   /**
    * simplified method to update the signin catalog via email and token
    * @param {object} param
@@ -575,18 +511,15 @@ var Services = _webexPlugin.default.extend({
    */
   collectSigninCatalog: function collectSigninCatalog() {
     var _ref7 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        email = _ref7.email,
-        token = _ref7.token,
-        forceRefresh = _ref7.forceRefresh;
-
+      email = _ref7.email,
+      token = _ref7.token,
+      forceRefresh = _ref7.forceRefresh;
     if (!email) {
       return _promise.default.reject(new Error('`email` is required'));
     }
-
     if (!token) {
       return _promise.default.reject(new Error('`token` is required'));
     }
-
     return this.updateServices({
       from: 'signin',
       query: {
@@ -596,7 +529,6 @@ var Services = _webexPlugin.default.extend({
       forceRefresh: forceRefresh
     });
   },
-
   /**
    * Updates credentials config to utilize u2c catalog
    * urls.
@@ -604,31 +536,29 @@ var Services = _webexPlugin.default.extend({
    */
   updateCredentialsConfig: function updateCredentialsConfig() {
     var _this$list = this.list(true),
-        idbroker = _this$list.idbroker,
-        identity = _this$list.identity;
-
+      idbroker = _this$list.idbroker,
+      identity = _this$list.identity;
     if (idbroker && identity) {
       var _this$webex$config$cr = this.webex.config.credentials,
-          authorizationString = _this$webex$config$cr.authorizationString,
-          authorizeUrl = _this$webex$config$cr.authorizeUrl; // This must be set outside of the setConfig method used to assign the
-      // idbroker and identity url values.
+        authorizationString = _this$webex$config$cr.authorizationString,
+        authorizeUrl = _this$webex$config$cr.authorizeUrl;
 
+      // This must be set outside of the setConfig method used to assign the
+      // idbroker and identity url values.
       this.webex.config.credentials.authorizeUrl = authorizationString ? authorizeUrl : "".concat(idbroker.replace(trailingSlashes, ''), "/idb/oauth2/v1/authorize");
       this.webex.setConfig({
         credentials: {
           idbroker: {
             url: idbroker.replace(trailingSlashes, '') // remove trailing slash
-
           },
+
           identity: {
             url: identity.replace(trailingSlashes, '') // remove trailing slash
-
           }
         }
       });
     }
   },
-
   /**
    * Wait until the service catalog is available,
    * or reject afte ra timeout of 60 seconds.
@@ -638,20 +568,15 @@ var Services = _webexPlugin.default.extend({
    */
   waitForCatalog: function waitForCatalog(serviceGroup, timeout) {
     var catalog = this._getCatalog();
-
     var supertoken = this.webex.credentials.supertoken;
-
     if (serviceGroup === 'postauth' && supertoken && supertoken.access_token && !catalog.status.postauth.collecting && !catalog.status.postauth.ready) {
       if (!catalog.status.preauth.ready) {
         return this.initServiceCatalogs();
       }
-
       return this.updateServices();
     }
-
     return catalog.waitForCatalog(serviceGroup, timeout);
   },
-
   /**
    * Service waiting parameter transfer object for {@link waitForService}.
    *
@@ -660,7 +585,6 @@ var Services = _webexPlugin.default.extend({
    * @property {string} [WaitForServicePTO.url] - The service url.
    * @property {string} [WaitForServicePTO.timeout] - wait duration in seconds.
    */
-
   /**
    * Wait until the service has been ammended to any service catalog. This
    * method prioritizes the service name over the service url when searching.
@@ -670,35 +594,29 @@ var Services = _webexPlugin.default.extend({
    */
   waitForService: function waitForService(_ref8) {
     var _this6 = this;
-
     var name = _ref8.name,
-        _ref8$timeout = _ref8.timeout,
-        timeout = _ref8$timeout === void 0 ? 5 : _ref8$timeout,
-        url = _ref8.url;
-    var services = this.webex.config.services; // Save memory by grabbing the catalog after there isn't a priortyURL
+      _ref8$timeout = _ref8.timeout,
+      timeout = _ref8$timeout === void 0 ? 5 : _ref8$timeout,
+      url = _ref8.url;
+    var services = this.webex.config.services;
 
+    // Save memory by grabbing the catalog after there isn't a priortyURL
     var catalog = this._getCatalog();
-
     var fetchFromServiceUrl = services.servicesNotNeedValidation.find(function (service) {
       return service === name;
     });
-
     if (fetchFromServiceUrl) {
       return _promise.default.resolve(this._serviceUrls[name]);
     }
-
     var priorityUrl = this.get(name, true);
     var priorityUrlObj = this.getServiceFromUrl(url);
-
     if (priorityUrl || priorityUrlObj) {
       return _promise.default.resolve(priorityUrl || priorityUrlObj.priorityUrl);
     }
-
     if (catalog.isReady) {
       if (url) {
         return _promise.default.resolve(url);
       }
-
       this.webex.internal.metrics.submitClientMetrics(_metrics.default.JS_SDK_SERVICE_NOT_FOUND, {
         fields: {
           service_name: name
@@ -706,16 +624,12 @@ var Services = _webexPlugin.default.extend({
       });
       return _promise.default.reject(new Error("services: service '".concat(name, "' was not found in any of the catalogs")));
     }
-
     return new _promise.default(function (resolve, reject) {
       var groupsToCheck = ['preauth', 'signin', 'postauth'];
-
       var checkCatalog = function checkCatalog(catalogGroup) {
         return catalog.waitForCatalog(catalogGroup, timeout).then(function () {
           var scopedPriorityUrl = _this6.get(name, true);
-
           var scopedPrioriryUrlObj = _this6.getServiceFromUrl(url);
-
           if (scopedPriorityUrl || scopedPrioriryUrlObj) {
             resolve(scopedPriorityUrl || scopedPrioriryUrlObj.priorityUrl);
           }
@@ -723,7 +637,6 @@ var Services = _webexPlugin.default.extend({
           return undefined;
         });
       };
-
       _promise.default.all(groupsToCheck.map(function (group) {
         return checkCatalog(group);
       })).then(function () {
@@ -732,12 +645,10 @@ var Services = _webexPlugin.default.extend({
             service_name: name
           }
         });
-
         reject(new Error("services: service '".concat(name, "' was not found after waiting")));
       });
     });
   },
-
   /**
    * @private
    * Organize a received hostmap from a service
@@ -749,17 +660,14 @@ var Services = _webexPlugin.default.extend({
     // map the host catalog items to a formatted hostmap
     var formattedHostmap = (0, _keys.default)(serviceHostmap.hostCatalog).reduce(function (accumulator, key) {
       var _serviceItem$hosts;
-
       if (serviceHostmap.hostCatalog[key].length === 0) {
         return accumulator;
       }
-
       var serviceName = serviceHostmap.hostCatalog[key][0].id.split(':')[3];
       var defaultUrl = serviceHostmap.serviceLinks[serviceName];
       var serviceItem = accumulator.find(function (item) {
         return item.name === serviceName;
       });
-
       if (!serviceItem) {
         serviceItem = {
           name: serviceName,
@@ -769,8 +677,8 @@ var Services = _webexPlugin.default.extend({
         };
         accumulator.push(serviceItem);
       }
-
-      (_serviceItem$hosts = serviceItem.hosts).push.apply(_serviceItem$hosts, [// map the default key as a low priority default for cluster matching
+      (_serviceItem$hosts = serviceItem.hosts).push.apply(_serviceItem$hosts, [
+      // map the default key as a low priority default for cluster matching
       {
         host: key,
         ttl: -1,
@@ -782,15 +690,14 @@ var Services = _webexPlugin.default.extend({
           homeCluster: serviceItem.defaultHost === key
         });
       }))));
-
       return accumulator;
-    }, []); // append service links that do not exist in the host catalog
+    }, []);
 
+    // append service links that do not exist in the host catalog
     (0, _keys.default)(serviceHostmap.serviceLinks).forEach(function (key) {
       var service = formattedHostmap.find(function (item) {
         return item.name === key;
       });
-
       if (!service) {
         formattedHostmap.push({
           name: key,
@@ -799,13 +706,13 @@ var Services = _webexPlugin.default.extend({
           hosts: []
         });
       }
-    }); // update all the service urls in the host catalog
+    });
 
-    this._updateServiceUrls(serviceHostmap.serviceLinks);
+    // update all the service urls in the host catalog
 
+    this._updateServiceUrls(serviceHostmap.serviceLinks);
     return formattedHostmap;
   },
-
   /**
    * Get the clusterId associated with a URL string.
    * @param {string} url
@@ -813,10 +720,8 @@ var Services = _webexPlugin.default.extend({
    */
   getClusterId: function getClusterId(url) {
     var catalog = this._getCatalog();
-
     return catalog.findClusterId(url);
   },
-
   /**
    * Get a service value from a provided clusterId. This method will
    * return an object containing both the name and url of a found service.
@@ -830,10 +735,8 @@ var Services = _webexPlugin.default.extend({
    */
   getServiceFromClusterId: function getServiceFromClusterId(params) {
     var catalog = this._getCatalog();
-
     return catalog.findServiceFromClusterId(params);
   },
-
   /**
    * Get a service object from a service url if the service url exists in the
    * catalog.
@@ -846,20 +749,16 @@ var Services = _webexPlugin.default.extend({
    */
   getServiceFromUrl: function getServiceFromUrl() {
     var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-
     var service = this._getCatalog().findServiceUrlFromUrl(url);
-
     if (!service) {
       return undefined;
     }
-
     return {
       name: service.name,
       priorityUrl: service.get(true),
       defaultUrl: service.get()
     };
   },
-
   /**
    * Verify that a provided url exists in the service
    * catalog.
@@ -868,10 +767,8 @@ var Services = _webexPlugin.default.extend({
    */
   isServiceUrl: function isServiceUrl(url) {
     var catalog = this._getCatalog();
-
     return !!catalog.findServiceUrlFromUrl(url);
   },
-
   /**
    * Determine if a provided url is in the catalog's allowed domains.
    *
@@ -880,10 +777,8 @@ var Services = _webexPlugin.default.extend({
    */
   isAllowedDomainUrl: function isAllowedDomainUrl(url) {
     var catalog = this._getCatalog();
-
     return !!catalog.findAllowedDomain(url);
   },
-
   /**
    * Converts the host portion of the url from default host
    * to a priority host
@@ -895,14 +790,11 @@ var Services = _webexPlugin.default.extend({
   convertUrlToPriorityHostUrl: function convertUrlToPriorityHostUrl() {
     var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     var data = this.getServiceFromUrl(url);
-
     if (!data) {
       throw Error("No service associated with url: [".concat(url, "]"));
     }
-
     return url.replace(data.defaultUrl, data.priorityUrl);
   },
-
   /**
    * @private
    * Simplified method wrapper for sending a request to get
@@ -918,43 +810,35 @@ var Services = _webexPlugin.default.extend({
    */
   _fetchNewServiceHostmap: function _fetchNewServiceHostmap() {
     var _this7 = this;
-
     var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        from = _ref9.from,
-        query = _ref9.query,
-        token = _ref9.token,
-        forceRefresh = _ref9.forceRefresh;
-
+      from = _ref9.from,
+      query = _ref9.query,
+      token = _ref9.token,
+      forceRefresh = _ref9.forceRefresh;
     var service = 'u2c';
     var resource = from ? "/".concat(from, "/catalog") : '/catalog';
-
     var qs = _objectSpread(_objectSpread({}, query), {}, {
       format: 'hostmap'
     });
-
     if (forceRefresh) {
       qs.timestamp = new Date().getTime();
     }
-
     var requestObject = {
       method: 'GET',
       service: service,
       resource: resource,
       qs: qs
     };
-
     if (token) {
       requestObject.headers = {
         authorization: token
       };
     }
-
     return this.request(requestObject).then(function (_ref10) {
       var body = _ref10.body;
       return _this7._formatReceivedHostmap(body);
     });
   },
-
   /**
    * Initialize the discovery services and the whitelisted services.
    *
@@ -963,17 +847,16 @@ var Services = _webexPlugin.default.extend({
   initConfig: function initConfig() {
     // Get the catalog and destructure the services config.
     var catalog = this._getCatalog();
-
     var _this$webex$config = this.webex.config,
-        services = _this$webex$config.services,
-        fedramp = _this$webex$config.fedramp; // Validate that the services configuration exists.
+      services = _this$webex$config.services,
+      fedramp = _this$webex$config.fedramp;
 
+    // Validate that the services configuration exists.
     if (services) {
       if (fedramp) {
         services.discovery = _serviceFedRamp.default;
-      } // Check for discovery services.
-
-
+      }
+      // Check for discovery services.
       if (services.discovery) {
         // Format the discovery configuration into an injectable array.
         var formattedDiscoveryServices = (0, _keys.default)(services.discovery).map(function (key) {
@@ -981,11 +864,11 @@ var Services = _webexPlugin.default.extend({
             name: key,
             defaultUrl: services.discovery[key]
           };
-        }); // Inject formatted discovery services into services catalog.
+        });
 
+        // Inject formatted discovery services into services catalog.
         catalog.updateServiceUrls('discovery', formattedDiscoveryServices);
       }
-
       if (services.override) {
         // Format the override configuration into an injectable array.
         var formattedOverrideServices = (0, _keys.default)(services.override).map(function (key) {
@@ -993,22 +876,22 @@ var Services = _webexPlugin.default.extend({
             name: key,
             defaultUrl: services.override[key]
           };
-        }); // Inject formatted override services into services catalog.
+        });
 
+        // Inject formatted override services into services catalog.
         catalog.updateServiceUrls('override', formattedOverrideServices);
-      } // Check for allowed host domains.
-
+      }
 
+      // Check for allowed host domains.
       if (services.allowedDomains) {
         // Store the allowed domains as a property of the catalog.
         catalog.setAllowedDomains(services.allowedDomains);
-      } // Set `validateDomains` property to match configuration
-
+      }
 
+      // Set `validateDomains` property to match configuration
       this.validateDomains = services.validateDomains;
     }
   },
-
   /**
    * Make the initial requests to collect the root catalogs.
    *
@@ -1016,16 +899,19 @@ var Services = _webexPlugin.default.extend({
    */
   initServiceCatalogs: function initServiceCatalogs() {
     var _this8 = this;
+    this.logger.info('services: initializing initial service catalogs');
 
-    this.logger.info('services: initializing initial service catalogs'); // Destructure the credentials plugin.
+    // Destructure the credentials plugin.
+    var credentials = this.webex.credentials;
 
-    var credentials = this.webex.credentials; // Init a promise chain. Must be done as a Promise.resolve() to allow
+    // Init a promise chain. Must be done as a Promise.resolve() to allow
     // credentials#getOrgId() to properly throw.
-
-    return _promise.default.resolve() // Get the user's OrgId.
+    return _promise.default.resolve()
+    // Get the user's OrgId.
     .then(function () {
       return credentials.getOrgId();
-    }) // Begin collecting the preauth/limited catalog.
+    })
+    // Begin collecting the preauth/limited catalog.
     .then(function (orgId) {
       return _this8.collectPreauthCatalog({
         orgId: orgId
@@ -1037,13 +923,12 @@ var Services = _webexPlugin.default.extend({
         return _this8.updateServices().catch(function () {
           return _this8.logger.warn('services: cannot retrieve postauth catalog');
         });
-      } // Return a resolved promise for consistent return value.
-
+      }
 
+      // Return a resolved promise for consistent return value.
       return _promise.default.resolve();
     });
   },
-
   /**
    * Initializer
    *
@@ -1053,24 +938,24 @@ var Services = _webexPlugin.default.extend({
    */
   initialize: function initialize() {
     var _this9 = this;
-
     var catalog = new _serviceCatalog.default();
     var registry = new _serviceRegistry.default();
     var state = new _serviceState.default();
-
     this._catalogs.set(this.webex, catalog);
-
     this.registries.set(this.webex, registry);
-    this.states.set(this.webex, state); // Listen for configuration changes once.
+    this.states.set(this.webex, state);
 
+    // Listen for configuration changes once.
     this.listenToOnce(this.webex, 'change:config', function () {
       _this9.initConfig();
-    }); // wait for webex instance to be ready before attempting
-    // to update the service catalogs
+    });
 
+    // wait for webex instance to be ready before attempting
+    // to update the service catalogs
     this.listenToOnce(this.webex, 'ready', function () {
-      var supertoken = _this9.webex.credentials.supertoken; // Validate if the supertoken exists.
+      var supertoken = _this9.webex.credentials.supertoken;
 
+      // Validate if the supertoken exists.
       if (supertoken && supertoken.access_token) {
         _this9.initServiceCatalogs().then(function () {
           catalog.isReady = true;
@@ -1079,18 +964,15 @@ var Services = _webexPlugin.default.extend({
         });
       } else {
         var email = _this9.webex.config.email;
-
         _this9.collectPreauthCatalog(email ? {
           email: email
         } : undefined);
       }
     });
   },
-  version: "3.0.0-beta.15"
+  version: "3.0.0-beta.17"
 });
 /* eslint-enable no-underscore-dangle */
-
-
 var _default = Services;
 exports.default = _default;
 //# sourceMappingURL=services.js.map