@webex/plugin-meetings 1.153.3 → 1.153.4

package/src/meeting/request.js

@@ -50,8 +50,9 @@ export default class MeetingRequest extends StatelessWebexPlugin {
   async joinMeeting(options) {
     const {
       asResourceOccupant,
-      sipUri,
+      inviteeAddress,
       meetingNumber,
+      permissionToken,
       deviceUrl,
       locusUrl,
       resourceId,
@@ -98,6 +99,10 @@ export default class MeetingRequest extends StatelessWebexPlugin {
       body.moderator = moderator;
     }
 
+    if (permissionToken) {
+      body.permissionToken = permissionToken;
+    }
+
     if (pin !== undefined) {
       body.pin = pin;
     }
@@ -105,16 +110,16 @@ export default class MeetingRequest extends StatelessWebexPlugin {
     if (locusUrl) {
       url = `${locusUrl}/${PARTICIPANT}`;
     }
-    else if (sipUri || meetingNumber) {
+    else if (inviteeAddress || meetingNumber) {
       try {
         await this.webex.internal.services.waitForCatalog('postauth');
         url = `${this.webex.internal.services.get('locus')}/${LOCI}/${CALL}`;
         body.invitee = {
-          address: sipUri || `wbxmn:${meetingNumber}`
+          address: inviteeAddress || `wbxmn:${meetingNumber}`
         };
       }
       catch (e) {
-        LoggerProxy.logger.error(`Meeting:request#joinMeeting ${sipUri ? 'sipUri' : 'meetingNumber'} --> ${e}`);
+        LoggerProxy.logger.error(`Meeting:request#joinMeeting Error Joining ${inviteeAddress || meetingNumber} --> ${e}`);
         throw (e);
       }
     }
@@ -123,7 +128,7 @@ export default class MeetingRequest extends StatelessWebexPlugin {
     // TODO: -- this will be resolved in SDK request
     url = url.concat(`?${ALTERNATE_REDIRECT_TRUE}`);
 
-    if (resourceId === sipUri) {
+    if (resourceId === inviteeAddress) {
       body.callPreferences = {
         requestedMedia: [_SLIDES_]
       };

package/src/meeting/util.js

@@ -90,12 +90,13 @@ MeetingUtil.joinMeeting = (meeting, options) => {
   // if Joining state termintate the request as user might click multiple times
   return meeting.meetingRequest
     .joinMeeting({
-      sipUri: meeting.sipUri,
+      inviteeAddress: meeting.meetingJoinUrl || meeting.sipUri,
       meetingNumber: meeting.meetingNumber,
       deviceUrl: meeting.deviceUrl,
       locusUrl: meeting.locusUrl,
       correlationId: meeting.correlationId,
       roapMessage: options.roapMessage,
+      permissionToken: meeting.permissionToken,
       resourceId: options.resourceId || null,
       moderator: options.moderator,
       pin: options.pin,

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

@@ -610,6 +610,17 @@ describe('plugin-meetings', () => {
         });
       });
       describe('#join', () => {
+        let sandbox = null;
+
+        beforeEach(() => {
+          sandbox = sinon.createSandbox();
+        });
+
+        afterEach(() => {
+          sandbox.restore();
+          sandbox = null;
+        });
+
         it('should have #join', () => {
           assert.exists(meeting.join);
         });
@@ -619,8 +630,9 @@ describe('plugin-meetings', () => {
         });
         describe('successful', () => {
           beforeEach(() => {
-            MeetingUtil.joinMeeting = sinon.stub().returns(Promise.resolve());
+            sandbox.stub(MeetingUtil, 'joinMeeting').returns(Promise.resolve());
           });
+
           it('should join the meeting and return promise', async () => {
             const join = meeting.join();
 
@@ -650,9 +662,10 @@ describe('plugin-meetings', () => {
         });
         describe('failure', () => {
           beforeEach(() => {
-            MeetingUtil.joinMeeting = sinon.stub().returns(Promise.reject());
+            sandbox.stub(MeetingUtil, 'joinMeeting').returns(Promise.reject());
             meeting.logger.log = sinon.stub().returns(true);
           });
+
           describe('guest join', () => {
             beforeEach(() => {
               MeetingUtil.isPinOrGuest = sinon.stub().returns(true);

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

@@ -19,10 +19,18 @@ describe('plugin-meetings', () => {
       regionCode: 'WEST-COAST'
     };
 
+    webex.internal = {
+      services: {
+        get: sinon.mock().returns('locusUrl'),
+        waitForCatalog: sinon.mock().returns(Promise.resolve({}))
+      }
+    };
+
     meetingsRequest = new MeetingRequest({}, {
       parent: webex
     });
 
+
     meetingsRequest.request = sinon.mock().returns(Promise.resolve({}));
   });
 
@@ -112,12 +120,15 @@ describe('plugin-meetings', () => {
         const deviceUrl = 'deviceUrl';
         const correlationId = 'random-uuid';
         const roapMessage = 'roap-message';
+        const permissionToken = 'permission-token';
 
         await meetingsRequest.joinMeeting({
           locusUrl,
           deviceUrl,
           correlationId,
-          roapMessage
+          roapMessage,
+          permissionToken
+
         });
         const requestParams = meetingsRequest.request.getCall(0).args[0];
 
@@ -125,8 +136,49 @@ describe('plugin-meetings', () => {
         assert.equal(requestParams.uri, `${locusUrl}/participant?alternateRedirect=true`);
         assert.equal(requestParams.body.device.url, deviceUrl);
         assert.equal(requestParams.body.device.countryCode, 'US');
+        assert.equal(requestParams.body.permissionToken, 'permission-token');
         assert.equal(requestParams.body.device.regionCode, 'WEST-COAST');
       });
+
+      it('sends /call with meetingNumber if inviteeAddress does not exist', async () => {
+        const deviceUrl = 'deviceUrl';
+        const correlationId = 'random-uuid';
+        const roapMessage = 'roap-message';
+        const meetingNumber = 'meetingNumber';
+
+        await meetingsRequest.joinMeeting({
+          deviceUrl,
+          correlationId,
+          roapMessage,
+          meetingNumber
+        });
+        const requestParams = meetingsRequest.request.getCall(0).args[0];
+
+        assert.equal(requestParams.method, 'POST');
+        assert.equal(requestParams.uri, 'locusUrl/loci/call?alternateRedirect=true');
+        assert.equal(requestParams.body.invitee.address, 'wbxmn:meetingNumber');
+      });
+
+      it('sends /call with inviteeAddress over meetingNumber as preference', async () => {
+        const deviceUrl = 'deviceUrl';
+        const correlationId = 'random-uuid';
+        const roapMessage = 'roap-message';
+        const meetingNumber = 'meetingNumber';
+        const inviteeAddress = 'sipUrl';
+
+        await meetingsRequest.joinMeeting({
+          deviceUrl,
+          correlationId,
+          roapMessage,
+          meetingNumber,
+          inviteeAddress
+        });
+        const requestParams = meetingsRequest.request.getCall(0).args[0];
+
+        assert.equal(requestParams.method, 'POST');
+        assert.equal(requestParams.uri, 'locusUrl/loci/call?alternateRedirect=true');
+        assert.equal(requestParams.body.invitee.address, 'sipUrl');
+      });
     });
 
     describe('#pstn', () => {

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

@@ -4,6 +4,7 @@ import MeetingUtil from '@webex/plugin-meetings/src/meeting/util';
 import LoggerProxy from '@webex/plugin-meetings/src/common/logs/logger-proxy';
 import LoggerConfig
   from '@webex/plugin-meetings/src/common/logs/logger-config';
+import Metrics from '@webex/plugin-meetings/src/metrics/index';
 
 describe('plugin-meetings', () => {
   describe('Meeting utils function', () => {
@@ -11,6 +12,7 @@ describe('plugin-meetings', () => {
     const meeting = {};
 
     beforeEach(() => {
+      Metrics.postEvent = sinon.stub();
       const logger = {
         info: sandbox.stub(),
         log: sandbox.stub(),
@@ -132,6 +134,45 @@ describe('plugin-meetings', () => {
         });
       });
     });
+
+    describe('joinMeeting', () => {
+      it('#Should call `meetingRequest.joinMeeting', async () => {
+        const meeting = {meetingJoinUrl: 'meetingJoinUrl', locusUrl: 'locusUrl', meetingRequest: {joinMeeting: sinon.stub().returns(Promise.resolve({body: {}, headers: {}}))}};
+
+        MeetingUtil.parseLocusJoin = sinon.stub();
+        await MeetingUtil.joinMeeting(meeting, {});
+
+        assert.calledOnce(meeting.meetingRequest.joinMeeting);
+        const parameter = meeting.meetingRequest.joinMeeting.getCall(0).args[0];
+
+        assert.equal(parameter.inviteeAddress, 'meetingJoinUrl');
+      });
+
+      it('#Should fallback sipUrl if meetingJoinUrl does not exists', async () => {
+        const meeting = {sipUri: 'sipUri', locusUrl: 'locusUrl', meetingRequest: {joinMeeting: sinon.stub().returns(Promise.resolve({body: {}, headers: {}}))}};
+
+        MeetingUtil.parseLocusJoin = sinon.stub();
+        await MeetingUtil.joinMeeting(meeting, {});
+
+        assert.calledOnce(meeting.meetingRequest.joinMeeting);
+        const parameter = meeting.meetingRequest.joinMeeting.getCall(0).args[0];
+
+        assert.equal(parameter.inviteeAddress, 'sipUri');
+      });
+
+      it('#Should fallback to meetingNumber if meetingJoinUrl/sipUrl  does not exists', async () => {
+        const meeting = {meetingNumber: 'meetingNumber', locusUrl: 'locusUrl', meetingRequest: {joinMeeting: sinon.stub().returns(Promise.resolve({body: {}, headers: {}}))}};
+
+        MeetingUtil.parseLocusJoin = sinon.stub();
+        await MeetingUtil.joinMeeting(meeting, {});
+
+        assert.calledOnce(meeting.meetingRequest.joinMeeting);
+        const parameter = meeting.meetingRequest.joinMeeting.getCall(0).args[0];
+
+        assert.isUndefined(parameter.inviteeAddress);
+        assert.equal(parameter.meetingNumber, 'meetingNumber');
+      });
+    });
   });
 });
 

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

@@ -468,7 +468,7 @@ skipInBrowser(describe)('plugin-meetings', () => {
         });
         describe('successful MeetingInfo.#fetchMeetingInfo', () => {
           beforeEach(() => {
-            webex.meetings.meetingInfo.fetchMeetingInfo = sinon.stub().returns(Promise.resolve(true));
+            webex.meetings.meetingInfo.fetchMeetingInfo = sinon.stub().returns(Promise.resolve({body: {permissionToken: 'PT', meetingJoinUrl: 'meetingJoinUrl'}}));
           });
           it('creates the meeting from a successful meeting info fetch promise testing', async () => {
             const meeting = webex.meetings.createMeeting('test', 'test');
@@ -482,6 +482,8 @@ skipInBrowser(describe)('plugin-meetings', () => {
             assert.calledWith(webex.meetings.meetingInfo.fetchMeetingInfo, 'test');
             assert.calledWith(MeetingsUtil.extractDestination, 'test', 'test');
             assert.calledWith(MeetingsUtil.getMeetingAddedType, 'test');
+            assert.equal(meeting.permissionToken, 'PT');
+            assert.equal(meeting.meetingJoinUrl, 'meetingJoinUrl');
           });
 
           it('creates the meeting from a successful meeting info fetch meeting resolve testing', async () => {