@webex/plugin-meetings 3.0.0-beta.202 → 3.0.0-beta.203

package/dist/types/meeting/index.d.ts

@@ -746,6 +746,11 @@ export default class Meeting extends StatelessWebexPlugin {
             owner: object;
         };
     } | any, destination?: object | string | null): void;
+    /**
+     * Indicates whether policy can be applied
+     * @returns {boolean}
+     */
+    private arePolicyRestrictionsSupported;
     /**
      * Updates the meeting actions (display hints), depends on locus display hints, user policy and app api info
      * @returns {undefined}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.202",
+  "version": "3.0.0-beta.203",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -32,12 +32,12 @@
     "build": "yarn run -T tsc --declaration true --declarationDir ./dist/types"
   },
   "devDependencies": {
-    "@webex/plugin-meetings": "3.0.0-beta.202",
-    "@webex/test-helper-chai": "3.0.0-beta.202",
-    "@webex/test-helper-mocha": "3.0.0-beta.202",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.202",
-    "@webex/test-helper-retry": "3.0.0-beta.202",
-    "@webex/test-helper-test-users": "3.0.0-beta.202",
+    "@webex/plugin-meetings": "3.0.0-beta.203",
+    "@webex/test-helper-chai": "3.0.0-beta.203",
+    "@webex/test-helper-mocha": "3.0.0-beta.203",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.203",
+    "@webex/test-helper-retry": "3.0.0-beta.203",
+    "@webex/test-helper-test-users": "3.0.0-beta.203",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -46,19 +46,19 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.202",
+    "@webex/common": "3.0.0-beta.203",
     "@webex/internal-media-core": "1.39.1",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.202",
-    "@webex/internal-plugin-device": "3.0.0-beta.202",
-    "@webex/internal-plugin-llm": "3.0.0-beta.202",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.202",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.202",
-    "@webex/internal-plugin-support": "3.0.0-beta.202",
-    "@webex/internal-plugin-user": "3.0.0-beta.202",
-    "@webex/media-helpers": "3.0.0-beta.202",
-    "@webex/plugin-people": "3.0.0-beta.202",
-    "@webex/plugin-rooms": "3.0.0-beta.202",
-    "@webex/webex-core": "3.0.0-beta.202",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.203",
+    "@webex/internal-plugin-device": "3.0.0-beta.203",
+    "@webex/internal-plugin-llm": "3.0.0-beta.203",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.203",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.203",
+    "@webex/internal-plugin-support": "3.0.0-beta.203",
+    "@webex/internal-plugin-user": "3.0.0-beta.203",
+    "@webex/media-helpers": "3.0.0-beta.203",
+    "@webex/plugin-people": "3.0.0-beta.203",
+    "@webex/plugin-rooms": "3.0.0-beta.203",
+    "@webex/webex-core": "3.0.0-beta.203",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/locus-info/index.ts

@@ -1106,14 +1106,6 @@ export default class LocusInfo extends EventsScope {
       const isJoined = SelfUtils.isJoined(self || this.parsedLocus.self);
       const parsedInfo = InfoUtils.getInfos(this.parsedLocus.info, info, roles, isJoined);
 
-      this.emitScoped(
-        {
-          file: 'locus-info',
-          function: 'updateMeetingInfo',
-        },
-        LOCUSINFO.EVENTS.MEETING_INFO_UPDATED
-      );
-
       if (parsedInfo.updates.isLocked) {
         this.emitScoped(
           {
@@ -1139,6 +1131,14 @@ export default class LocusInfo extends EventsScope {
       this.parsedLocus.info = parsedInfo.current;
       // Parses the info and adds necessary values
       this.updateMeeting(parsedInfo.current);
+
+      this.emitScoped(
+        {
+          file: 'locus-info',
+          function: 'updateMeetingInfo',
+        },
+        LOCUSINFO.EVENTS.MEETING_INFO_UPDATED
+      );
     }
     this.roles = roles;
   }

package/src/meeting/index.ts

@@ -1,5 +1,5 @@
 import uuid from 'uuid';
-import {cloneDeep, isEqual, defer, isEmpty} from 'lodash';
+import {cloneDeep, isEqual, isEmpty} from 'lodash';
 import jwt from 'jsonwebtoken';
 // @ts-ignore - Fix this
 import {StatelessWebexPlugin} from '@webex/webex-core';
@@ -1354,6 +1354,8 @@ export default class Meeting extends StatelessWebexPlugin {
 
       return Promise.resolve();
     } catch (err) {
+      this.updateMeetingActions();
+
       if (err instanceof MeetingInfoV2PolicyError) {
         this.meetingInfoFailureReason = MEETING_INFO_FAILURE_REASON.POLICY;
         this.meetingInfoFailureCode = err.wbxAppApiCode;
@@ -2480,15 +2482,10 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {String} datachannelUrl
    * @returns {void}
    */
-
   handleDataChannelUrlChange(datachannelUrl) {
     // @ts-ignore - config coming from registerPlugin
     if (datachannelUrl && this.config.enableAutomaticLLM) {
-      // Defer this as updateLLMConnection relies upon this.locusInfo.url which is only set
-      // after the MEETING_INFO_UPDATED callback finishes
-      defer(() => {
-        this.updateLLMConnection();
-      });
+      this.updateLLMConnection();
     }
   }
 
@@ -3030,6 +3027,31 @@ export default class Meeting extends StatelessWebexPlugin {
     MeetingUtil.parseInterpretationInfo(this, webexMeetingInfo);
   }
 
+  /**
+   * Indicates whether policy can be applied
+   * @returns {boolean}
+   */
+  private arePolicyRestrictionsSupported() {
+    // Locus calls do not return the correct display hints
+    if (this.isLocusCall()) {
+      return false;
+    }
+
+    // 1-2-1 calls and SIP dialling will have no meeting info
+    // so cannot support policy information
+    if (isEmpty(this.meetingInfo)) {
+      return false;
+    }
+
+    // Old locus info api does not return policy information
+    // @ts-ignore
+    if (!this.config.experimental.enableUnifiedMeetings) {
+      return false;
+    }
+
+    return true;
+  }
+
   /**
    * Updates the meeting actions (display hints), depends on locus display hints, user policy and app api info
    * @returns {undefined}
@@ -3050,9 +3072,7 @@ export default class Meeting extends StatelessWebexPlugin {
             requiredPolicies: [SELF_POLICY.SUPPORT_VOIP],
             policies: this.selfUserPolicies,
           })) ||
-        // @ts-ignore
-        !this.config.experimental.enableUnifiedMeetings ||
-        this.isLocusCall(),
+        !this.arePolicyRestrictionsSupported(),
     });
     if (this.userDisplayHints !== undefined) {
       changed =
@@ -3189,13 +3209,11 @@ export default class Meeting extends StatelessWebexPlugin {
               requiredHints: [DISPLAY_HINTS.SHARE_FILE],
               displayHints: this.userDisplayHints,
             }) &&
-              (ControlsOptionsUtil.hasPolicies({
+              ControlsOptionsUtil.hasPolicies({
                 requiredPolicies: [SELF_POLICY.SUPPORT_FILE_SHARE],
                 policies: this.selfUserPolicies,
-              }) ||
-                // @ts-ignore
-                !this.config.experimental.enableUnifiedMeetings)) ||
-            this.isLocusCall(),
+              })) ||
+            !this.arePolicyRestrictionsSupported,
           canTransferFile: ControlsOptionsUtil.hasPolicies({
             requiredPolicies: [SELF_POLICY.SUPPORT_FILE_TRANSFER],
             policies: this.selfUserPolicies,
@@ -3205,13 +3223,11 @@ export default class Meeting extends StatelessWebexPlugin {
               requiredHints: [DISPLAY_HINTS.SHARE_APPLICATION],
               displayHints: this.userDisplayHints,
             }) &&
-              (ControlsOptionsUtil.hasPolicies({
+              ControlsOptionsUtil.hasPolicies({
                 requiredPolicies: [SELF_POLICY.SUPPORT_APP_SHARE],
                 policies: this.selfUserPolicies,
-              }) ||
-                // @ts-ignore
-                !this.config.experimental.enableUnifiedMeetings)) ||
-            this.isLocusCall(),
+              })) ||
+            !this.arePolicyRestrictionsSupported(),
           canShareCamera:
             ControlsOptionsUtil.hasHints({
               requiredHints: [DISPLAY_HINTS.SHARE_CAMERA],
@@ -3226,18 +3242,16 @@ export default class Meeting extends StatelessWebexPlugin {
               requiredHints: [DISPLAY_HINTS.SHARE_DESKTOP],
               displayHints: this.userDisplayHints,
             }) &&
-              (ControlsOptionsUtil.hasPolicies({
+              ControlsOptionsUtil.hasPolicies({
                 requiredPolicies: [SELF_POLICY.SUPPORT_DESKTOP_SHARE],
                 policies: this.selfUserPolicies,
-              }) ||
-                // @ts-ignore
-                !this.config.experimental.enableUnifiedMeetings)) ||
-            this.isLocusCall(),
+              })) ||
+            !this.arePolicyRestrictionsSupported(),
           canShareContent:
             ControlsOptionsUtil.hasHints({
               requiredHints: [DISPLAY_HINTS.SHARE_CONTENT],
               displayHints: this.userDisplayHints,
-            }) || this.isLocusCall(),
+            }) || !this.arePolicyRestrictionsSupported(),
           canAnnotate: ControlsOptionsUtil.hasPolicies({
             requiredPolicies: [SELF_POLICY.SUPPORT_ANNOTATION],
             policies: this.selfUserPolicies,

package/test/unit/spec/locus-info/index.js

@@ -1409,14 +1409,19 @@ describe('plugin-meetings', () => {
       it('emits MEETING_INFO_UPDATED and updates the meeting if the info changes', () => {
         const initialInfo = cloneDeep(meetingInfo);
 
-        locusInfo.emitScoped = sinon.stub();
+        let expectedMeeting;
 
-        // set the info initially as locusInfo.info starts as undefined
-        locusInfo.updateMeetingInfo(initialInfo, self);
+        /*
+        When the event is triggered, it is required that the meeting has already
+        been updated. This is why the meeting is being checked within the stubbed event emitter
+        */
+        sinon.stub(locusInfo, 'emitScoped').callsFake(() => {
+          assert.deepEqual(mockMeeting, expectedMeeting);
+        })
 
-        // since it was initially undefined, this should trigger the event
-        checkMeetingInfoUpdatedCalled(true);
-        assert.deepEqual(mockMeeting, {
+
+        // set the info initially as locusInfo.info starts as undefined
+        expectedMeeting = {
           coHost: {
             LOWER_SOMEONE_ELSES_HAND: true,
           },
@@ -1430,17 +1435,19 @@ describe('plugin-meetings', () => {
             ROSTER_IN_MEETING: true,
           },
           userDisplayHints: ['ROSTER_IN_MEETING', 'LOCK_STATUS_UNLOCKED'],
-        });
+        };
+        locusInfo.updateMeetingInfo(initialInfo, self);
+
+        // since it was initially undefined, this should trigger the event
+
+        checkMeetingInfoUpdatedCalled(true);
 
         const newInfo = cloneDeep(meetingInfo);
 
         newInfo.displayHints.coHost = [DISPLAY_HINTS.LOCK_CONTROL_LOCK];
 
         // Updating with different info should trigger the event
-        locusInfo.updateMeetingInfo(newInfo, self);
-
-        checkMeetingInfoUpdatedCalled(true);
-        assert.deepEqual(mockMeeting, {
+        expectedMeeting = {
           coHost: {
             LOWER_SOMEONE_ELSES_HAND: true,
             LOCK_CONTROL_LOCK: true,
@@ -1455,14 +1462,13 @@ describe('plugin-meetings', () => {
             ROSTER_IN_MEETING: true,
           },
           userDisplayHints: ['ROSTER_IN_MEETING', 'LOCK_STATUS_UNLOCKED'],
-        });
-
-        // update it with the same info
+        };
         locusInfo.updateMeetingInfo(newInfo, self);
 
-        // since the info is the same it should not call trigger the event
-        checkMeetingInfoUpdatedCalled(false);
-        assert.deepEqual(mockMeeting, {
+        checkMeetingInfoUpdatedCalled(true);
+
+        // update it with the same info
+        expectedMeeting = {
           coHost: {
             LOWER_SOMEONE_ELSES_HAND: true,
             LOCK_CONTROL_LOCK: true,
@@ -1477,7 +1483,11 @@ describe('plugin-meetings', () => {
             ROSTER_IN_MEETING: true,
           },
           userDisplayHints: ['ROSTER_IN_MEETING', 'LOCK_STATUS_UNLOCKED'],
-        });
+        };
+        locusInfo.updateMeetingInfo(newInfo, self);
+
+        // since the info is the same it should not call trigger the event
+        checkMeetingInfoUpdatedCalled(false);
 
         // update it with the same info, but roles changed
         const updateSelf = cloneDeep(self);
@@ -1485,10 +1495,7 @@ describe('plugin-meetings', () => {
           type: 'COHOST',
           hasRole: true,
         });
-        locusInfo.updateMeetingInfo(newInfo, updateSelf);
-        // since the info is the same but roles changed, it should call trigger the event
-        checkMeetingInfoUpdatedCalledForRoles(true);
-        assert.deepEqual(mockMeeting, {
+        expectedMeeting = {
           coHost: {
             LOWER_SOMEONE_ELSES_HAND: true,
             LOCK_CONTROL_LOCK: true,
@@ -1508,7 +1515,10 @@ describe('plugin-meetings', () => {
             'LOCK_CONTROL_LOCK',
             'LOWER_SOMEONE_ELSES_HAND',
           ],
-        });
+        };
+        locusInfo.updateMeetingInfo(newInfo, updateSelf);
+        // since the info is the same but roles changed, it should call trigger the event
+        checkMeetingInfoUpdatedCalledForRoles(true);
       });
 
       it('gets roles from self if available', () => {

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

@@ -5947,6 +5947,7 @@ describe('plugin-meetings', () => {
             it(`${actionName} is ${expectedEnabled} when the call type is ${callType}`, () => {
               meeting.type = callType;
               meeting.userDisplayHints = [];
+              meeting.meetingInfo = {some: 'info'};
 
               meeting.updateMeetingActions();
 
@@ -6005,7 +6006,7 @@ describe('plugin-meetings', () => {
               requiredPolicies: [SELF_POLICY.SUPPORT_ANNOTATION],
             },
           ],
-          ({actionName, requiredDisplayHints, requiredPolicies, enableUnifiedMeetings}) => {
+          ({actionName, requiredDisplayHints, requiredPolicies, enableUnifiedMeetings, meetingInfo}) => {
             it(`${actionName} is enabled when the conditions are met`, () => {
               meeting.userDisplayHints = requiredDisplayHints;
               meeting.selfUserPolicies = {};
@@ -6014,6 +6015,8 @@ describe('plugin-meetings', () => {
                 ? true
                 : enableUnifiedMeetings;
 
+              meeting.meetingInfo = isUndefined(meetingInfo) ? {some: 'info'} : meetingInfo;
+
               forEach(requiredPolicies, (policy) => {
                 meeting.selfUserPolicies[policy] = true;
               });
@@ -6028,6 +6031,8 @@ describe('plugin-meetings', () => {
                 meeting.userDisplayHints = [];
                 meeting.selfUserPolicies = {};
 
+                meeting.meetingInfo = isUndefined(meetingInfo) ? {some: 'info'} : meetingInfo;
+
                 forEach(requiredPolicies, (policy) => {
                   meeting.selfUserPolicies[policy] = true;
                 });
@@ -6042,6 +6047,8 @@ describe('plugin-meetings', () => {
               meeting.userDisplayHints = requiredDisplayHints;
               meeting.selfUserPolicies = {};
 
+              meeting.meetingInfo = isUndefined(meetingInfo) ? {some: 'info'} : meetingInfo;
+
               meeting.updateMeetingActions();
 
               assert.isFalse(meeting.inMeetingActions.get()[actionName]);
@@ -6093,6 +6100,24 @@ describe('plugin-meetings', () => {
           assert.isTrue(meeting.inMeetingActions.get()['canUseVoip']);
         });
 
+        it('canUseVoip is enabled when there is no meeting info', () => {
+          meeting.config.experimental.enableUnifiedMeetings = true;
+
+          meeting.updateMeetingActions();
+
+          assert.isTrue(meeting.inMeetingActions.get()['canUseVoip']);
+        });
+
+        it('canUseVoip is enabled when it is a locus call', () => {
+          meeting.config.experimental.enableUnifiedMeetings = true;
+          meeting.meetingInfo = {some: 'info'};
+          meeting.type = 'CALL';
+
+          meeting.updateMeetingActions();
+
+          assert.isTrue(meeting.inMeetingActions.get()['canUseVoip']);
+        });
+
         it('canUseVoip is disabled based on api info when supportVoip is false', () => {
           meeting.userDisplayHints = undefined;
           meeting.selfUserPolicies = {[SELF_POLICY.SUPPORT_VOIP]: true};
@@ -6283,13 +6308,9 @@ describe('plugin-meetings', () => {
           updateLLMConnectionSpy = sinon.spy(meeting, 'updateLLMConnection');
         });
 
-        const check = async (url, expectedCalled) => {
+        const check = (url, expectedCalled) => {
           meeting.handleDataChannelUrlChange(url);
 
-          assert.notCalled(updateLLMConnectionSpy);
-
-          await testUtils.waitUntil(0);
-
           if (expectedCalled) {
             assert.calledWith(updateLLMConnectionSpy);
           } else {
@@ -6297,17 +6318,17 @@ describe('plugin-meetings', () => {
           }
         };
 
-        it('calls deferred updateLLMConnection if datachannelURL is set and the enableAutomaticLLM is true', async () => {
+        it('calls deferred updateLLMConnection if datachannelURL is set and the enableAutomaticLLM is true', () => {
           meeting.config.enableAutomaticLLM = true;
           check('some url', true);
         });
 
-        it('does not call updateLLMConnection if datachannelURL is undefined', async () => {
+        it('does not call updateLLMConnection if datachannelURL is undefined', () => {
           meeting.config.enableAutomaticLLM = true;
           check(undefined, false);
         });
 
-        it('does not call updateLLMConnection if enableAutomaticLLM is false', async () => {
+        it('does not call updateLLMConnection if enableAutomaticLLM is false', () => {
           check('some url', false);
         });
       });

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

@@ -1371,7 +1371,7 @@ describe('plugin-meetings', () => {
             );
             assert.calledOnce(webex.meetings.meetingInfo.fetchMeetingInfo);
             assert.calledOnce(MeetingsUtil.getMeetingAddedType);
-            assert.calledTwice(TriggerProxy.trigger);
+            assert.calledThrice(TriggerProxy.trigger);
             assert.calledWith(
               webex.meetings.meetingInfo.fetchMeetingInfo,
               'test destination',