Feat/byods next 1

docs/samples/browser-plugin-meetings/app.js

@@ -299,6 +299,7 @@ const passwordCaptchaStatusElm = document.querySelector('#password-captcha-statu
 const refreshCaptchaElm = document.querySelector('#meetings-join-captcha-refresh');
 const verifyPasswordElm = document.querySelector('#btn-verify-password');
 const displayMeetingStatusElm = document.querySelector('#display-meeting-status');
+const notes=document.querySelector('#notes');
 const spaceIDError = `Using the space ID as a destination is no longer supported. Please refer to the <a href="https://github.com/webex/webex-js-sdk/wiki/Migration-to-Unified-Space-Meetings" target="_blank">migration guide</a> to migrate to use the meeting ID or SIP address.`;
 const BNR = 'BNR';
 const VBG = 'VBG';
@@ -381,6 +382,17 @@ createMeetingSelectElm.addEventListener('change', (event) => {
   }
 });
 
+createMeetingSelectElm.addEventListener('change', (event) => {
+  if (event.target.value === 'Others') {
+      notes.classList.remove('hidden');
+  }
+  else {
+     notes.classList.add('hidden');
+
+  }
+});
+
+
 function createMeeting(e) {
   e.preventDefault();
 
@@ -427,19 +439,26 @@ function refreshCaptcha() {
 meetingsListElm.onclick = (e) => {
   selectedMeetingId = e.target.value;
   const meeting = webex.meetings.getAllMeetings()[selectedMeetingId];
+  const selectedMeetingType = createMeetingSelectElm.options[createMeetingSelectElm.selectedIndex].innerText;
 
   if (meeting && meeting.passwordStatus === 'REQUIRED') {
     meetingsJoinPinElm.disabled = false;
     verifyPasswordElm.disabled = false;
     document.getElementById('btn-join').disabled = true;
     document.getElementById('btn-join-media').disabled = true;
   }
-  else if (meeting && meeting.passwordStatus === 'UNKNOWN') {
+  else if (meeting && (meeting.passwordStatus === 'UNKNOWN' && selectedMeetingType === 'SIP URI')) {
     meetingsJoinPinElm.disabled = true;
     verifyPasswordElm.disabled = true;
     document.getElementById('btn-join').disabled = true;
     document.getElementById('btn-join-media').disabled = true;
   }
+  else if(meeting && (meeting.passwordStatus === 'UNKNOWN' && selectedMeetingType != 'SIP URI')) {
+    meetingsJoinPinElm.disabled = true;
+    verifyPasswordElm.disabled = true;
+    document.getElementById('btn-join').disabled = false;
+    document.getElementById('btn-join-media').disabled = false;
+  }
   else {
     meetingsJoinPinElm.disabled = true;
     verifyPasswordElm.disabled = true;
@@ -1387,6 +1406,7 @@ async function handleVbg() {
           "bgImageUrl": blurVBGImageUrl,
           "bgVideoUrl": blurVBGVideoUrl,
           env: integrationEnv.checked ? 'int' : 'prod',
+          preventBackgroundThrottling: true,
         });
         handleEffectsButton(toggleVbgBtn, VBG, effect);
         await localMedia.cameraStream.addEffect(effect);

docs/samples/browser-plugin-meetings/index.html

@@ -338,14 +338,14 @@ <h2 class="collapsible">
                     <input id="create-meeting-destination" name="createMeetingDestination" placeholder="Destination"
                       value="" type="text" required>
                     <select name="createMeetingDest" id="createMeetingDest">
-                      <option value="">Email</option>
-                      <option value="">Person ID</option>
                       <option value="">SIP URI</option>
                       <option value="CONVERSATION_URL">Conversation URL</option>
+                      <option value="Others">Others</option>
                     </select>
                     <button id="create-meeting-action" type="submit" class="btn-code">Create Meeting</button>
                   </div>
                 </div>
+                <p class="note hidden" id="notes">NOTE: The destination shall be "Person ID" or "Email".</p>
               </form>
             </div>
 

docs/samples/calling/app.js

@@ -1301,6 +1301,10 @@ async function createCustomContact() {
       type: 'work',
       value: formData.get('phone')
     }],
+    emails: [{
+      type: 'work',
+      value: formData.get('email')
+    }],
     contactType: 'CUSTOM',
   };
   const res = await contacts.createContact(contact);

packages/@webex/internal-plugin-device/src/config.js

@@ -56,6 +56,12 @@ export default {
      * @type {boolean}
      */
     ephemeralDeviceTTL: 30 * 60,
+
+    /**
+     * energyForcast
+     * @type {boolean}
+     */
+    energyForecast: false,
   },
 
   /**

packages/@webex/internal-plugin-device/src/device.js

@@ -306,6 +306,14 @@ const Device = WebexPlugin.extend({
      */
     isReachabilityChecked: ['boolean', false, false],
 
+    /**
+     * This property stores whether or not the next refresh or register request should request energy forecast data
+     * in order to prevent over fetching energy forecasts
+     *
+     * @type {boolean}
+     */
+    energyForecastConfig: 'boolean',
+
     /**
      * This property stores whether or not the current device is in a meeting
      * to prevent an unneeded timeout of a meeting due to inactivity.
@@ -344,6 +352,15 @@ const Device = WebexPlugin.extend({
     this.webex.trigger('meeting ended');
   },
 
+  /**
+   * Set the value of energy forecast config for the current registered device.
+   * @param {boolean} [energyForecastConfig=false] - fetch an energy forecast on the next refresh/register
+   * @returns {void}
+   */
+  setEnergyForecastConfig(energyForecastConfig = false) {
+    this.energyForecastConfig = energyForecastConfig;
+  },
+
   // Registration method members
 
   /* eslint-disable require-jsdoc */
@@ -395,6 +412,11 @@ const Device = WebexPlugin.extend({
         uri: this.url,
         body,
         headers,
+        qs: {
+          includeUpstreamServices: `all${
+            this.config.energyForecast && this.energyForecastConfig ? ',energyforecast' : ''
+          }`,
+        },
       })
         .then((response) => this.processRegistrationSuccess(response))
         .catch((reason) => {
@@ -464,6 +486,11 @@ const Device = WebexPlugin.extend({
         resource: 'devices',
         body,
         headers,
+        qs: {
+          includeUpstreamServices: `all${
+            this.config.energyForecast && this.energyForecastConfig ? ',energyforecast' : ''
+          }`,
+        },
       })
         .catch((error) => {
           this.webex.internal.newMetrics.submitInternalEvent({

packages/@webex/internal-plugin-device/test/unit/spec/device.js

@@ -176,11 +176,14 @@ describe('plugin-device', () => {
     describe('#refresh()', () => {
       let requestSpy;
 
-      const setup = () => {
+      const setup = (config = {}) => {
         sinon.stub(device, 'canRegister').callsFake(() => Promise.resolve());
         sinon.stub(device, 'processRegistrationSuccess').callsFake(() => {});
         requestSpy = sinon.spy(device, 'request');
         device.config.defaults = {};
+        Object.keys((config)).forEach((key) => {
+          device.config[key] = config[key];
+        });
         device.set('registered', true);
       };
 
@@ -207,15 +210,40 @@ describe('plugin-device', () => {
 
         assert.deepEqual(requestSpy.args[0][0].headers, {});
       });
+
+      it('uses the energy forecast config to append upstream services to the outgoing call', async () => {
+        setup({energyForecast: true});
+        device.setEnergyForecastConfig(true);
+
+        await device.register();
+
+        assert.calledWith(requestSpy, sinon.match({
+          qs: { includeUpstreamServices: 'all,energyforecast' }
+        }))
+      });
+
+      it('uses the energy forecast config to not append upstream services to the outgoing call', async () => {
+        setup({energyForecast: true});
+        device.setEnergyForecastConfig(false);
+
+        await device.register();
+
+        assert.calledWith(requestSpy, sinon.match({
+          qs: { includeUpstreamServices: 'all' }
+        }))
+      });
     });
 
     describe('#register()', () => {
-      const setup = () => {
+      const setup = (config = {}) => {
         webex.internal.metrics.submitClientMetrics = sinon.stub();
 
         sinon.stub(device, 'processRegistrationSuccess').callsFake(() => {});
 
         device.config.defaults = {};
+        Object.keys(config).forEach((key) => {
+          device.config[key] = config[key];
+        });
         device.set('registered', false);
       };
 
@@ -284,6 +312,42 @@ describe('plugin-device', () => {
 
       });
 
+      it('uses the energy forecast config to append upstream services to the outgoing call', async () => {
+        setup({energyForecast: true});
+        sinon.stub(device, 'canRegister').callsFake(() => Promise.resolve());
+        const spy = sinon.spy(device, 'request');
+        device.setEnergyForecastConfig(true);
+
+        await device.register();
+
+        assert.calledWith(spy, {
+          method: 'POST',
+          service: 'wdm',
+          resource: 'devices',
+          body: {},
+          headers: {},
+          qs: { includeUpstreamServices: 'all,energyforecast' }
+        } )
+      });
+
+      it('uses the energy forecast config to not append upstream services to the outgoing call', async () => {
+        setup({energyForecast: true});
+        sinon.stub(device, 'canRegister').callsFake(() => Promise.resolve());
+        const spy = sinon.spy(device, 'request');
+        device.setEnergyForecastConfig(false);
+
+        await device.register();
+
+        assert.calledWith(spy, {
+          method: 'POST',
+          service: 'wdm',
+          resource: 'devices',
+          body: {},
+          headers: {},
+          qs: { includeUpstreamServices: 'all' }
+        } )
+      });
+
     });
 
     describe('#processRegistrationSuccess()', () => {

packages/@webex/internal-plugin-metrics/src/behavioral-metrics.ts

@@ -0,0 +1,40 @@
+import {MetricEventProduct, MetricEventAgent, MetricEventVerb, EventPayload} from './metrics.types';
+import GenericMetrics from './generic-metrics';
+
+/**
+ * @description Util class to handle Behavioral Metrics
+ * @export
+ * @class BehavioralMetrics
+ */
+export default class BehavioralMetrics extends GenericMetrics {
+  /**
+   * Submit a behavioral metric to our metrics endpoint.
+   * @param {MetricEventProduct} product the product from which the metric is being submitted, e.g. 'webex' web client, 'wxcc_desktop'
+   * @param {MetricEventAgent} agent the source of the action for this metric
+   * @param {string} target the 'thing' that this metric includes information about
+   * @param {MetricEventVerb} verb the action that this metric includes information about
+   * @param {EventPayload} payload information specific to this event. This should be flat, i.e. it should not include nested objects.
+   * @returns {Promise<any>}
+   */
+  public submitBehavioralEvent({
+    product,
+    agent,
+    target,
+    verb,
+    payload,
+  }: {
+    product: MetricEventProduct;
+    agent: MetricEventAgent;
+    target: string;
+    verb: MetricEventVerb;
+    payload?: EventPayload;
+  }) {
+    const name = `${product}.${agent}.${target}.${verb}`;
+    const event = this.createTaggedEventObject({
+      type: ['behavioral'],
+      name,
+      payload,
+    });
+    this.submitEvent({kind: 'behavioral-events -> ', name, event});
+  }
+}