@webex/plugin-meetings 1.150.0 → 1.151.2

package/test/integration/spec/journey.js

@@ -164,6 +164,41 @@ skipInNode(describe)('plugin-meetings', () => {
         }));
     });
 
+    // Enabled when config.enableUnifiedMeetings = true
+    xdescribe('Conversation URL', () => {
+      describe('Successful 1:1 meeting', () => {
+        it('Fetch meeting information with a conversation URL for a 1:1 space', async () => {
+          assert.equal(Object.keys(bob.webex.meetings.getAllMeetings()), 0);
+          assert.equal(Object.keys(chris.webex.meetings.getAllMeetings()), 0);
+
+          const conversation = await chris.webex.internal.conversation.create({participants: [bob]});
+
+          await chris.webex.internal.conversation.post(conversation, {displayName: 'hello world how are you '});
+
+          await Promise.all([
+            testUtils.delayedPromise(chris.webex.meetings.create(conversation.url, 'CONVERSATION_URL')),
+            testUtils.waitForEvents([{scope: chris.webex.meetings, event: 'meeting:added', user: chris}])
+          ])
+            .then(function chrisJoinsMeeting() {
+              return Promise.all([
+                testUtils.delayedPromise(chris.meeting.join()),
+                testUtils.waitForEvents([{scope: bob.webex.meetings, event: 'meeting:added', user: bob},
+                  {scope: chris.meeting, event: 'meeting:stateChange', user: chris}])
+                  .then((response) => {
+                    assert.equal(response[0].result.payload.currentState, 'ACTIVE');
+                  })
+              ]);
+            });
+        });
+
+        it('Fetch meeting information with invalid conversation URL and throws error', () => {
+          chris.webex.meetings.meetingInfo.fetchMeetingInfo('http://some-invalid.com', 'CONVERSATION_URL').then((response) => {
+            assert(response.result === '404');
+          });
+        });
+      });
+    });
+
     describe('Successful 1:1 meeting (including Guest)', function () {
       before(() => {
         // Workaround since getDisplayMedia requires a user gesture to be activated, and this is a integration tests
@@ -484,7 +519,10 @@ skipInNode(describe)('plugin-meetings', () => {
           .then((response) => {
             assert.equal(response[0].result.memberId, alice.meeting.selfId);
           }),
-        testUtils.waitForEvents([{scope: bob.meeting.members, event: 'members:update'}]),
+        testUtils.waitForEvents([{scope: bob.meeting.members, event: 'members:update'}])
+          .then((response) => {
+            console.log('SCREEN SHARE RESPONSE ', JSON.stringify(response, testUtils.getCircularReplacer()));
+          }),
         testUtils.waitForEvents([{scope: alice.meeting, event: 'media:ready'}])
           .then((response) => {
             console.log('MEDIA:READY event ', response[0].result);
@@ -514,7 +552,7 @@ skipInNode(describe)('plugin-meetings', () => {
           }),
         testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update'}])
           .then((response) => {
-            console.log('SCREEN SHARE RESPONSE ', JSON.stringify(response));
+            console.log('SCREEN SHARE RESPONSE ', JSON.stringify(response, testUtils.getCircularReplacer()));
           }),
         testUtils.waitForEvents([{scope: bob.meeting, event: 'media:ready'}])
           .then((response) => {
@@ -566,7 +604,7 @@ skipInNode(describe)('plugin-meetings', () => {
           }),
         testUtils.waitForEvents([{scope: bob.meeting.members, event: 'members:update'}])
           .then((response) => {
-            console.log('WHITEBOARD SHARE RESPONSE ', JSON.stringify(response));
+            console.log('WHITEBOARD SHARE RESPONSE ', JSON.stringify(response, testUtils.getCircularReplacer()));
           })
       ])
         .then(() => {
@@ -589,7 +627,7 @@ skipInNode(describe)('plugin-meetings', () => {
           }),
         testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update'}])
           .then((response) => {
-            console.log('WHITEBOARD SHARE RESPONSE ', JSON.stringify(response));
+            console.log('WHITEBOARD SHARE RESPONSE ', JSON.stringify(response, testUtils.getCircularReplacer()));
           })
       ])
         .then(() => {
@@ -625,7 +663,7 @@ skipInNode(describe)('plugin-meetings', () => {
           }),
         testUtils.waitForEvents([{scope: bob.meeting.members, event: 'members:update'}])
           .then((response) => {
-            console.log('WHITEBOARD SHARE RESPONSE ', JSON.stringify(response));
+            console.log('WHITEBOARD SHARE RESPONSE ', JSON.stringify(response, testUtils.getCircularReplacer()));
           })
       ])
         .then(() => {
@@ -644,7 +682,7 @@ skipInNode(describe)('plugin-meetings', () => {
           }),
         testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update'}])
           .then((response) => {
-            console.log('SCREEN SHARE RESPONSE ', JSON.stringify(response));
+            console.log('SCREEN SHARE RESPONSE ', JSON.stringify(response, testUtils.getCircularReplacer()));
           }),
         testUtils.waitForEvents([{scope: bob.meeting, event: 'media:ready'}])
           .then((response) => {
@@ -680,7 +718,7 @@ skipInNode(describe)('plugin-meetings', () => {
           }),
         testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update'}])
           .then((response) => {
-            console.log('WHITEBOARD SHARE RESPONSE ', JSON.stringify(response));
+            console.log('WHITEBOARD SHARE RESPONSE ', JSON.stringify(response, testUtils.getCircularReplacer()));
           })
       ])
         .then(() => {

package/test/integration/spec/space-meeting.js

@@ -1,6 +1,8 @@
 
 import {assert} from '@webex/test-helper-chai';
 import {skipInNode, jenkinsOnly} from '@webex/test-helper-mocha';
+import {patterns} from '@webex/common';
+import MeetingInfoUtil from '@webex/plugin-meetings/src/meeting-info/utilv2';
 
 import CMR from '../../utils/cmr';
 import testUtils from '../../utils/testUtils';
@@ -63,18 +65,40 @@ skipInNode(describe)('plugin-meetings', () => {
           testUtils.delayedPromise(alice.meeting.join()),
           testUtils.waitForEvents([
             {scope: bob.webex.meetings, event: 'meeting:added', user: bob},
-            {scope: chris.webex.meetings, event: 'meeting:added', user: chris}])
-        ])));
+            {scope: chris.webex.meetings, event: 'meeting:added', user: chris}
+          ])
+        ]).then(() => {
+          // TODO Renenable after unified flag is enabled
+          // const {meetingNumber} = bob.meeting.meetingInfo;
+
+          // assert(meetingNumber === alice.meeting.meetingNumber, 'meetingNumber matches alice meeting number');
+        })));
+
+    xit('Should fetch user info using user hydra id with the new api', () => alice.webex.rooms.create({title: 'sample'})
+      .then((room) => MeetingInfoUtil.getDestinationType({
+        destination: room.creatorId,
+        webex: alice.webex
+      }))
+      .then((destinationType) => MeetingInfoUtil.getRequestBody(destinationType))
+      .then((res) => {
+        assert.exists(res.sipUrl, 'sipURL didnt exist');
+        assert.match(res.sipUrl, patterns.email); // assert sipURL is email
+      }));
 
     // Enable this test when we are going to enable the unified space meeeting .
     // We cannot change the config on load as the meetingInfo function loads dynamically
-    xit('Should fetch meeting Info using the new api', async () => {
-      alice.webex.meetings.config.experimental.enableUnifiedMeetings = true;
+    xit('Should fetch meeting info using space url with the new api', async () => {
       const res = await alice.webex.meetings.meetingInfo.fetchMeetingInfo(space.url, 'CONVERSATION_URL');
 
-      assert.exists(res.meetingNumber);
+      assert.exists(res.body.meetingNumber);
+    });
+
+    xit('Bob fetches meeting info with SIP URI before joining', async () => {
+      const {sipUri} = alice.meeting;
+      const res = await bob.webex.meetings.meetingInfo.fetchMeetingInfo(sipUri, 'SIP_URI');
+      const {meetingNumber} = res.body;
 
-      alice.webex.meetings.config.experimental.enableUnifiedMeetings = false;
+      assert(meetingNumber === alice.meeting.meetingNumber, 'meetingNumber matches alice meeting number');
     });
 
     it('Bob and chris joins space meeting', () => testUtils.waitForStateChange(alice.meeting, 'JOINED')

package/test/unit/spec/meeting/index.js

@@ -110,7 +110,6 @@ describe('plugin-meetings', () => {
 
 
     TriggerProxy.trigger = sinon.stub().returns(true);
-    Metrics.initPayload = sinon.stub();
     Metrics.postEvent = sinon.stub();
     Metrics.initialSetup(null, webex);
     MediaUtil.createPeerConnection = sinon.stub().returns({});

package/test/unit/spec/meeting-info/utilv2.js

@@ -79,6 +79,7 @@ describe('plugin-meetings', () => {
 
         assert.equal(res.orgId, '');
         assert.equal(res.userId, 'userId_1234');
+        assert.isTrue(res.supportHostKey);
       });
 
       it('for _MEETING_ID_', () => {

package/test/unit/spec/metrics/index.js

@@ -24,6 +24,14 @@ const {
 browserOnly(describe)('Meeting metrics', () => {
   let webex, mockSubmitMetric, sandbox;
 
+  const geoHintInfo = {
+    clientAddress: '2001:0db8:0000:08d3:0000:0000:0070:0000',
+    clientRegion: 'US-WEST',
+    countryCode: 'US',
+    regionCode: 'US-WEST',
+    timezone: 'America/Los_Angeles'
+  };
+
   beforeEach(() => {
     sandbox = sinon.createSandbox();
     mockSubmitMetric = sandbox.stub();
@@ -40,7 +48,6 @@ browserOnly(describe)('Meeting metrics', () => {
         clientId: 'mock-client-id'
       }
     };
-
     webex.internal.metrics.submitClientMetrics = mockSubmitMetric;
     metrics.initialSetup({}, webex);
   });
@@ -49,6 +56,40 @@ browserOnly(describe)('Meeting metrics', () => {
     sandbox.restore();
   });
 
+  describe('initPayload / initMediaPayload', () => {
+    it('should create payload with masked IPv4', () => {
+      geoHintInfo.clientAddress = '128.0.0.1';
+      webex.meetings = {
+        geoHintInfo
+      };
+      metrics.initialSetup({}, webex);
+      const payload = metrics.initPayload('myMetric', {}, {clientType: 'TEAMS_CLIENT'});
+
+      assert(payload.origin.clientInfo.localNetworkPrefix === '128.0.0.0');
+      assert(payload.event.name === 'myMetric');
+
+      const payload2 = metrics.initMediaPayload('myMetric', {}, {clientType: 'TEAMS_CLIENT'});
+
+      assert(payload2.origin.clientInfo.localNetworkPrefix === '128.0.0.0');
+    });
+
+    it('should create payload with masked IPv6', () => {
+      geoHintInfo.clientAddress = '2001:0db8:0000:08d3:0000:0000:0070:0000';
+      webex.meetings = {
+        geoHintInfo
+      };
+      metrics.initialSetup({}, webex);
+      const payload = metrics.initPayload('myIPv6Metric', {}, {clientType: 'TEAMS_CLIENT'});
+
+      assert(payload.origin.clientInfo.localNetworkPrefix === '2001:d00::');
+      assert(payload.event.name === 'myIPv6Metric');
+
+      const payload2 = metrics.initMediaPayload('myIPv6Metric', {}, {clientType: 'TEAMS_CLIENT'});
+
+      assert(payload2.origin.clientInfo.localNetworkPrefix === '2001:d00::');
+    });
+  });
+
   describe('#sendOperationalMetric', () => {
     it('sends client metric via Metrics plugin', () => {
       metrics.sendOperationalMetric('myMetric');

package/test/utils/testUtils.js

@@ -236,6 +236,22 @@ const waitUntil = (waitTime) => new Promise((resolve) => {
 
 const flushPromises = () => new Promise(setImmediate);
 
+const getCircularReplacer = () => {
+  const seen = new WeakSet();
+
+  return (_, value) => {
+    if (typeof value === 'object' && value !== null) {
+      if (seen.has(value)) {
+        return;
+      }
+      seen.add(value);
+    }
+
+    // eslint-disable-next-line consistent-return
+    return value;
+  };
+};
+
 export default {
   waitForSpy,
   waitForStateChange,
@@ -246,6 +262,7 @@ export default {
   addMedia,
   waitUntil,
   delayedTest,
-  flushPromises
+  flushPromises,
+  getCircularReplacer
 };
 

package/test/utils/webex-test-users.js

@@ -12,6 +12,8 @@ require('@webex/internal-plugin-user');
 require('@webex/internal-plugin-device');
 require('@webex/internal-plugin-conversation');
 require('@webex/internal-plugin-support');
+require('@webex/plugin-people');
+require('@webex/plugin-rooms');
 require('@webex/plugin-meetings');
 
 const generateTestUsers = (options) => testUser.create({count: options.count})