@webex/plugin-meetings 1.151.1 → 1.151.5

package/src/meeting-info/utilv2.js

@@ -21,7 +21,8 @@ import {
   MEET,
   MEET_M,
   HTTPS_PROTOCOL,
-  UUID_REG
+  UUID_REG,
+  VALID_EMAIL_ADDRESS
 } from '../constants';
 import ParameterError from '../common/errors/parameter';
 import LoggerProxy from '../common/logs/logger-proxy';
@@ -116,8 +117,27 @@ MeetingInfoUtil.getSipUriFromHydraPersonId = (destination, webex) => webex.peopl
 
 
 MeetingInfoUtil.getDestinationType = async (from) => {
-  const {destination, type, webex} = from;
+  const {type, webex} = from;
+  let {destination} = from;
+
+  if (type === _PERSONAL_ROOM_) { // this case checks if your type is personal room
+    if (!destination) { // if we are not getting anything in desination we fetch org and user ids from webex instance
+      destination = {
+        userId: webex.internal.device.userId,
+        orgId: webex.internal.device.orgId
+      };
+    }
+    else {
+      const options = VALID_EMAIL_ADDRESS.test(destination) ? {email: destination} : {id: destination};// we are assuming userId as default
+      const res = await webex.people.list(options);
+
+      let {orgId, id: userId} = res.items[0];
 
+      userId = deconstructHydraId(userId).id;
+      orgId = deconstructHydraId(orgId).id;
+      destination = {userId, orgId};
+    }
+  }
   if (type) {
     return {
       destination,
@@ -193,15 +213,17 @@ MeetingInfoUtil.getDestinationType = async (from) => {
  */
 MeetingInfoUtil.getRequestBody = (options) => {
   const {type, destination} = options;
-  const body = {};
+  const body = {
+    supportHostKey: true
+  };
 
   switch (type) {
     case _SIP_URI_:
       body.sipUrl = destination;
       break;
     case _PERSONAL_ROOM_:
-      body.userId = destination;
-      body.orgId = ''; // TODO: when to use the org iD (fetch others PMR)
+      body.userId = destination.userId;
+      body.orgId = destination.orgId;
       break;
     case _MEETING_ID_:
       body.meetingKey = destination;

package/src/meetings/index.js

@@ -174,6 +174,8 @@ export default class Meetings extends WebexPlugin {
         getSupportedDevice: Media.getSupportedDevice
       };
 
+      LoggerProxy.set(this.webex.logger);
+
       this.onReady();
       MeetingsUtil.checkH264Support({disableNotifications: true});
       Metrics.initialSetup(this.meetingCollection, this.webex);
@@ -371,7 +373,6 @@ export default class Meetings extends WebexPlugin {
       this.webex.once(READY, () => {
         StaticConfig.set(this.config);
         LoggerConfig.set(this.config.logging);
-        LoggerProxy.set(this.webex.logger);
 
         /**
        * The MeetingInfo object to interact with server

package/test/integration/spec/space-meeting.js

@@ -68,9 +68,10 @@ skipInNode(describe)('plugin-meetings', () => {
             {scope: chris.webex.meetings, event: 'meeting:added', user: chris}
           ])
         ]).then(() => {
-          const {meetingNumber} = bob.meeting.meetingInfo;
+          // TODO Renenable after unified flag is enabled
+          // const {meetingNumber} = bob.meeting.meetingInfo;
 
-          assert(meetingNumber === alice.meeting.meetingNumber, 'meetingNumber matches alice meeting number');
+          // assert(meetingNumber === alice.meeting.meetingNumber, 'meetingNumber matches alice meeting number');
         })));
 
     xit('Should fetch user info using user hydra id with the new api', () => alice.webex.rooms.create({title: 'sample'})

package/test/unit/spec/meeting-info/utilv2.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
  */
 
-import {assert} from '@webex/test-helper-chai';
+import {assert, expect} from '@webex/test-helper-chai';
 import sinon from 'sinon';
 import {
   _MEETING_ID_,
@@ -14,8 +14,23 @@ import {
   _MEETING_UUID_
 } from '@webex/plugin-meetings/src/constants';
 import MeetingInfoUtil from '@webex/plugin-meetings/src/meeting-info/utilv2';
+import LoggerProxy from '@webex/plugin-meetings/src/common/logs/logger-proxy';
+import LoggerConfig from '@webex/plugin-meetings/src/common/logs/logger-config';
 
 describe('plugin-meetings', () => {
+  const logger = {
+    log: () => {},
+    error: () => {},
+    warn: () => {},
+    trace: () => {},
+    debug: () => {}
+  };
+
+  beforeEach(() => {
+    LoggerConfig.set({verboseEvents: true, enable: false});
+    LoggerProxy.set(logger);
+  });
+
   describe('Meeting Info Utils V2', () => {
     beforeEach(() => {
       MeetingInfoUtil.getHydraId = sinon.stub().returns(false);
@@ -68,17 +83,78 @@ describe('plugin-meetings', () => {
         assert.equal(res.type, _CONVERSATION_URL_);
         assert.equal(res.destination, 'https://conv-a.wbx2.com/conversation/api/v1/conversations/bfb49280');
       });
+
+      describe('PMR', () => {
+        const mockedListReturn = {userId: '01824b9b-adef-4b10-b5c1-8a2fe2fb7c0e', orgId: '1eb65fdf-9643-417f-9974-ad72cae0e10f'};
+        const mockedList = {
+          items: [{
+            id: 'Y2lzY29zcGFyazovL3VzL1BFT1BMRS8wMTgyNGI5Yi1hZGVmLTRiMTAtYjVjMS04YTJmZTJmYjdjMGU',
+            orgId: 'Y2lzY29zcGFyazovL3VzL09SR0FOSVpBVElPTi8xZWI2NWZkZi05NjQzLTQxN2YtOTk3NC1hZDcyY2FlMGUxMGY'
+          }]
+
+        };
+
+        it('should return a userID and orgID without passing a destination', async () => {
+          const res = await MeetingInfoUtil.getDestinationType({
+            type: _PERSONAL_ROOM_,
+            webex: {
+              internal: {
+                device: {
+                  userId: '01824b9b-adef-4b10-b5c1-8a2fe2fb7c0e',
+                  orgId: '1eb65fdf-9643-417f-9974-ad72cae0e10f'
+                }
+              }
+            }
+          });
+
+          expect(res.destination.userId).to.equal('01824b9b-adef-4b10-b5c1-8a2fe2fb7c0e');
+          expect(res.destination.orgId).to.equal('1eb65fdf-9643-417f-9974-ad72cae0e10f');
+        });
+
+        it('should return a userID and orgID when passing an email', async () => {
+          const res = await MeetingInfoUtil.getDestinationType({
+            type: _PERSONAL_ROOM_,
+            destination: 'amritesi@cisco.com',
+            webex: {
+              people: {list: sinon.stub().returns(mockedList)}
+
+            }
+          });
+          const {orgId, userId} = res.destination;
+
+          expect(userId).to.equal(mockedListReturn.userId);
+          expect(orgId).to.equal(mockedListReturn.orgId);
+        });
+
+        it('should return a userID and orgID when passing an id', async () => {
+          const res = await MeetingInfoUtil.getDestinationType({
+            type: _PERSONAL_ROOM_,
+            destination: '01824b9b-adef-4b10-b5c1-8a2fe2fb7c0e',
+            webex: {
+              people: {list: sinon.stub().returns(mockedList)}
+            }
+
+          });
+          const {orgId, userId} = res.destination;
+
+          expect(userId).to.equal(mockedListReturn.userId);
+          expect(orgId).to.equal(mockedListReturn.orgId);
+        });
+      });
     });
 
     describe('#getRequestBody', () => {
       it('for _PERSONAL_ROOM_', () => {
         const res = MeetingInfoUtil.getRequestBody({
           type: _PERSONAL_ROOM_,
-          destination: 'userId_1234'
+          destination: {
+            userId: '01824b9b-adef-4b10-b5c1-8a2fe2fb7c0e',
+            orgId: '1eb65fdf-9643-417f-9974-ad72cae0e10f'
+          }
         });
 
-        assert.equal(res.orgId, '');
-        assert.equal(res.userId, 'userId_1234');
+        assert.equal(res.orgId, '1eb65fdf-9643-417f-9974-ad72cae0e10f');
+        assert.equal(res.userId, '01824b9b-adef-4b10-b5c1-8a2fe2fb7c0e');
       });
 
       it('for _MEETING_ID_', () => {