@webex/webex-core 3.8.0-next.2 → 3.8.0-next.20

package/test/fixtures/host-catalog-v2.js

@@ -0,0 +1,247 @@
+export const serviceHostmapV2 = {
+  activeServices: {
+    conversation: 'urn:TEAM:us-east-2_a:conversation',
+    idbroker: 'urn:TEAM:us-east-2_a:idbroker',
+    locus: 'urn:TEAM:us-east-2_a:locus',
+    mercury: 'urn:TEAM:us-east-2_a:mercury',
+  },
+  services: [
+    {
+      id: 'urn:TEAM:us-east-2_a:conversation',
+      serviceName: 'conversation',
+      serviceUrls: [
+        {
+          baseUrl: 'https://prod-achm-message.svc.webex.com/conversation/api/v1',
+          priority: 1,
+        },
+        {
+          baseUrl: 'https://conv-a.wbx2.com/conversation/api/v1',
+          priority: 2,
+        },
+      ],
+    },
+    {
+      id: 'urn:TEAM:me-central-1_d:conversation',
+      serviceName: 'conversation',
+      serviceUrls: [
+        {
+          baseUrl: 'https://prod-adxb-message.svc.webex.com/conversation/api/v1',
+          priority: 1,
+        },
+        {
+          baseUrl: 'https://conv-d.wbx2.com/conversation/api/v1',
+          priority: 2,
+        },
+      ],
+    },
+    {
+      id: 'urn:TEAM:us-east-2_a:idbroker',
+      serviceName: 'idbroker',
+      serviceUrls: [
+        {
+          baseUrl: 'https://prod-adxb-message.svc.webex.com/idbroker/api/v1',
+          priority: 1,
+        },
+        {
+          baseUrl: 'https://idbroker.webex.com/idb/api/v1',
+          priority: 2,
+        },
+      ],
+    },
+    {
+      id: 'urn:TEAM:me-central-1_d:idbroker',
+      serviceName: 'idbroker',
+      serviceUrls: [
+        {
+          baseUrl: 'https://prod-adxb-message.svc.webex.com/idbroker/api/v1',
+          priority: 1,
+        },
+        {
+          baseUrl: 'https://conv-d.wbx2.com/idbroker/api/v1',
+          priority: 2,
+        },
+      ],
+    },
+    {
+      id: 'urn:TEAM:us-east-2_a:locus',
+      serviceName: 'locus',
+      serviceUrls: [
+        {
+          baseUrl: 'https://prod-adxb-message.svc.webex.com/locus/api/v1',
+          priority: 1,
+        },
+        {
+          baseUrl: 'https://locus-a.wbx2.com/locus/api/v1',
+          priority: 2,
+        },
+      ],
+    },
+    {
+      id: 'urn:TEAM:me-central-1_d:locus',
+      serviceName: 'locus',
+      serviceUrls: [
+        {
+          baseUrl: 'https://prod-adxb-message.svc.webex.com/locus/api/v1',
+          priority: 1,
+        },
+        {
+          baseUrl: 'https://conv-d.wbx2.com/locus/api/v1',
+          priority: 2,
+        },
+      ],
+    },
+    {
+      id: 'urn:TEAM:us-east-2_a:mercury',
+      serviceName: 'mercury',
+      serviceUrls: [
+        {
+          baseUrl: 'https://mercury-a.wbx2.com/mercury/api/v1',
+          priority: 1,
+        },
+      ],
+    },
+    {
+      id: 'urn:TEAM:me-central-1_d:mercury',
+      serviceName: 'mercury',
+      serviceUrls: [
+        {
+          baseUrl: 'https://prod-adxb-message.svc.webex.com/mercury/api/v1',
+          priority: 1,
+        },
+        {
+          baseUrl: 'https://conv-d.wbx2.com/mercury/api/v1',
+          priority: 2,
+        },
+      ],
+    },
+  ],
+  orgId: '3e0e410f-f83f-4ee4-ac32-12692e99355c',
+  timestamp: '1745533341',
+  format: 'U2Cv2',
+};
+
+export const formattedServiceHostmapV2 = [
+  {
+    id: 'urn:TEAM:us-east-2_a:conversation',
+    serviceName: 'conversation',
+    serviceUrls: [
+      {
+        baseUrl: 'https://prod-achm-message.svc.webex.com/conversation/api/v1',
+        host: 'prod-achm-message.svc.webex.com',
+        priority: 1,
+      },
+      {
+        baseUrl: 'https://conv-a.wbx2.com/conversation/api/v1',
+        host: 'conv-a.wbx2.com',
+        priority: 2,
+      },
+    ],
+  },
+  {
+    id: 'urn:TEAM:me-central-1_d:conversation',
+    serviceName: 'conversation',
+    serviceUrls: [
+      {
+        baseUrl: 'https://prod-adxb-message.svc.webex.com/conversation/api/v1',
+        host: 'prod-adxb-message.svc.webex.com',
+        priority: 1,
+      },
+      {
+        baseUrl: 'https://conv-d.wbx2.com/conversation/api/v1',
+        host: 'conv-d.wbx2.com',
+        priority: 2,
+      },
+    ],
+  },
+  {
+    id: 'urn:TEAM:us-east-2_a:idbroker',
+    serviceName: 'idbroker',
+    serviceUrls: [
+      {
+        baseUrl: 'https://prod-adxb-message.svc.webex.com/idbroker/api/v1',
+        host: 'prod-adxb-message.svc.webex.com',
+        priority: 1,
+      },
+      {
+        baseUrl: 'https://idbroker.webex.com/idb/api/v1',
+        host: 'idbroker.webex.com',
+        priority: 2,
+      },
+    ],
+  },
+  {
+    id: 'urn:TEAM:me-central-1_d:idbroker',
+    serviceName: 'idbroker',
+    serviceUrls: [
+      {
+        baseUrl: 'https://prod-adxb-message.svc.webex.com/idbroker/api/v1',
+        host: 'prod-adxb-message.svc.webex.com',
+        priority: 1,
+      },
+      {
+        baseUrl: 'https://conv-d.wbx2.com/idbroker/api/v1',
+        host: 'conv-d.wbx2.com',
+        priority: 2,
+      },
+    ],
+  },
+  {
+    id: 'urn:TEAM:us-east-2_a:locus',
+    serviceName: 'locus',
+    serviceUrls: [
+      {
+        baseUrl: 'https://prod-adxb-message.svc.webex.com/locus/api/v1',
+        host: 'prod-adxb-message.svc.webex.com',
+        priority: 1,
+      },
+      {
+        baseUrl: 'https://locus-a.wbx2.com/locus/api/v1',
+        host: 'locus-a.wbx2.com',
+        priority: 2,
+      },
+    ],
+  },
+  {
+    id: 'urn:TEAM:me-central-1_d:locus',
+    serviceName: 'locus',
+    serviceUrls: [
+      {
+        baseUrl: 'https://prod-adxb-message.svc.webex.com/locus/api/v1',
+        host: 'prod-adxb-message.svc.webex.com',
+        priority: 1,
+      },
+      {
+        baseUrl: 'https://conv-d.wbx2.com/locus/api/v1',
+        host: 'conv-d.wbx2.com',
+        priority: 2,
+      },
+    ],
+  },
+  {
+    id: 'urn:TEAM:us-east-2_a:mercury',
+    serviceName: 'mercury',
+    serviceUrls: [
+      {
+        baseUrl: 'https://mercury-a.wbx2.com/mercury/api/v1',
+        host: 'mercury-a.wbx2.com',
+        priority: 1,
+      },
+    ],
+  },
+  {
+    id: 'urn:TEAM:me-central-1_d:mercury',
+    serviceName: 'mercury',
+    serviceUrls: [
+      {
+        baseUrl: 'https://prod-adxb-message.svc.webex.com/mercury/api/v1',
+        host: 'prod-adxb-message.svc.webex.com',
+        priority: 1,
+      },
+      {
+        baseUrl: 'https://conv-d.wbx2.com/mercury/api/v1',
+        host: 'conv-d.wbx2.com',
+        priority: 2,
+      },
+    ],
+  },
+];

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

@@ -208,108 +208,48 @@ describe('webex-core', () => {
         hosts: [{host: 'example1.com'}, {host: 'example2.com'}],
       };
 
-      it('should return false if the URL is invalid', () => {
-        const result = catalog.findServiceUrlFromUrl('invalid-url');
-        assert.isFalse(result);
-      });
-
-      it('should return the service URL object if found in the service groups', () => {
-        catalog.serviceGroups = {
-          discovery: [{defaultUrl: 'https://discovery.example.com', hosts: []}],
-          preauth: [{defaultUrl: 'https://preauth.example.com', hosts: []}],
-          signin: [{defaultUrl: 'https://signin.example.com', hosts: []}],
-          postauth: [{defaultUrl: 'https://postauth.example.com', hosts: []}],
-          override: [{defaultUrl: 'https://override.example.com', hosts: []}],
+      it.each([
+        'discovery',
+        'preauth',
+        'signin',
+        'postauth',
+        'override'
+      ])('matches a default url correctly', (serviceGroup) => {
+        const url = 'https://example.com/resource/id';
+
+
+        const exampleService = {
+          defaultUrl: 'https://example.com/resource',
+          hosts: [{host: 'example1.com'}, {host: 'example2.com'}],
         };
 
-        const result = catalog.findServiceUrlFromUrl('https://signin.example.com/resource');
-        assert.deepEqual(result, {defaultUrl: 'https://signin.example.com', hosts: []});
-      });
+        catalog.serviceGroups[serviceGroup].push(otherService, exampleService);
 
-      it('should return false if the service URL is not found in the service groups', () => {
-        catalog.serviceGroups = {
-          discovery: [{defaultUrl: 'https://discovery.example.com', hosts: []}],
-          preauth: [{defaultUrl: 'https://preauth.example.com', hosts: []}],
-          signin: [{defaultUrl: 'https://signin.example.com', hosts: []}],
-          postauth: [{defaultUrl: 'https://postauth.example.com', hosts: []}],
-          override: [{defaultUrl: 'https://override.example.com', hosts: []}],
-        };
+        const service = catalog.findServiceUrlFromUrl(url);
 
-        const result = catalog.findServiceUrlFromUrl('https://unknown.example.com/resource');
-        assert.isFalse(result);
+        assert.equal(service, exampleService);
       });
 
-      it('should handle alternate hostnames correctly', () => {
-        catalog.serviceGroups = {
-          discovery: [{defaultUrl: 'https://discovery.example.com', hosts: [{host: 'alt.discovery.example.com'}]}],
-          preauth: [{defaultUrl: 'https://preauth.example.com', hosts: [{host: 'alt.preauth.example.com'}]}],
-          signin: [{defaultUrl: 'https://signin.example.com', hosts: [{host: 'alt.signin.example.com'}]}],
-          postauth: [{defaultUrl: 'https://postauth.example.com', hosts: [{host: 'alt.postauth.example.com'}]}],
-          override: [{defaultUrl: 'https://override.example.com', hosts: [{host: 'alt.override.example.com'}]}],
-        };
+      it.each([
+        'discovery',
+        'preauth',
+        'signin',
+        'postauth',
+        'override'
+      ])('matches an alternate host url', (serviceGroup) => {
+        const url = 'https://example2.com/resource/id';
 
-        const result = catalog.findServiceUrlFromUrl('https://alt.signin.example.com/resource');
-        assert.deepEqual(result, {defaultUrl: 'https://signin.example.com', hosts: [{host: 'alt.signin.example.com'}]});
-      });
-
-      it('should skip service URLs with invalid default URLs', () => {
-        catalog.serviceGroups = {
-          discovery: [{defaultUrl: 'invalid-url', hosts: []}],
-          preauth: [{defaultUrl: 'https://preauth.example.com', hosts: []}],
-          signin: [{defaultUrl: 'https://signin.example.com', hosts: []}],
-          postauth: [{defaultUrl: 'https://postauth.example.com', hosts: []}],
-          override: [{defaultUrl: 'https://override.example.com', hosts: []}],
+        const exampleService = {
+          defaultUrl: 'https://example.com/resource',
+          hosts: [{host: 'example1.com'}, {host: 'example2.com'}],
         };
 
-        const result = catalog.findServiceUrlFromUrl('https://signin.example.com/resource');
-        assert.deepEqual(result, {defaultUrl: 'https://signin.example.com', hosts: []});
-      });
-
-      it('should skip alternate hostnames with invalid URLs', () => {
-        catalog.serviceGroups = {
-          discovery: [{defaultUrl: 'https://discovery.example.com', hosts: [{host: 'invalid-url'}]}],
-          preauth: [{defaultUrl: 'https://preauth.example.com', hosts: []}],
-          signin: [{defaultUrl: 'https://signin.example.com', hosts: []}],
-          postauth: [{defaultUrl: 'https://postauth.example.com', hosts: []}],
-          override: [{defaultUrl: 'https://override.example.com', hosts: []}],
-        };
-
-        const result = catalog.findServiceUrlFromUrl('https://signin.example.com/resource');
-        assert.deepEqual(result, {defaultUrl: 'https://signin.example.com', hosts: []});
-      });
-
-      it('should return the service URL object if found with a different protocol', () => {
-        catalog.serviceGroups = {
-          discovery: [{defaultUrl: 'https://discovery.example.com', hosts: []}],
-          preauth: [{defaultUrl: 'https://preauth.example.com', hosts: []}],
-          signin: [{defaultUrl: 'https://signin.example.com', hosts: []}],
-          postauth: [{defaultUrl: 'https://postauth.example.com', hosts: []}],
-          override: [{defaultUrl: 'https://override.example.com', hosts: []}],
-        };
-
-        const result = catalog.findServiceUrlFromUrl('wss://signin.example.com/resource');
-        assert.deepEqual(result, {defaultUrl: 'https://signin.example.com', hosts: []});
-      });
-      
-      it('should return the exact protocol service URL object if both protocols are present', () => {
-        catalog.serviceGroups = {
-          discovery: [{defaultUrl: 'https://discovery.example.com', hosts: []}],
-          preauth: [{defaultUrl: 'https://preauth.example.com', hosts: []}],
-          signin: [
-            {defaultUrl: 'https://signin.example.com', hosts: []},
-            {defaultUrl: 'wss://signin.example.com', hosts: []},
-          ],
-          postauth: [{defaultUrl: 'https://postauth.example.com', hosts: []}],
-          override: [{defaultUrl: 'https://override.example.com', hosts: []}],
-        };
+        catalog.serviceGroups[serviceGroup].push(otherService, exampleService);
 
-        const resultHttps = catalog.findServiceUrlFromUrl('https://signin.example.com/resource');
-        const resultWss = catalog.findServiceUrlFromUrl('wss://signin.example.com/resource');
+        const service = catalog.findServiceUrlFromUrl(url);
 
-        assert.deepEqual(resultHttps, {defaultUrl: 'https://signin.example.com', hosts: []});
-        assert.deepEqual(resultWss, {defaultUrl: 'wss://signin.example.com', hosts: []});
+        assert.equal(service, exampleService);
       });
-      
     });
   });
 });