@webex/internal-plugin-metrics 3.12.0-next.45 → 3.12.0-next.47

package/test/unit/spec/call-diagnostic/call-diagnostic-metrics.ts

@@ -841,6 +841,60 @@ describe('internal-plugin-metrics', () => {
           userId: 'preLoginId',
         });
       });
+
+      it('should use the userId from credentials when no device userId is available', () => {
+        cd.device.userId = undefined;
+        webex.credentials.getUserId = sinon.stub().returns('credentials-user-id');
+
+        const res = cd.getIdentifiers({
+          correlationId: 'correlationId',
+        });
+
+        assert.deepEqual(res, {
+          correlationId: 'correlationId',
+          locusUrl: 'locus-url',
+          deviceId: 'deviceUrl',
+          orgId: 'orgId',
+          userId: 'credentials-user-id',
+        });
+      });
+
+      it('should prefer the device userId over the credentials userId', () => {
+        webex.credentials.getUserId = sinon.stub().returns('credentials-user-id');
+
+        const res = cd.getIdentifiers({
+          correlationId: 'correlationId',
+        });
+
+        assert.equal(res.userId, 'userId');
+        assert.notCalled(webex.credentials.getUserId);
+      });
+
+      it('should fall back to preLoginId when neither the device nor credentials provide a userId', () => {
+        cd.device.userId = undefined;
+        webex.credentials.getUserId = sinon.stub().throws(new Error('no user token available'));
+
+        const res = cd.getIdentifiers({
+          correlationId: 'correlationId',
+          preLoginId: 'preLoginId',
+        });
+
+        assert.equal(res.userId, 'preLoginId');
+      });
+    });
+
+    describe('#getUserIdFromCredentials', () => {
+      it('should return the userId from credentials', () => {
+        webex.credentials.getUserId = sinon.stub().returns('credentials-user-id');
+
+        assert.equal(cd.getUserIdFromCredentials(), 'credentials-user-id');
+      });
+
+      it('should return undefined when credentials cannot provide a userId', () => {
+        webex.credentials.getUserId = sinon.stub().throws(new Error('no user token available'));
+
+        assert.isUndefined(cd.getUserIdFromCredentials());
+      });
     });
 
     it('should prepare diagnostic event successfully', () => {

package/test/unit/spec/metrics.js

@@ -13,7 +13,7 @@ import {BrowserDetection} from '@webex/common';
 const {getOSVersion} = BrowserDetection();
 
 //@ts-ignore
-global.window = {location: {hostname: 'whatever'}};
+global.window = {location: {hostname: 'whatever', origin: 'https://whatever'}};
 function promiseTick(count) {
   let promise = Promise.resolve();
 
@@ -30,6 +30,7 @@ describe('plugin-metrics', () => {
     let webex;
     let metrics;
     let clock;
+    let previousWindow;
 
     const eventName = 'test_event';
     const mockPayload = {
@@ -67,10 +68,15 @@ describe('plugin-metrics', () => {
 
     beforeEach(() => {
       clock = FakeTimers.install({now: 0});
+      previousWindow = global.window;
+      // Other test files also replace the shared browser mock. Restore the
+      // location needed to verify that app_url prefers the browser origin.
+      global.window = {location: {hostname: 'whatever', origin: 'https://whatever'}};
     });
 
     afterEach(() => {
       clock.uninstall();
+      global.window = previousWindow;
     });
 
     beforeEach(() => {
@@ -107,10 +113,10 @@ describe('plugin-metrics', () => {
       webex.meetings = {
         config: {
           metrics: {
-            clientVersion: '43.0.105'
-          }
-        }
-      }
+            clientVersion: '43.0.105',
+          },
+        },
+      };
 
       sinon.spy(webex, 'request');
       sinon.spy(metrics, 'aliasUser');
@@ -186,6 +192,9 @@ describe('plugin-metrics', () => {
           },
           metricName: 'test',
           tags: {
+            app_name: 'appName',
+            app_url: 'https://whatever',
+            app_version: 'appVersion',
             appVersion: '43.0.105',
             browser: '',
             domain: 'whatever',