@webex/plugin-meetings 3.12.0-next.86 → 3.12.0-next.88

package/package.json

@@ -44,7 +44,7 @@
     "@webex/event-dictionary-ts": "^1.0.2181",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/plugin-rooms": "3.12.0-next.28",
+    "@webex/plugin-rooms": "3.12.0-next.29",
     "@webex/test-helper-chai": "3.12.0-next.5",
     "@webex/test-helper-mocha": "3.12.0-next.5",
     "@webex/test-helper-mock-webex": "3.12.0-next.5",
@@ -63,20 +63,20 @@
   "dependencies": {
     "@webex/common": "3.12.0-next.5",
     "@webex/internal-media-core": "2.26.1",
-    "@webex/internal-plugin-conversation": "3.12.0-next.28",
-    "@webex/internal-plugin-device": "3.12.0-next.26",
-    "@webex/internal-plugin-llm": "3.12.0-next.30",
-    "@webex/internal-plugin-mercury": "3.12.0-next.27",
-    "@webex/internal-plugin-metrics": "3.12.0-next.26",
-    "@webex/internal-plugin-support": "3.12.0-next.28",
-    "@webex/internal-plugin-user": "3.12.0-next.27",
-    "@webex/internal-plugin-voicea": "3.12.0-next.30",
+    "@webex/internal-plugin-conversation": "3.12.0-next.29",
+    "@webex/internal-plugin-device": "3.12.0-next.27",
+    "@webex/internal-plugin-llm": "3.12.0-next.31",
+    "@webex/internal-plugin-mercury": "3.12.0-next.28",
+    "@webex/internal-plugin-metrics": "3.12.0-next.27",
+    "@webex/internal-plugin-support": "3.12.0-next.29",
+    "@webex/internal-plugin-user": "3.12.0-next.28",
+    "@webex/internal-plugin-voicea": "3.12.0-next.31",
     "@webex/media-helpers": "3.12.0-next.9",
-    "@webex/plugin-people": "3.12.0-next.27",
-    "@webex/plugin-rooms": "3.12.0-next.28",
+    "@webex/plugin-people": "3.12.0-next.28",
+    "@webex/plugin-rooms": "3.12.0-next.29",
     "@webex/ts-sdp": "^1.8.1",
     "@webex/web-capabilities": "^1.10.0",
-    "@webex/webex-core": "3.12.0-next.26",
+    "@webex/webex-core": "3.12.0-next.27",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",
@@ -94,5 +94,5 @@
   "//": [
     "TODO: upgrade jwt-decode when moving to node 18"
   ],
-  "version": "3.12.0-next.86"
+  "version": "3.12.0-next.88"
 }

package/src/meeting/index.ts

@@ -4202,7 +4202,12 @@ export default class Meeting extends StatelessWebexPlugin {
   }
 
   /**
-   * Transfer the moderator role to another eligible member
+   * Transfer the moderator role to another eligible member.
+   *
+   * If the target member is currently joined in the current session, the request is
+   * sent against the current locus. Otherwise, we search the breakout sessions and,
+   * when the member is found in one, we send the request against that breakout
+   * session's locus url instead.
    * @param {String} memberId
    * @param {Boolean} moderator
    * @returns {Promise} see #members.transferHostToMember
@@ -4210,7 +4215,21 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    */
   public transfer(memberId: string, moderator = true) {
-    return this.members.transferHostToMember(memberId, moderator);
+    const targetMember = this.members.membersCollection.get(memberId);
+
+    if (targetMember?.isInMeeting) {
+      return this.members.transferHostToMember(memberId, moderator);
+    }
+
+    const breakout = this.breakouts?.breakouts?.models?.find((bo: any) => {
+      const breakoutMember = bo.members?.membersCollection?.get(memberId);
+
+      return breakoutMember?.isInMeeting;
+    });
+
+    const breakoutLocusUrl = breakout?.breakoutRosterLocus?.url;
+
+    return this.members.transferHostToMember(memberId, moderator, breakoutLocusUrl);
   }
 
   /**
@@ -9168,7 +9187,6 @@ export default class Meeting extends StatelessWebexPlugin {
         options: {meetingId: this.id},
       });
     LoggerProxy.logger.log('Meeting:index#leave --> Leaving a meeting');
-
     this.stopListeningForMeetingEvents();
 
     return MeetingUtil.leaveMeeting(this, options)

package/src/meeting/util.ts

@@ -920,9 +920,20 @@ const MeetingUtil = {
 
       const options = buildLocusDeltaRequestOptions(originalOptions);
 
-      return meeting
-        .request(options)
-        .then((response) => MeetingUtil.updateLocusFromApiResponse(meeting, response));
+      return meeting.request(options).then((response) => {
+        const requestUri = options?.uri;
+        const meetingLocusUrl = meeting.locusUrl;
+
+        if (!requestUri || !meetingLocusUrl || !requestUri.startsWith(meetingLocusUrl)) {
+          LoggerProxy.logger.info(
+            `Meeting:util#generateLocusDeltaRequest --> skipping updateLocusFromApiResponse, request uri "${requestUri}" does not match meeting locusUrl "${meetingLocusUrl}"`
+          );
+
+          return response;
+        }
+
+        return MeetingUtil.updateLocusFromApiResponse(meeting, response);
+      });
     };
 
     return locusDeltaRequest;

package/src/members/index.ts

@@ -1136,12 +1136,16 @@ export default class Members extends StatelessWebexPlugin {
    * Transfers the host to another member
    * @param {String} memberId
    * @param {boolean} [moderator] default true
+   * @param {String} [breakoutLocusUrl] when provided, the request is sent against this locus url
+   * (i.e. the breakout session's locus) instead of the main session's locus url
    * @returns {Promise}
    * @public
    * @memberof Members
    */
-  public transferHostToMember(memberId: string, moderator = true) {
-    if (!this.locusUrl) {
+  public transferHostToMember(memberId: string, moderator = true, breakoutLocusUrl = '') {
+    const locusUrl = breakoutLocusUrl || this.locusUrl;
+
+    if (!locusUrl) {
       return Promise.reject(
         new ParameterError(
           'The associated locus url for this meetings members object must be defined.'
@@ -1153,11 +1157,14 @@ export default class Members extends StatelessWebexPlugin {
         new ParameterError('The member id must be defined to transfer host to the member.')
       );
     }
-    const options = MembersUtil.generateTransferHostMemberOptions(
+    const options: Record<string, any> = MembersUtil.generateTransferHostMemberOptions(
       memberId,
       moderator,
-      this.locusUrl
+      locusUrl
     );
+    if (breakoutLocusUrl && breakoutLocusUrl !== this.locusUrl) {
+      options.authorizingLocusUrl = this.locusUrl;
+    }
 
     return this.membersRequest.transferHostToMember(options);
   }

package/src/members/util.ts

@@ -13,7 +13,7 @@ import {
   ALIAS,
 } from '../constants';
 
-import {RoleAssignmentOptions, RoleAssignmentRequest, ServerRoleShape} from './types';
+import {RoleAssignmentOptions, RoleAssignmentRequest, ServerRoleShape, ServerRoles} from './types';
 import {Invitee} from '../meeting/type';
 
 const MembersUtil = {
@@ -330,12 +330,20 @@ const MembersUtil = {
     };
   },
 
-  getTransferHostToMemberRequestParams: (options) => {
-    const body = {
+  getTransferHostToMemberRequestParams: (options: any) => {
+    const body: Record<string, any> = {
       role: {
-        moderator: options.moderator,
+        roles: [
+          {
+            hasRole: true,
+            type: ServerRoles.Moderator,
+          },
+        ],
       },
     };
+    if (options.authorizingLocusUrl) {
+      body.authorizingLocusUrl = options.authorizingLocusUrl;
+    }
     const uri = `${options.locusUrl}/${PARTICIPANT}/${options.memberId}/${CONTROLS}`;
 
     return {

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

@@ -883,6 +883,67 @@ describe('plugin-meetings', () => {
           assert.deepEqual(args, [[uuid1], locusUrls]);
         });
       });
+      describe('#transfer', () => {
+        it('should have #transfer', () => {
+          assert.exists(meeting.transfer);
+        });
+
+        it('should transfer host using the current locus when the target member is in the current session', async () => {
+          sinon.stub(meeting.members.membersCollection, 'get').withArgs(uuid2).returns({isInMeeting: true});
+          meeting.members.transferHostToMember = sinon.stub().resolves(test1);
+
+          await meeting.transfer(uuid2, false);
+
+          assert.calledOnceWithExactly(meeting.members.transferHostToMember, uuid2, false);
+        });
+
+        it('should transfer host using breakout locus when the target member is joined in a breakout session', async () => {
+          sinon.stub(meeting.members.membersCollection, 'get').withArgs(uuid2).returns({isInMeeting: false});
+          meeting.members.transferHostToMember = sinon.stub().resolves(test1);
+          meeting.breakouts.breakouts = {
+            models: [
+              {
+                members: {
+                  membersCollection: {
+                    get: sinon.stub().withArgs(uuid2).returns({isInMeeting: true}),
+                  },
+                },
+                breakoutRosterLocus: {url: 'https://example.com/breakout-locus'},
+              },
+            ],
+          };
+
+          await meeting.transfer(uuid2, false);
+
+          assert.calledOnceWithExactly(
+            meeting.members.transferHostToMember,
+            uuid2,
+            false,
+            'https://example.com/breakout-locus'
+          );
+        });
+
+        it('should not use breakout locus when the breakout member is not in meeting', async () => {
+          sinon.stub(meeting.members.membersCollection, 'get').withArgs(uuid2).returns({isInMeeting: false});
+          meeting.members.transferHostToMember = sinon.stub().resolves(test1);
+          meeting.breakouts.breakouts = {
+            models: [
+              {
+                members: {
+                  membersCollection: {
+                    get: sinon.stub().withArgs(uuid2).returns({isInMeeting: false}),
+                  },
+                },
+                breakoutRosterLocus: {url: 'https://example.com/breakout-locus'},
+              },
+            ],
+          };
+
+          await meeting.transfer(uuid2, false);
+
+          assert.calledOnceWithExactly(meeting.members.transferHostToMember, uuid2, false, undefined);
+        });
+      });
       describe('#getMembers', () => {
         it('should have #getMembers', () => {
           assert.exists(meeting.getMembers);

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

@@ -319,6 +319,7 @@ describe('plugin-meetings', () => {
         const addSequenceSpy = sinon.spy(MeetingUtil, 'addSequence');
 
         const meeting = {
+          locusUrl: 'https://locus.example.com/loci/abc',
           request: sinon.stub().returns(Promise.resolve('result')),
         };
 
@@ -326,6 +327,7 @@ describe('plugin-meetings', () => {
 
         const options = {
           some: 'option',
+          uri: 'https://locus.example.com/loci/abc',
           body: {},
         };
 
@@ -339,7 +341,7 @@ describe('plugin-meetings', () => {
         addSequenceSpy.resetHistory();
 
         // body missing from options
-        result = await locusDeltaRequest({});
+        result = await locusDeltaRequest({uri: 'https://locus.example.com/loci/abc'});
         assert.equal(result, 'result');
         assert.calledOnceWithExactly(updateLocusFromApiResponseSpy, meeting, 'result');
         assert.calledOnceWithExactly(addSequenceSpy, meeting, options.body);
@@ -353,6 +355,78 @@ describe('plugin-meetings', () => {
         WeakRef.prototype.deref.restore();
       });
 
+      it('calls updateLocusFromApiResponse when request uri starts with the meeting locusUrl', async () => {
+        const updateLocusFromApiResponseSpy = sinon.spy(MeetingUtil, 'updateLocusFromApiResponse');
+
+        const meeting = {
+          locusUrl: 'https://locus.example.com/loci/abc',
+          request: sinon.stub().returns(Promise.resolve('result')),
+        };
+
+        const locusDeltaRequest = MeetingUtil.generateLocusDeltaRequest(meeting);
+
+        const result = await locusDeltaRequest({
+          uri: 'https://locus.example.com/loci/abc/participant/123',
+          body: {},
+        });
+
+        assert.equal(result, 'result');
+        assert.calledOnceWithExactly(updateLocusFromApiResponseSpy, meeting, 'result');
+      });
+
+      it('does not call updateLocusFromApiResponse when request uri does not match the meeting locusUrl', async () => {
+        const updateLocusFromApiResponseSpy = sinon.spy(MeetingUtil, 'updateLocusFromApiResponse');
+
+        const meeting = {
+          locusUrl: 'https://locus.example.com/loci/abc',
+          request: sinon.stub().returns(Promise.resolve('result')),
+        };
+
+        const locusDeltaRequest = MeetingUtil.generateLocusDeltaRequest(meeting);
+
+        const result = await locusDeltaRequest({
+          uri: 'https://locus.example.com/loci/different',
+          body: {},
+        });
+
+        assert.equal(result, 'result');
+        assert.notCalled(updateLocusFromApiResponseSpy);
+      });
+
+      it('does not call updateLocusFromApiResponse when request uri is missing', async () => {
+        const updateLocusFromApiResponseSpy = sinon.spy(MeetingUtil, 'updateLocusFromApiResponse');
+
+        const meeting = {
+          locusUrl: 'https://locus.example.com/loci/abc',
+          request: sinon.stub().returns(Promise.resolve('result')),
+        };
+
+        const locusDeltaRequest = MeetingUtil.generateLocusDeltaRequest(meeting);
+
+        const result = await locusDeltaRequest({body: {}});
+
+        assert.equal(result, 'result');
+        assert.notCalled(updateLocusFromApiResponseSpy);
+      });
+
+      it('does not call updateLocusFromApiResponse when meeting locusUrl is missing', async () => {
+        const updateLocusFromApiResponseSpy = sinon.spy(MeetingUtil, 'updateLocusFromApiResponse');
+
+        const meeting = {
+          request: sinon.stub().returns(Promise.resolve('result')),
+        };
+
+        const locusDeltaRequest = MeetingUtil.generateLocusDeltaRequest(meeting);
+
+        const result = await locusDeltaRequest({
+          uri: 'https://locus.example.com/loci/abc',
+          body: {},
+        });
+
+        assert.equal(result, 'result');
+        assert.notCalled(updateLocusFromApiResponseSpy);
+      });
+
       it('calls generateBuildLocusDeltaRequestOptions as expected', () => {
         const generateBuildLocusDeltaRequestOptionsSpy = sinon.spy(
           MeetingUtil,

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

@@ -303,6 +303,67 @@ describe('plugin-meetings', () => {
       });
     });
 
+    describe('#transferHostToMember', () => {
+      it('should reject if no locus url is set and no breakoutLocusUrl is provided', async () => {
+        const members = createMembers({url: false});
+
+        await assert.isRejected(members.transferHostToMember('bob'));
+      });
+
+      it('should reject if no memberId is provided', async () => {
+        const members = createMembers({url: url1});
+
+        await assert.isRejected(members.transferHostToMember());
+      });
+
+      it('uses the main locus url when no breakoutLocusUrl is provided', async () => {
+        sandbox.spy(MembersUtil, 'generateTransferHostMemberOptions');
+
+        const members = createMembers({url: url1});
+        const {membersRequest} = members;
+        sandbox.spy(membersRequest, 'transferHostToMember');
+
+        await members.transferHostToMember('bob', true);
+
+        assert.calledOnceWithExactly(
+          MembersUtil.generateTransferHostMemberOptions,
+          'bob',
+          true,
+          url1
+        );
+        assert.calledOnceWithExactly(membersRequest.transferHostToMember, {
+          memberId: 'bob',
+          moderator: true,
+          locusUrl: url1,
+        });
+      });
+
+      it('uses the breakoutLocusUrl when provided', async () => {
+        sandbox.spy(MembersUtil, 'generateTransferHostMemberOptions');
+
+        const members = createMembers({url: url1});
+        const {membersRequest} = members;
+        sandbox.spy(membersRequest, 'transferHostToMember');
+
+        const breakoutLocusUrl = 'https://example.com/breakout-locus';
+
+        await members.transferHostToMember('bob', true, breakoutLocusUrl);
+
+        assert.calledOnceWithExactly(
+          MembersUtil.generateTransferHostMemberOptions,
+          'bob',
+          true,
+          breakoutLocusUrl
+        );
+        assert.calledOnceWithExactly(membersRequest.transferHostToMember, {
+          memberId: 'bob',
+          moderator: true,
+          locusUrl: breakoutLocusUrl,
+          authorizingLocusUrl: url1,
+        });
+      });
+    });
+
     describe('#clearMembers', () => {
       it('should send clear event if clear members', () => {
         const members = createMembers({url: url1});

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

@@ -194,7 +194,43 @@ describe('plugin-meetings', () => {
         checkRequest({
           method: 'PATCH',
           uri: 'https://example.com/12345/participant/member1/controls',
-          body: {role: {moderator: true}},
+          body: {
+            role: {
+              roles: [
+                {
+                  hasRole: true,
+                  type: 'MODERATOR',
+                },
+              ],
+            },
+          },
+        });
+      });
+
+      it('sends a request with authorizingLocusUrl when provided', async () => {
+        const options = {
+          locusUrl: url1,
+          memberId: 'member1',
+          moderator: true,
+          authorizingLocusUrl: 'https://example.com/breakout-locus',
+        };
+
+        await membersRequest.transferHostToMember(options);
+
+        checkRequest({
+          method: 'PATCH',
+          uri: 'https://example.com/12345/participant/member1/controls',
+          body: {
+            role: {
+              roles: [
+                {
+                  hasRole: true,
+                  type: 'MODERATOR',
+                },
+              ],
+            },
+            authorizingLocusUrl: 'https://example.com/breakout-locus',
+          },
         });
       });
     });

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

@@ -226,6 +226,69 @@ describe('plugin-meetings', () => {
       });
     });
 
+    describe('#generateTransferHostMemberOptions', () => {
+      it('returns the correct options', () => {
+        assert.deepEqual(
+          MembersUtil.generateTransferHostMemberOptions('member1', true, 'locusUrl'),
+          {
+            memberId: 'member1',
+            moderator: true,
+            locusUrl: 'locusUrl',
+          }
+        );
+      });
+    });
+
+    describe('#getTransferHostToMemberRequestParams', () => {
+      it('returns the correct request params without authorizingLocusUrl', () => {
+        const options = {
+          locusUrl: 'locusUrl',
+          memberId: 'member1',
+          moderator: true,
+        };
+
+        assert.deepEqual(MembersUtil.getTransferHostToMemberRequestParams(options), {
+          method: HTTP_VERBS.PATCH,
+          uri: 'locusUrl/participant/member1/controls',
+          body: {
+            role: {
+              roles: [
+                {
+                  hasRole: true,
+                  type: 'MODERATOR',
+                },
+              ],
+            },
+          },
+        });
+      });
+
+      it('returns the correct request params with authorizingLocusUrl', () => {
+        const options = {
+          locusUrl: 'mainLocusUrl',
+          memberId: 'member1',
+          moderator: true,
+          authorizingLocusUrl: 'breakoutLocusUrl',
+        };
+
+        assert.deepEqual(MembersUtil.getTransferHostToMemberRequestParams(options), {
+          method: HTTP_VERBS.PATCH,
+          uri: 'mainLocusUrl/participant/member1/controls',
+          body: {
+            role: {
+              roles: [
+                {
+                  hasRole: true,
+                  type: 'MODERATOR',
+                },
+              ],
+            },
+            authorizingLocusUrl: 'breakoutLocusUrl',
+          },
+        });
+      });
+    });
+
     describe('#generateMuteMemberOptions', () => {
       const testOptions = (isAudio) => {
         const memberId = 'bob';