@webex/webex-core 3.0.0-beta.2 → 3.0.0-beta.21

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

@@ -12,37 +12,45 @@ const ServiceCatalog = AmpState.extend({
   namespace: 'ServiceCatalog',
 
   props: {
-    serviceGroups: ['object', true, (() => ({
-      discovery: [],
-      override: [],
-      preauth: [],
-      postauth: [],
-      signin: []
-    }))],
-    status: ['object', true, (() => ({
-      discovery: {
-        ready: false,
-        collecting: false
-      },
-      override: {
-        ready: false,
-        collecting: false
-      },
-      preauth: {
-        ready: false,
-        collecting: false
-      },
-      postauth: {
-        ready: false,
-        collecting: false
-      },
-      signin: {
-        ready: false,
-        collecting: false
-      }
-    }))],
+    serviceGroups: [
+      'object',
+      true,
+      () => ({
+        discovery: [],
+        override: [],
+        preauth: [],
+        postauth: [],
+        signin: [],
+      }),
+    ],
+    status: [
+      'object',
+      true,
+      () => ({
+        discovery: {
+          ready: false,
+          collecting: false,
+        },
+        override: {
+          ready: false,
+          collecting: false,
+        },
+        preauth: {
+          ready: false,
+          collecting: false,
+        },
+        postauth: {
+          ready: false,
+          collecting: false,
+        },
+        signin: {
+          ready: false,
+          collecting: false,
+        },
+      }),
+    ],
     isReady: ['boolean', false, false],
-    allowedDomains: ['array', false, (() => [])]
+    allowedDomains: ['array', false, () => []],
   },
 
   /**
@@ -54,15 +62,16 @@ const ServiceCatalog = AmpState.extend({
    * @returns {ServiceUrl}
    */
   _getUrl(name, serviceGroup) {
-    const serviceUrls = (typeof serviceGroup === 'string') ?
-      this.serviceGroups[serviceGroup] || [] :
-      [
-        ...this.serviceGroups.override,
-        ...this.serviceGroups.postauth,
-        ...this.serviceGroups.signin,
-        ...this.serviceGroups.preauth,
-        ...this.serviceGroups.discovery
-      ];
+    const serviceUrls =
+      typeof serviceGroup === 'string'
+        ? this.serviceGroups[serviceGroup] || []
+        : [
+            ...this.serviceGroups.override,
+            ...this.serviceGroups.postauth,
+            ...this.serviceGroups.signin,
+            ...this.serviceGroups.preauth,
+            ...this.serviceGroups.discovery,
+          ];
 
     return serviceUrls.find((serviceUrl) => serviceUrl.name === name);
   },
@@ -79,7 +88,7 @@ const ServiceCatalog = AmpState.extend({
       ...this.serviceGroups.postauth,
       ...this.serviceGroups.signin,
       ...this.serviceGroups.preauth,
-      ...this.serviceGroups.discovery
+      ...this.serviceGroups.discovery,
     ];
   },
 
@@ -121,7 +130,8 @@ const ServiceCatalog = AmpState.extend({
 
       if (existingService) {
         this.serviceGroups[serviceGroup].splice(
-          this.serviceGroups[serviceGroup].indexOf(existingService), 1
+          this.serviceGroups[serviceGroup].indexOf(existingService),
+          1
         );
       }
     });
@@ -163,8 +173,7 @@ const ServiceCatalog = AmpState.extend({
           }
         }
 
-        if (serviceUrlObj.hostname === incomingUrlObj.hostname &&
-          service.hosts.length > 0) {
+        if (serviceUrlObj.hostname === incomingUrlObj.hostname && service.hosts.length > 0) {
           // no exact match, so try to grab the first home cluster
           for (const host of service.hosts) {
             if (host.homeCluster) {
@@ -196,25 +205,25 @@ const ServiceCatalog = AmpState.extend({
    * @returns {string} service.url
    */
   findServiceFromClusterId({clusterId, priorityHost = true, serviceGroup} = {}) {
-    const serviceUrls = (typeof serviceGroup === 'string') ?
-      this.serviceGroups[serviceGroup] || [] : [
-        ...this.serviceGroups.override,
-        ...this.serviceGroups.postauth,
-        ...this.serviceGroups.signin,
-        ...this.serviceGroups.preauth,
-        ...this.serviceGroups.discovery
-      ];
-
-    const identifiedServiceUrl = serviceUrls.find(
-      (serviceUrl) => serviceUrl.hosts.find(
-        (host) => host.id === clusterId
-      )
+    const serviceUrls =
+      typeof serviceGroup === 'string'
+        ? this.serviceGroups[serviceGroup] || []
+        : [
+            ...this.serviceGroups.override,
+            ...this.serviceGroups.postauth,
+            ...this.serviceGroups.signin,
+            ...this.serviceGroups.preauth,
+            ...this.serviceGroups.discovery,
+          ];
+
+    const identifiedServiceUrl = serviceUrls.find((serviceUrl) =>
+      serviceUrl.hosts.find((host) => host.id === clusterId)
     );
 
     if (identifiedServiceUrl) {
       return {
         name: identifiedServiceUrl.name,
-        url: identifiedServiceUrl.get(priorityHost, clusterId)
+        url: identifiedServiceUrl.get(priorityHost, clusterId),
       };
     }
 
@@ -233,23 +242,20 @@ const ServiceCatalog = AmpState.extend({
       ...this.serviceGroups.preauth,
       ...this.serviceGroups.signin,
       ...this.serviceGroups.postauth,
-      ...this.serviceGroups.override
+      ...this.serviceGroups.override,
     ];
 
-    return serviceUrls.find(
-      (serviceUrl) => {
-        if (incomingUrlObj.hostname ===
-          Url.parse(serviceUrl.defaultUrl).hostname) {
-          return true;
-        }
-
-        if (serviceUrl.hosts.find((host) => host.host === incomingUrlObj.hostname)) {
-          return true;
-        }
+    return serviceUrls.find((serviceUrl) => {
+      if (incomingUrlObj.hostname === Url.parse(serviceUrl.defaultUrl).hostname) {
+        return true;
+      }
 
-        return false;
+      if (serviceUrl.hosts.find((host) => host.host === incomingUrlObj.hostname)) {
+        return true;
       }
-    );
+
+      return false;
+    });
   },
 
   /**
@@ -265,9 +271,7 @@ const ServiceCatalog = AmpState.extend({
       return undefined;
     }
 
-    return this.allowedDomains.find(
-      (allowedDomain) => urlObj.host.includes(allowedDomain)
-    );
+    return this.allowedDomains.find((allowedDomain) => urlObj.host.includes(allowedDomain));
   },
 
   /**
@@ -280,7 +284,7 @@ const ServiceCatalog = AmpState.extend({
   get(name, priorityHost, serviceGroup) {
     const serviceUrl = this._getUrl(name, serviceGroup);
 
-    return (serviceUrl) ? serviceUrl.get(priorityHost) : undefined;
+    return serviceUrl ? serviceUrl.get(priorityHost) : undefined;
   },
 
   /**
@@ -302,15 +306,16 @@ const ServiceCatalog = AmpState.extend({
   list(priorityHost, serviceGroup) {
     const output = {};
 
-    const serviceUrls = (typeof serviceGroup === 'string') ?
-      this.serviceGroups[serviceGroup] || [] :
-      [
-        ...this.serviceGroups.discovery,
-        ...this.serviceGroups.preauth,
-        ...this.serviceGroups.signin,
-        ...this.serviceGroups.postauth,
-        ...this.serviceGroups.override
-      ];
+    const serviceUrls =
+      typeof serviceGroup === 'string'
+        ? this.serviceGroups[serviceGroup] || []
+        : [
+            ...this.serviceGroups.discovery,
+            ...this.serviceGroups.preauth,
+            ...this.serviceGroups.signin,
+            ...this.serviceGroups.postauth,
+            ...this.serviceGroups.override,
+          ];
 
     if (serviceUrls) {
       serviceUrls.forEach((serviceUrl) => {
@@ -335,15 +340,15 @@ const ServiceCatalog = AmpState.extend({
    * @returns {string}
    */
   markFailedUrl(url, noPriorityHosts) {
-    const serviceUrl = this._getUrl(Object.keys(this.list()).find(
-      (key) => this._getUrl(key).failHost(url)
-    ));
+    const serviceUrl = this._getUrl(
+      Object.keys(this.list()).find((key) => this._getUrl(key).failHost(url))
+    );
 
     if (!serviceUrl) {
       return undefined;
     }
 
-    return (noPriorityHosts) ? serviceUrl.get(false) : serviceUrl.get(true);
+    return noPriorityHosts ? serviceUrl.get(false) : serviceUrl.get(true);
   },
 
   /**
@@ -368,10 +373,8 @@ const ServiceCatalog = AmpState.extend({
   updateServiceUrls(serviceGroup, serviceHostmap) {
     const currentServiceUrls = this.serviceGroups[serviceGroup];
 
-    const unusedUrls = currentServiceUrls.filter(
-      (serviceUrl) => serviceHostmap.every(
-        (item) => item.name !== serviceUrl.name
-      )
+    const unusedUrls = currentServiceUrls.filter((serviceUrl) =>
+      serviceHostmap.every((item) => item.name !== serviceUrl.name)
     );
 
     this._unloadServiceUrls(serviceGroup, unusedUrls);
@@ -382,11 +385,12 @@ const ServiceCatalog = AmpState.extend({
       if (service) {
         service.defaultUrl = serviceObj.defaultUrl;
         service.hosts = serviceObj.hosts || [];
-      }
-      else {
-        this._loadServiceUrls(serviceGroup, [new ServiceUrl({
-          ...serviceObj
-        })]);
+      } else {
+        this._loadServiceUrls(serviceGroup, [
+          new ServiceUrl({
+            ...serviceObj,
+          }),
+        ]);
       }
     });
 
@@ -409,16 +413,22 @@ const ServiceCatalog = AmpState.extend({
         resolve();
       }
 
-      const timeoutTimer = setTimeout(() => reject(
-        new Error(`services: timeout occured while waiting for '${serviceGroup}' catalog to populate`)
-      ), (timeout) ? timeout * 1000 : 60000);
+      const timeoutTimer = setTimeout(
+        () =>
+          reject(
+            new Error(
+              `services: timeout occured while waiting for '${serviceGroup}' catalog to populate`
+            )
+          ),
+        timeout ? timeout * 1000 : 60000
+      );
 
       this.once(serviceGroup, () => {
         clearTimeout(timeoutTimer);
         resolve();
       });
     });
-  }
+  },
 });
 /* eslint-enable no-underscore-dangle */
 

package/src/lib/services/service-fed-ramp.js

@@ -1,5 +1,4 @@
-
 export default {
   hydra: 'https://api-usgov.webex.com/v1',
-  u2c: 'https://u2c.gov.ciscospark.com/u2c/api/v1'
+  u2c: 'https://u2c.gov.ciscospark.com/u2c/api/v1',
 };

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

@@ -133,7 +133,7 @@ export default class ServiceHost {
    */
   get active() {
     // Validate that the `ServiceHost` was not marked as failed or replaced.
-    return (!this.failed && !this.replaced);
+    return !this.failed && !this.replaced;
   }
 
   /**
@@ -212,9 +212,9 @@ export default class ServiceHost {
       catalog,
       defaultUri: url,
       hostGroup: Url.parse(url).host,
-      id: (name) ? `poly-head:poly-group:poly-cluster:${name}` : undefined,
+      id: name ? `poly-head:poly-group:poly-cluster:${name}` : undefined,
       priority: 1,
-      uri: Url.parse(url).host
+      uri: Url.parse(url).host,
     });
   }
 
@@ -228,14 +228,7 @@ export default class ServiceHost {
    * @throws - If the parameter transfer object is not valid.
    * @returns {undefined}
    */
-  static validate({
-    catalog,
-    defaultUri,
-    hostGroup,
-    id,
-    priority,
-    uri
-  }) {
+  static validate({catalog, defaultUri, hostGroup, id, priority, uri}) {
     // Generate error-throwing method.
     const throwError = (msg) => {
       throw new Error(`service-host: invalid constructor parameters, ${msg}`);
@@ -243,32 +236,32 @@ export default class ServiceHost {
 
     // Validate the catalog property.
     if (!SERVICE_CATALOGS.includes(catalog)) {
-      throwError('\'catalog\' must be a string');
+      throwError("'catalog' must be a string");
     }
 
     // Validate the `defaultUri` property.
     if (typeof defaultUri !== 'string') {
-      throwError('\'defaultUri\' must be a string');
+      throwError("'defaultUri' must be a string");
     }
 
     // Validate the `hostGroup` property.
     if (typeof hostGroup !== 'string') {
-      throwError('\'hostGroup\' must be a string');
+      throwError("'hostGroup' must be a string");
     }
 
     // Validate the `id` property.
     if (typeof id !== 'string' || id.split(':').length !== 4) {
-      throwError('\'id\' must be a string that contains 3 \':\' characters');
+      throwError("'id' must be a string that contains 3 ':' characters");
     }
 
     // Validate the `priority` property.
     if (typeof priority !== 'number') {
-      throwError('\'priority\' must be a number');
+      throwError("'priority' must be a number");
     }
 
     // Validate the `uri` property.
     if (typeof uri !== 'string') {
-      throwError('\'uri\' must be a string');
+      throwError("'uri' must be a string");
     }
   }
 }