@webex/plugin-meetings 3.0.0-beta.209 → 3.0.0-beta.210

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.209",
+  "version": "3.0.0-beta.210",
   "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.209",
-    "@webex/test-helper-chai": "3.0.0-beta.209",
-    "@webex/test-helper-mocha": "3.0.0-beta.209",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.209",
-    "@webex/test-helper-retry": "3.0.0-beta.209",
-    "@webex/test-helper-test-users": "3.0.0-beta.209",
+    "@webex/plugin-meetings": "3.0.0-beta.210",
+    "@webex/test-helper-chai": "3.0.0-beta.210",
+    "@webex/test-helper-mocha": "3.0.0-beta.210",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.210",
+    "@webex/test-helper-retry": "3.0.0-beta.210",
+    "@webex/test-helper-test-users": "3.0.0-beta.210",
     "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.209",
+    "@webex/common": "3.0.0-beta.210",
     "@webex/internal-media-core": "1.39.1",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.209",
-    "@webex/internal-plugin-device": "3.0.0-beta.209",
-    "@webex/internal-plugin-llm": "3.0.0-beta.209",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.209",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.209",
-    "@webex/internal-plugin-support": "3.0.0-beta.209",
-    "@webex/internal-plugin-user": "3.0.0-beta.209",
-    "@webex/media-helpers": "3.0.0-beta.209",
-    "@webex/plugin-people": "3.0.0-beta.209",
-    "@webex/plugin-rooms": "3.0.0-beta.209",
-    "@webex/webex-core": "3.0.0-beta.209",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.210",
+    "@webex/internal-plugin-device": "3.0.0-beta.210",
+    "@webex/internal-plugin-llm": "3.0.0-beta.210",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.210",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.210",
+    "@webex/internal-plugin-support": "3.0.0-beta.210",
+    "@webex/internal-plugin-user": "3.0.0-beta.210",
+    "@webex/media-helpers": "3.0.0-beta.210",
+    "@webex/plugin-people": "3.0.0-beta.210",
+    "@webex/plugin-rooms": "3.0.0-beta.210",
+    "@webex/webex-core": "3.0.0-beta.210",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/meeting/index.ts

@@ -3029,8 +3029,8 @@ export default class Meeting extends StatelessWebexPlugin {
    * @returns {boolean}
    */
   private arePolicyRestrictionsSupported() {
-    // Locus calls do not return the correct display hints
-    if (this.isLocusCall()) {
+    // If we don't have policies we can't support policies
+    if (!this.selfUserPolicies) {
       return false;
     }
 
@@ -3040,12 +3040,6 @@ export default class Meeting extends StatelessWebexPlugin {
       return false;
     }
 
-    // Old locus info api does not return policy information
-    // @ts-ignore
-    if (!this.config.experimental.enableUnifiedMeetings) {
-      return false;
-    }
-
     return true;
   }
 

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

@@ -5899,50 +5899,52 @@ describe('plugin-meetings', () => {
           [
             {
               actionName: 'canShareApplication',
-              callType: 'CALL',
               expectedEnabled: true,
+              arePolicyRestrictionsSupported: false,
             },
             {
               actionName: 'canShareApplication',
-              callType: 'MEETING',
               expectedEnabled: false,
+              arePolicyRestrictionsSupported: true,
             },
             {
               actionName: 'canShareDesktop',
-              callType: 'CALL',
+              arePolicyRestrictionsSupported: false,
               expectedEnabled: true,
             },
             {
               actionName: 'canShareDesktop',
-              callType: 'MEETING',
+              arePolicyRestrictionsSupported: true,
               expectedEnabled: false,
             },
             {
               actionName: 'canShareContent',
-              callType: 'CALL',
+              arePolicyRestrictionsSupported: false,
               expectedEnabled: true,
             },
             {
               actionName: 'canShareContent',
-              callType: 'MEETING',
+              arePolicyRestrictionsSupported: true,
               expectedEnabled: false,
             },
             {
               actionName: 'canUseVoip',
-              callType: 'CALL',
               expectedEnabled: true,
+              arePolicyRestrictionsSupported: false,
             },
             {
               actionName: 'canUseVoip',
-              callType: 'MEETING',
               expectedEnabled: false,
+              arePolicyRestrictionsSupported: true,
             },
           ],
-          ({actionName, callType, expectedEnabled}) => {
-            it(`${actionName} is ${expectedEnabled} when the call type is ${callType}`, () => {
-              meeting.type = callType;
+          ({actionName, arePolicyRestrictionsSupported, expectedEnabled}) => {
+            it(`${actionName} is ${expectedEnabled} when the call type is ${arePolicyRestrictionsSupported}`, () => {
               meeting.userDisplayHints = [];
               meeting.meetingInfo = {some: 'info'};
+              sinon
+                .stub(meeting, 'arePolicyRestrictionsSupported')
+                .returns(arePolicyRestrictionsSupported);
 
               meeting.updateMeetingActions();
 
@@ -5988,12 +5990,14 @@ describe('plugin-meetings', () => {
               requiredDisplayHints: [DISPLAY_HINTS.SHARE_DESKTOP],
               requiredPolicies: [],
               enableUnifiedMeetings: false,
+              arePolicyRestrictionsSupported: false,
             },
             {
               actionName: 'canShareApplication',
               requiredDisplayHints: [DISPLAY_HINTS.SHARE_APPLICATION],
               requiredPolicies: [],
               enableUnifiedMeetings: false,
+              arePolicyRestrictionsSupported: false,
             },
             {
               actionName: 'canAnnotate',
@@ -6001,10 +6005,20 @@ describe('plugin-meetings', () => {
               requiredPolicies: [SELF_POLICY.SUPPORT_ANNOTATION],
             },
           ],
-          ({actionName, requiredDisplayHints, requiredPolicies, enableUnifiedMeetings, meetingInfo}) => {
+          ({
+            actionName,
+            requiredDisplayHints,
+            requiredPolicies,
+            enableUnifiedMeetings,
+            meetingInfo,
+            arePolicyRestrictionsSupported,
+          }) => {
             it(`${actionName} is enabled when the conditions are met`, () => {
               meeting.userDisplayHints = requiredDisplayHints;
-              meeting.selfUserPolicies = {};
+              meeting.selfUserPolicies = undefined;
+              sinon
+                .stub(meeting, 'arePolicyRestrictionsSupported')
+                .returns(arePolicyRestrictionsSupported);
 
               meeting.config.experimental.enableUnifiedMeetings = isUndefined(enableUnifiedMeetings)
                 ? true
@@ -6012,6 +6026,9 @@ describe('plugin-meetings', () => {
 
               meeting.meetingInfo = isUndefined(meetingInfo) ? {some: 'info'} : meetingInfo;
 
+              if (requiredPolicies) {
+                meeting.selfUserPolicies = {};
+              }
               forEach(requiredPolicies, (policy) => {
                 meeting.selfUserPolicies[policy] = true;
               });
@@ -6024,10 +6041,13 @@ describe('plugin-meetings', () => {
             if (requiredDisplayHints.length !== 0) {
               it(`${actionName} is disabled when the required display hints are missing`, () => {
                 meeting.userDisplayHints = [];
-                meeting.selfUserPolicies = {};
+                meeting.selfUserPolicies = undefined;
 
                 meeting.meetingInfo = isUndefined(meetingInfo) ? {some: 'info'} : meetingInfo;
 
+                if (requiredPolicies) {
+                  meeting.selfUserPolicies = {};
+                }
                 forEach(requiredPolicies, (policy) => {
                   meeting.selfUserPolicies[policy] = true;
                 });
@@ -6040,8 +6060,11 @@ describe('plugin-meetings', () => {
 
             it(`${actionName} is disabled when the required policies are missing`, () => {
               meeting.userDisplayHints = requiredDisplayHints;
-              meeting.selfUserPolicies = {};
+              meeting.selfUserPolicies = undefined;
 
+                if (requiredPolicies) {
+                  meeting.selfUserPolicies = {};
+                }
               meeting.meetingInfo = isUndefined(meetingInfo) ? {some: 'info'} : meetingInfo;
 
               meeting.updateMeetingActions();
@@ -6104,8 +6127,15 @@ describe('plugin-meetings', () => {
             },
             {
               meetingInfo: undefined,
-              selfUserPolicies: {
+              selfUserPolicies: {},
+              expectedActions: {
+                supportHQV: true,
+                supportHDV: true,
               },
+            },
+            {
+              meetingInfo: {some: 'data'},
+              selfUserPolicies: undefined,
               expectedActions: {
                 supportHQV: true,
                 supportHDV: true,
@@ -6120,7 +6150,6 @@ describe('plugin-meetings', () => {
             )} and meetingInfo is ${JSON.stringify(meetingInfo)}`, () => {
               meeting.meetingInfo = meetingInfo;
               meeting.selfUserPolicies = selfUserPolicies;
-              meeting.config.experimental.enableUnifiedMeetings = true;
 
               meeting.updateMeetingActions();
 
@@ -6139,7 +6168,6 @@ describe('plugin-meetings', () => {
           meeting.userDisplayHints = [DISPLAY_HINTS.VOIP_IS_ENABLED];
           meeting.selfUserPolicies = {[SELF_POLICY.SUPPORT_VOIP]: true};
           meeting.meetingInfo.supportVoIP = false;
-          meeting.config.experimental.enableUnifiedMeetings = true;
 
           meeting.updateMeetingActions();
 
@@ -6150,7 +6178,6 @@ describe('plugin-meetings', () => {
           meeting.userDisplayHints = [];
           meeting.selfUserPolicies = {[SELF_POLICY.SUPPORT_VOIP]: true};
           meeting.meetingInfo.supportVoIP = true;
-          meeting.config.experimental.enableUnifiedMeetings = true;
 
           meeting.updateMeetingActions();
 
@@ -6161,7 +6188,6 @@ describe('plugin-meetings', () => {
           meeting.userDisplayHints = [DISPLAY_HINTS.VOIP_IS_ENABLED];
           meeting.selfUserPolicies = {};
           meeting.meetingInfo.supportVoIP = true;
-          meeting.config.experimental.enableUnifiedMeetings = true;
 
           meeting.updateMeetingActions();
 
@@ -6172,7 +6198,6 @@ describe('plugin-meetings', () => {
           meeting.userDisplayHints = undefined;
           meeting.selfUserPolicies = {[SELF_POLICY.SUPPORT_VOIP]: true};
           meeting.meetingInfo.supportVoIP = true;
-          meeting.config.experimental.enableUnifiedMeetings = true;
 
           meeting.updateMeetingActions();
 
@@ -6180,15 +6205,12 @@ describe('plugin-meetings', () => {
         });
 
         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';
 
@@ -6201,7 +6223,6 @@ describe('plugin-meetings', () => {
           meeting.userDisplayHints = undefined;
           meeting.selfUserPolicies = {[SELF_POLICY.SUPPORT_VOIP]: true};
           meeting.meetingInfo.supportVoIP = false;
-          meeting.config.experimental.enableUnifiedMeetings = true;
 
           meeting.updateMeetingActions();
 
@@ -6212,18 +6233,16 @@ describe('plugin-meetings', () => {
           meeting.userDisplayHints = undefined;
           meeting.selfUserPolicies = {};
           meeting.meetingInfo.supportVoIP = true;
-          meeting.config.experimental.enableUnifiedMeetings = true;
 
           meeting.updateMeetingActions();
 
           assert.isFalse(meeting.inMeetingActions.get()['canUseVoip']);
         });
 
-        it('canUseVoip is enabled when enableUnifiedMeetings is false', () => {
-          meeting.userDisplayHints = [];
-          meeting.selfUserPolicies = {};
+        it('canUseVoip is enabled when there are no policies', () => {
+          meeting.userDisplayHints = [DISPLAY_HINTS.VOIP_IS_ENABLED];
+          meeting.selfUserPolicies = undefined;
           meeting.meetingInfo.supportVoIP = false;
-          meeting.config.experimental.enableUnifiedMeetings = false;
 
           meeting.updateMeetingActions();
 
@@ -6259,6 +6278,13 @@ describe('plugin-meetings', () => {
                 canDoVideo: false,
               },
             },
+            {
+              meetingInfo: {some: 'data'},
+              selfUserPolicies: undefined,
+              expectedActions: {
+                canDoVideo: true,
+              },
+            },
             {
               meetingInfo: {
                 video: {},