@webex/plugin-meetings 3.0.0-beta.115 → 3.0.0-beta.117

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

@@ -3,9 +3,13 @@ import {assert} from '@webex/test-helper-chai';
 import MockWebex from '@webex/test-helper-mock-webex';
 import Meetings from '@webex/plugin-meetings';
 import MeetingRequest from '@webex/plugin-meetings/src/meeting/request';
+import uuid from 'uuid';
+import { merge } from 'lodash';
+
 
 describe('plugin-meetings', () => {
   let meetingsRequest;
+  let locusDeltaRequestSpy;
 
   beforeEach(() => {
     const webex = new MockWebex({
@@ -28,34 +32,66 @@ describe('plugin-meetings', () => {
 
     webex.boundedStorage.get = sinon.mock().returns(Promise.resolve(JSON.stringify({anycastEntryPoint: "aws-eu-west-1"})))
 
+    const request = sinon.mock().returns(Promise.resolve({}));
+
     meetingsRequest = new MeetingRequest(
-      {},
+      {
+        meeting: {
+          request,
+          locusInfo: {
+            sequence: {}
+          }
+        }
+      },
       {
         parent: webex,
       }
     );
 
-    meetingsRequest.request = sinon.mock().returns(Promise.resolve({}));
+    meetingsRequest.request = request;
+    locusDeltaRequestSpy = sinon.spy(meetingsRequest, 'locusDeltaRequest');
   });
 
+  const checkRequest = (expectedParams) => {
+    assert.calledOnceWithExactly(locusDeltaRequestSpy, expectedParams);
+    assert.calledOnceWithExactly(meetingsRequest.request, merge(expectedParams, {body: {sequence: {}}}));
+  }
+
   describe('meeting request library', () => {
+
+    beforeEach(() => {
+      sinon.stub(uuid, 'v4').returns('12345');
+    });
+
+    afterEach(() => {
+      uuid.v4.restore();
+    });
+
     describe('#sendDTMF', () => {
       it('sends a POST to the sendDtmf locus endpoint', async () => {
         const locusUrl = 'locusURL';
         const deviceUrl = 'deviceUrl';
         const tones = '1234';
 
+
+
         await meetingsRequest.sendDTMF({
           locusUrl,
           deviceUrl,
           tones,
         });
-        const requestParams = meetingsRequest.request.getCall(0).args[0];
 
-        assert.equal(requestParams.method, 'POST');
-        assert.equal(requestParams.uri, `${locusUrl}/sendDtmf`);
-        assert.equal(requestParams.body.dtmf.tones, tones);
-        assert.equal(requestParams.body.deviceUrl, deviceUrl);
+        checkRequest({
+          method: 'POST',
+          uri: `${locusUrl}/sendDtmf`,
+          body: {
+            deviceUrl: 'deviceUrl',
+            dtmf: {
+              correlationId: '12345',
+              tones: '1234',
+            },
+          },
+        });
       });
     });
 
@@ -72,14 +108,19 @@ describe('plugin-meetings', () => {
           main: {width: 640, height: 480},
           content: {width: 1280, height: 720},
         });
-        const requestParams = meetingsRequest.request.getCall(0).args[0];
 
-        assert.equal(requestParams.method, 'PUT');
-        assert.equal(requestParams.uri, `${locusUrl}/controls`);
-        assert.equal(requestParams.body.layout.type, layoutType);
-        assert.equal(requestParams.body.layout.deviceUrl, deviceUrl);
-        assert.deepEqual(requestParams.body.layout.layoutParams, {
-          renderInfo: {main: {width: 640, height: 480}, content: {width: 1280, height: 720}},
+        checkRequest({
+          method: 'PUT',
+          uri: `${locusUrl}/controls`,
+          body: {
+            layout: {
+              deviceUrl,
+              type: layoutType,
+              layoutParams: {
+                renderInfo: {main: {width: 640, height: 480}, content: {width: 1280, height: 720}},
+              },
+            },
+          },
         });
       });
 
@@ -283,14 +324,20 @@ describe('plugin-meetings', () => {
           correlationId,
           dialInUrl,
         });
-        const requestParams = meetingsRequest.request.getCall(0).args[0];
 
-        assert.equal(requestParams.method, 'POST');
-        assert.equal(requestParams.uri, `${locusUrl}/participant`);
-        assert.equal(requestParams.body.device.url, dialInUrl);
-        assert.equal(requestParams.body.device.deviceType, 'PROVISIONAL');
-        assert.equal(requestParams.body.device.provisionalType, 'DIAL_IN');
-        assert.equal(requestParams.body.device.clientUrl, 'clientUrl');
+        checkRequest({
+          method: 'POST',
+          uri: `${locusUrl}/participant`,
+          body: {
+            device: {
+              url: dialInUrl,
+              deviceType: 'PROVISIONAL',
+              provisionalType: 'DIAL_IN',
+              clientUrl,
+            },
+            correlationId
+          }
+        });
       });
 
       it('sends dial out pstn request', async () => {
@@ -307,15 +354,22 @@ describe('plugin-meetings', () => {
           dialOutUrl,
           phoneNumber,
         });
-        const requestParams = meetingsRequest.request.getCall(0).args[0];
 
-        assert.equal(requestParams.method, 'POST');
-        assert.equal(requestParams.uri, `${locusUrl}/participant`);
-        assert.equal(requestParams.body.device.url, dialOutUrl);
-        assert.equal(requestParams.body.device.deviceType, 'PROVISIONAL');
-        assert.equal(requestParams.body.device.provisionalType, 'DIAL_OUT');
-        assert.equal(requestParams.body.device.clientUrl, 'clientUrl');
-        assert.equal(requestParams.body.device.dialoutAddress, phoneNumber);
+        checkRequest({
+          method: 'POST',
+          uri: `${locusUrl}/participant`,
+          body: {
+            device: {
+              url: dialOutUrl,
+              deviceType: 'PROVISIONAL',
+              provisionalType: 'DIAL_OUT',
+              clientUrl,
+              dialoutAddress: phoneNumber,
+            },
+            correlationId,
+          },
+        });
+
       });
 
       it('sends disconnect phone audio request', async () => {
@@ -330,15 +384,96 @@ describe('plugin-meetings', () => {
           correlationId,
           phoneUrl,
         });
-        const requestParams = meetingsRequest.request.getCall(0).args[0];
 
-        assert.equal(requestParams.method, 'PUT');
-        assert.equal(requestParams.uri, `${locusUrl}/participant/${selfId}/leave`);
-        assert.equal(requestParams.body.device.url, phoneUrl);
-        assert.equal(requestParams.body.device.deviceType, 'PROVISIONAL');
+        checkRequest({
+          method: 'PUT',
+          uri: `${locusUrl}/participant/${selfId}/leave`,
+          body: {
+            device: {
+              url: phoneUrl,
+              deviceType: 'PROVISIONAL'
+            },
+            correlationId
+          }
+        });
       });
     });
 
+    describe('#leaveMeeting', () => {
+      it('sends the request to leave the meeting', async () => {
+        const locusUrl = 'locusUrl';
+        const selfId = 'selfId';
+        const correlationId = 'random-uuid';
+        const resourceId = 'resourceId';
+        const deviceUrl = 'deviceUrl';
+
+        meetingsRequest.config.meetings.deviceType = 'deviceType';
+
+        await meetingsRequest.leaveMeeting({
+          locusUrl,
+          selfId,
+          deviceUrl,
+          resourceId,
+          correlationId,
+        });
+
+        checkRequest({
+          method: 'PUT',
+          uri: 'locusUrl/participant/selfId/leave',
+          body: {
+            device: {deviceType: 'deviceType', url: 'deviceUrl'},
+            usingResource: 'resourceId',
+            correlationId: 'random-uuid',
+          },
+        });
+      });
+    });
+
+    describe('#acknowledgeMeeting', () => {
+      it('sends the request to acknowledge the meeting', async () => {
+        const locusUrl = 'locusUrl';
+        const correlationId = 'random-uuid';
+        const deviceUrl = 'deviceUrl';
+
+        meetingsRequest.config.meetings.deviceType = 'deviceType';
+
+        await meetingsRequest.acknowledgeMeeting({
+          locusUrl,
+          deviceUrl,
+          correlationId,
+        });
+
+        checkRequest({
+          method: 'PUT',
+          uri: 'locusUrl/participant/alert',
+          body: {
+            device: {deviceType: 'deviceType', url: 'deviceUrl'},
+            correlationId: 'random-uuid',
+          },
+        });
+      });
+    });
+
+    describe('#lockMeeting', () => {
+      it('sends request to lock the meeting', async () => {
+        const locusUrl = 'locusURL';
+
+        await meetingsRequest.lockMeeting({
+          locusUrl,
+          lock: true,
+        });
+
+        checkRequest({
+          method: 'PATCH',
+          uri: `${locusUrl}/controls`,
+          body: {
+            lock: {locked: true}
+          }
+        });
+      });
+    });
+
+
     describe('#endMeetingForAll', () => {
       it('sends request to endMeetingForAll', async () => {
         const locusUrl = 'locusURL';
@@ -346,10 +481,11 @@ describe('plugin-meetings', () => {
         await meetingsRequest.endMeetingForAll({
           locusUrl,
         });
-        const requestParams = meetingsRequest.request.getCall(0).args[0];
 
-        assert.equal(requestParams.method, 'POST');
-        assert.equal(requestParams.uri, `${locusUrl}/end`);
+        checkRequest({
+          method: 'POST',
+          uri: `${locusUrl}/end`,
+        });
       });
     });
 
@@ -402,16 +538,52 @@ describe('plugin-meetings', () => {
           locusUrl,
           requestingParticipantId,
         });
-        const requestParams = meetingsRequest.request.getCall(0).args[0];
 
-        assert.equal(requestParams.method, 'PUT');
-        assert.equal(requestParams.uri, `${locusUrl}/controls`);
-        assert.equal(requestParams.body.reactions.enabled, true);
-        assert.equal(requestParams.body.requestingParticipantId, requestingParticipantId);
+        checkRequest({
+          method: 'PUT',
+          uri: `${locusUrl}/controls`,
+          body: {
+            reactions: {
+              enabled: true,
+            },
+            requestingParticipantId,
+          },
+        });
       });
     });
   });
 
+  describe('#declineMeeting', () => {
+
+    it('sends a request to decline the meeting', async () => {
+      const reason = 'reason';
+      const deviceUrl = 'deviceUrl';
+      const locusUrl = 'locusUrl';
+      meetingsRequest.config.meetings.deviceType = 'deviceType';
+  
+      await meetingsRequest.declineMeeting({
+        locusUrl,
+        deviceUrl,
+        reason
+      });
+  
+      const expectedBody = {
+        device: {
+          deviceType: 'deviceType',
+          url: deviceUrl,
+        },
+        reason,
+      };
+  
+      checkRequest({
+        method: 'PUT',
+        uri: `${locusUrl}/participant/decline`,
+        body: expectedBody,
+      });
+    });
+
+  });
+
   describe('#getLocusStatusByUrl', () => {
     it('check locus status', async () => {
       const locusUrl = 'locusUrl';
@@ -423,6 +595,7 @@ describe('plugin-meetings', () => {
       })
     });
   });
+
   describe('#changeMeetingFloor', () => {
 
     it('change meeting floor', async () => {

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

@@ -133,11 +133,152 @@ describe('plugin-meetings', () => {
       });
     });
 
+    describe('addSequence', () => {
+      it('should add the sequence object to a request body', () => {
+        const body = {};
+
+        MeetingUtil.addSequence({
+          locusInfo: {
+            sequence: 'sequence'
+          }
+        }, body);
+
+        assert.deepEqual(body, {
+          sequence: 'sequence'
+        });
+      });
+
+      it('should work with an undefined meeting', () => {
+        const body = {};
+
+        MeetingUtil.addSequence(
+          undefined,
+          body
+        );
+
+        assert.deepEqual(body, {});
+      });
+ 
+      it('should work with an undefined locusInfo', () => {
+        const body = {};
+
+        MeetingUtil.addSequence({}, body);
+
+        assert.deepEqual(body, {});
+      });
+
+      it('should work with an undefined sequence', () => {
+        const body = {};
+
+        MeetingUtil.addSequence({locusInfo: {}}, body);
+
+        assert.deepEqual(body, {});
+      });
+    });
+
+    describe('updateLocusWithDelta', () => {
+      it('should call onDeltaLocus with the new delta locus', () => {
+        const meeting = {
+          locusInfo: {
+            onDeltaLocus: sinon.stub(),
+          }
+        }
+
+        const originalResponse = {
+          body: {
+            locus: 'locus'
+          }
+        };
+
+        const response = MeetingUtil.updateLocusWithDelta(meeting, originalResponse);
+
+        assert.deepEqual(response, originalResponse);
+        assert.calledOnceWithExactly(meeting.locusInfo.onDeltaLocus, 'locus');
+      });
+
+      it('should handle locus being missing from the response', () => {
+        const meeting = {
+          locusInfo: {
+            onDeltaLocus: sinon.stub(),
+          },
+        };
+
+        const originalResponse = {
+          body: {},
+        };
+
+        const response = MeetingUtil.updateLocusWithDelta(meeting, originalResponse);
+
+        assert.deepEqual(response, originalResponse);
+        assert.notCalled(meeting.locusInfo.onDeltaLocus);
+      });
+
+      it('should work with an undefined meeting', () => {
+        const originalResponse = {
+          body: {
+            locus: 'locus',
+          },
+        };
+
+        const response = MeetingUtil.updateLocusWithDelta(undefined, originalResponse);
+        assert.deepEqual(response, originalResponse);
+      });
+    });
+
+    describe('generateLocusDeltaRequest', () => {
+
+      afterEach(() => {
+        WeakRef.prototype.deref.restore();
+      });
+
+      it('generates the correct wrapper function', async () => {
+        const updateLocusWithDeltaSpy = sinon.spy(MeetingUtil, 'updateLocusWithDelta');
+        const addSequenceSpy = sinon.spy(MeetingUtil, 'addSequence');
+
+        const meeting = {
+          request: sinon.stub().returns(Promise.resolve('result')),
+        }
+
+        const locusDeltaRequest = MeetingUtil.generateLocusDeltaRequest(meeting);
+
+        const options = {
+          some: 'option',
+          body: {}
+        };
+
+        let result = await locusDeltaRequest(options);
+
+        assert.equal(result, 'result');
+        assert.calledOnceWithExactly(updateLocusWithDeltaSpy, meeting, 'result');
+        assert.calledOnceWithExactly(addSequenceSpy, meeting, options.body);
+
+        updateLocusWithDeltaSpy.resetHistory();
+        addSequenceSpy.resetHistory();
+
+        // body missing from options
+        result = await locusDeltaRequest({});
+        assert.equal(result, 'result');
+        assert.calledOnceWithExactly(updateLocusWithDeltaSpy, meeting, 'result');
+        assert.calledOnceWithExactly(addSequenceSpy, meeting, options.body);
+
+        // meeting disappears so the WeakRef returns undefined
+        sinon.stub(WeakRef.prototype, 'deref').returns(undefined);
+
+        result = await locusDeltaRequest(options);
+        assert.equal(result, undefined);
+
+      });
+
+    });
+
     describe('remoteUpdateAudioVideo', () => {
       it('#Should call meetingRequest.locusMediaRequest with correct parameters', async () => {
         const meeting = {
           mediaId: '12345',
           selfUrl: 'self url',
+          locusInfo: {
+            sequence: {},
+          },
           locusMediaRequest: {
             send: sinon.stub().resolves({body: {}, headers: {}}),
           },
@@ -145,13 +286,16 @@ describe('plugin-meetings', () => {
 
         await MeetingUtil.remoteUpdateAudioVideo(meeting, true, false);
 
-        assert.calledOnce(meeting.locusMediaRequest.send);
-        const parameter = meeting.locusMediaRequest.send.getCall(0).args[0];
-
-        assert.equal(parameter.type, 'LocalMute');
-        assert.equal(parameter.selfUrl, 'self url');
-        assert.equal(parameter.mediaId, '12345');
-        assert.deepEqual(parameter.muteOptions, {audioMuted: true, videoMuted :false});
+        assert.calledOnceWithExactly(meeting.locusMediaRequest.send, {
+          mediaId: '12345',
+          muteOptions: {
+            audioMuted: true,
+            videoMuted: false,
+          },
+          selfUrl: 'self url',
+          sequence: {},
+          type: 'LocalMute',
+        });
       });
     });
 

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

@@ -14,6 +14,7 @@ import ParameterError from '@webex/plugin-meetings/src/common/errors/parameter';
 import Meetings from '@webex/plugin-meetings';
 import Members from '@webex/plugin-meetings/src/members';
 import MembersUtil from '@webex/plugin-meetings/src/members/util';
+import * as MembersRequestImport from '@webex/plugin-meetings/src/members/request';
 import Trigger from '@webex/plugin-meetings/src/common/events/trigger-proxy';
 import {EVENT_TRIGGERS} from '@webex/plugin-meetings/src/constants';
 
@@ -81,6 +82,8 @@ describe('plugin-meetings', () => {
   describe('members', () => {
     const sandbox = sinon.createSandbox();
     let createMembers;
+    let meeting;
+    let membersRequestSpy;
 
     beforeEach(() => {
       webex = new MockWebex({
@@ -106,13 +109,31 @@ describe('plugin-meetings', () => {
 
       url1 = `https://example.com/${uuid.v4()}`;
 
-      createMembers = (options) => new Members({locusUrl: options.url}, {parent: webex});
+      membersRequestSpy = sinon.spy(MembersRequestImport, 'default');
+
+      meeting = {
+        request: sinon.mock().returns(Promise.resolve()),
+        locusInfo: {
+          sequence: {}
+        }
+      }
+
+      createMembers = (options) => new Members({locusUrl: options.url, meeting}, {parent: webex});
     });
 
     afterEach(() => {
+      membersRequestSpy.restore();
       sandbox.restore();
     });
 
+    describe('constructor', () => {
+      it('passes the meeting to the MembersRequest', () => {
+        createMembers({});
+
+        assert.calledOnceWithExactly(membersRequestSpy, {meeting}, {parent: webex});
+      });
+    });
+
     describe('#addMembers', () => {
       it('should invoke isInvalidInvitee and generateAddMemberOptions from MembersUtil when addMember is called with valid params', async () => {
         sandbox.spy(MembersUtil, 'isInvalidInvitee');