@wazo/sdk 0.38.7 → 0.38.8

package/lib/web-rtc-client.js

@@ -3213,6 +3213,70 @@ class ExternalApp {
 
 //      
 
+class MeetingAuthorization {
+                      
+               
+                   
+                   
+                 
+
+  constructor({
+    meetingUuid,
+    uuid,
+    userUuid,
+    userName,
+  }         = {}) {
+    this.meetingUuid = meetingUuid;
+    this.uuid = uuid;
+    this.userUuid = userUuid;
+    this.userName = userName;
+  }
+
+  setStatus(status        ) {
+    this.status = status;
+  }
+
+  getStatus() {
+    return this.status;
+  }
+
+  static parse(plain                         ) {
+    const {
+      meeting_uuid: meetingUuid,
+      uuid,
+      guest_uuid: userUuid,
+      guest_name: userName,
+    } = plain;
+
+    return new MeetingAuthorization({
+      meetingUuid,
+      uuid,
+      userUuid,
+      userName,
+    });
+  }
+
+  static parseMany(items                           )                              {
+    if (!items) {
+      return [];
+    }
+    return items.map(MeetingAuthorization.parse);
+  }
+}
+
+//      
+
+                                      
+               
+                                
+                      
+ 
+
+                                      
+                
+                                 
+ 
+
                                        
                                   
                            
@@ -3223,6 +3287,7 @@ class ExternalApp {
                 
                       
                         
+                                 
  
 
 class Meeting {
@@ -3237,6 +3302,8 @@ class Meeting {
                       
                             
                      
+                                                    
+                                
 
   static parse(plain                         )          {
     return new Meeting({
@@ -3249,6 +3316,7 @@ class Meeting {
       extension: plain.exten,
       persistent: plain.persistent,
       creationTime: moment__default['default'](plain.creation_time).toDate(),
+      requireAuthorization: plain.require_authorization,
     });
   }
 
@@ -3273,6 +3341,7 @@ class Meeting {
     extension,
     persistent,
     creationTime,
+    requireAuthorization,
   }         = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
@@ -3283,6 +3352,7 @@ class Meeting {
     this.extension = extension;
     this.persistent = persistent;
     this.creationTime = creationTime;
+    this.requireAuthorization = requireAuthorization;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Meeting';
@@ -3293,8 +3363,32 @@ class Meeting {
     const [username, secret] = atob(this.guestSipAuthorization).split(':');
     return { username, secret };
   }
+
 }
 
+//      
+
+const camelToUnderscore = (key        ) => {
+  if (typeof key !== 'string') {
+    throw new Error('Input is not a string');
+  }
+  return key.charAt(0).toLowerCase() + key.substring(1).replace(/([A-Z])/g, '_$1').toLowerCase();
+};
+
+//      
+
+const convertKeysFromCamelToUnderscore = (args        ) => {
+  if (!args || typeof args !== 'object' || Array.isArray(args)) {
+    throw new Error('Input is not an object');
+  }
+
+  return Object.keys(args).reduce((acc, key) => {
+    acc[camelToUnderscore(key)] = typeof args[key] === 'object' && !Array.isArray(args[key])
+      ? convertKeysFromCamelToUnderscore(args[key]) : args[key];
+    return acc;
+  }, {});
+};
+
 /*       */
 
 var confdMethods = (client              , baseUrl        ) => ({
@@ -3363,8 +3457,18 @@ var confdMethods = (client              , baseUrl        ) => ({
   getMyMeetings: ()                   =>
     client.get(`${baseUrl}/users/me/meetings`).then(response => Meeting.parseMany(response.items)),
 
-  createMyMeeting: (name        , persistent         )                   =>
-    client.post(`${baseUrl}/users/me/meetings`, { name, persistent }).then(Meeting.parse),
+  createMyMeeting: (args                        )                   =>
+    client
+      .post(`${baseUrl}/users/me/meetings`, convertKeysFromCamelToUnderscore(args))
+      .then(Meeting.parse),
+
+  updateMyMeeting: (meetingUuid        , data                        )                   =>
+    client.put(
+      `${baseUrl}/users/me/meetings/${meetingUuid}`,
+      convertKeysFromCamelToUnderscore(data),
+      null,
+      ApiRequester.successResponseParser,
+    ),
 
   deleteMyMeeting: (meetingUuid        )                   =>
     client.delete(`${baseUrl}/users/me/meetings/${meetingUuid}`, null),
@@ -3372,8 +3476,36 @@ var confdMethods = (client              , baseUrl        ) => ({
   getMeeting: (meetingUuid        )                   =>
     client.get(`${baseUrl}/meetings/${meetingUuid}`, null).then(Meeting.parse),
 
+  meetingAuthorizations: (meetingUuid        )                                       =>
+    client.get(`${baseUrl}/users/me/meetings/${meetingUuid}/authorizations`, null).then(MeetingAuthorization.parseMany),
+
+  meetingAuthorizationReject: (meetingUuid        , authorizationUuid        )                   =>
+    client.put(
+      `${baseUrl}/users/me/meetings/${meetingUuid}/authorizations/${authorizationUuid}/reject`,
+      {},
+      null,
+      ApiRequester.successResponseParser,
+    ),
+
+  meetingAuthorizationAccept: (meetingUuid        , authorizationUuid        )                   =>
+    client.put(
+      `${baseUrl}/users/me/meetings/${meetingUuid}/authorizations/${authorizationUuid}/accept`,
+      {},
+      null,
+      ApiRequester.successResponseParser,
+    ),
+
   guestGetMeeting: (meetingUuid        )                   =>
     client.get(`${baseUrl}/guests/me/meetings/${meetingUuid}`, null).then(Meeting.parse),
+
+  guestAuthorizationRequest: (userUuid        , meetingUuid        , username        )            =>
+    client
+      .post(`${baseUrl}/guests/${userUuid}/meetings/${meetingUuid}/authorizations`, { guest_name: username })
+      .then(MeetingAuthorization.parse),
+
+  guestAuthorizationCheck: (userUuid        , meetingUuid        , authorizationUuid        )            =>
+    client.get(`${baseUrl}/guests/${userUuid}/meetings/${meetingUuid}/authorizations/${authorizationUuid}`, null),
+
 });
 
 //      
@@ -4812,6 +4944,14 @@ var calldMethods = (client              , baseUrl        ) => ({
   getMeetingParticipantsAsUser: async (meetingUuid        )                  =>
     client.get(`${baseUrl}/users/me/meetings/${meetingUuid}/participants`),
 
+  banMeetingParticipant: (meetingUuid        , participantUuid        ) =>
+    client.delete(
+      `${baseUrl}/users/me/meetings/${meetingUuid}/participants/${participantUuid}`,
+      null,
+      null,
+      ApiRequester.successResponseParser,
+    ),
+
   listTrunks: () => client.get(`${baseUrl}/trunks`),
 
   mute: (callId        ) =>
@@ -6455,7 +6595,7 @@ class WebRTCClient extends Emitter {
     });
   }
 
-  changeAudioInputDevice(id        , session          , force          ) {
+  async changeAudioInputDevice(id        , session          , force          ) {
     const currentId = this.getAudioDeviceId();
     logger.info('setting audio input device', { id, currentId, session: !!session });
 
@@ -6463,33 +6603,50 @@ class WebRTCClient extends Emitter {
       return null;
     }
 
+    // in order to handle an audio track change for default devices
+    // we need the actual id of the device (not 'default')
+    let deviceId = id;
+    if (id === 'default' && navigator.mediaDevices) {
+      const devices = await navigator.mediaDevices.enumerateDevices();
+      const defaultDevice = devices.find(device => device.deviceId === 'default');
+      if (defaultDevice) {
+        const deviceLabel = defaultDevice.label.replace('Default - ', '');
+        const targetDevice = devices.find(device => device.label === deviceLabel);
+        if (targetDevice) {
+          deviceId = targetDevice.deviceId;
+          if (!force && deviceId === currentId) {
+            return null;
+          }
+        }
+      }
+    }
+
     // let's update the local audio value
     if (this.audio) {
       this.audio = {
         deviceId: {
-          exact: id,
+          exact: deviceId,
         },
       };
     }
 
-    if (session) {
+    if (session && navigator.mediaDevices) {
       const sdh = session.sessionDescriptionHandler;
       const pc = sdh.peerConnection;
 
-      // $FlowFixMe
-      return navigator.mediaDevices.getUserMedia({ audio: { deviceId: { exact: id } } }).then(async stream => {
-        const audioTrack = stream.getAudioTracks()[0];
-        const sender = pc && pc.getSenders().find(s => audioTrack && s && s.track && s.track.kind === audioTrack.kind);
+      const constraints = { audio: { deviceId: { exact: deviceId } } };
+      const stream = await navigator.mediaDevices.getUserMedia(constraints);
+      const audioTrack = stream.getAudioTracks()[0];
+      const sender = pc && pc.getSenders().find(s => audioTrack && s && s.track && s.track.kind === audioTrack.kind);
 
-        if (sender) {
-          if (sender.track) {
-            audioTrack.enabled = sender.track.enabled;
-          }
-          sender.replaceTrack(audioTrack);
+      if (sender) {
+        if (sender.track) {
+          audioTrack.enabled = sender.track.enabled;
         }
+        sender.replaceTrack(audioTrack);
+      }
 
-        return stream;
-      });
+      return stream;
     }
   }
 
@@ -6509,14 +6666,14 @@ class WebRTCClient extends Emitter {
       return null;
     }
 
-    // let's update the local video value
-    if (this.video) {
-      this.video = {
-        deviceId: {
-          exact: id,
-        },
-      };
-    }
+    // let's make sure we don't lose other video constraints settings -- width, height, frameRate...
+    const videoObject = typeof this.video === 'object' ? this.video : {};
+    this.video = {
+      ...videoObject,
+      deviceId: {
+        exact: id,
+      },
+    };
   }
 
   changeSessionVideoInputDevice(id         , session         ) {

package/lib/websocket-client.js

@@ -617,6 +617,7 @@ const AGENT_UNPAUSED = 'agent_unpaused';
 const CONFERENCE_ADHOC_PARTICIPANT_LEFT = 'conference_adhoc_participant_left';
 const CONFERENCE_ADHOC_DELETED = 'conference_adhoc_deleted';
 const MEETING_USER_PROGRESS = 'meeting_user_progress';
+const MEETING_USER_GUEST_AUTHORIZATION_CREATED = 'meeting_user_guest_authorization_created';
 
 const BLACKLIST_EVENTS = [
   CHAT_MESSAGE_SENT,
@@ -968,6 +969,7 @@ WebSocketClient.eventLists = [
   CONFERENCE_ADHOC_PARTICIPANT_LEFT,
   CONFERENCE_ADHOC_DELETED,
   MEETING_USER_PROGRESS,
+  MEETING_USER_GUEST_AUTHORIZATION_CREATED,
 ];
 
 exports.AGENT_PAUSED = AGENT_PAUSED;
@@ -1021,6 +1023,7 @@ exports.FAX_OUTBOUND_USER_FAILED = FAX_OUTBOUND_USER_FAILED;
 exports.FAX_OUTBOUND_USER_SUCCEEDED = FAX_OUTBOUND_USER_SUCCEEDED;
 exports.HEARTBEAT_ENGINE_VERSION = HEARTBEAT_ENGINE_VERSION;
 exports.LINE_STATUS_UPDATED = LINE_STATUS_UPDATED;
+exports.MEETING_USER_GUEST_AUTHORIZATION_CREATED = MEETING_USER_GUEST_AUTHORIZATION_CREATED;
 exports.MEETING_USER_PARTICIPANT_JOINED = MEETING_USER_PARTICIPANT_JOINED;
 exports.MEETING_USER_PARTICIPANT_LEFT = MEETING_USER_PARTICIPANT_LEFT;
 exports.MEETING_USER_PROGRESS = MEETING_USER_PROGRESS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.38.7",
+  "version": "0.38.8",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "dist/wazo-sdk.js",
   "author": "Wazo (http://wazo.io)",
@@ -100,4 +100,4 @@
   "react-native": {
     "node-fetch/lib/index": false
   }
-}
+}

package/src/__tests__/web-rtc-client.test.js

@@ -69,27 +69,70 @@ describe('changeAudioInputDevice', () => {
     });
   });
 
+  const devices = [
+    { deviceId: 'default', kind: 'audioinput', label: 'Default - Fake Microphone', groupId: 'fak3Gr0up3' },
+    { deviceId: 'fak3d3v1c3', kind: 'audioinput', label: 'Fake Microphone', groupId: 'fak3Gr0up3' },
+  ];
+  const enumerateDevicesMock = jest.fn(async () => {
+    return new Promise(resolve => {
+      resolve(devices);
+    });
+  });
+
   Object.defineProperty(global.navigator, 'mediaDevices', {
     value: {
       getUserMedia: getUserMediaMock,
+      enumerateDevices: enumerateDevicesMock,
     },
   });
 
   it('should change the audio input track if the provided id is different', async () => {
     client.setMediaConstraints(constraints);
     expect(client.getAudioDeviceId()).toBe(defaultId);
-    expect(client.changeAudioInputDevice(deviceId, session)).toBeTruthy();
+    const result = await client.changeAudioInputDevice(deviceId, session);
+    expect(result).toBeTruthy();
   });
 
   it('should NOT change the audio input track if the provided id is the same', async () => {
     client.setMediaConstraints(constraints);
     expect(client.getAudioDeviceId()).toBe(defaultId);
-    expect(client.changeAudioInputDevice(defaultId, session)).toBeFalsy();
+    const result = await client.changeAudioInputDevice(defaultId, session);
+    expect(result).toBeFalsy();
   });
 
   it('should change the audio input track if the provided id is the same and force param is TRUE', async () => {
     client.setMediaConstraints(constraints);
     expect(client.getAudioDeviceId()).toBe(defaultId);
-    expect(client.changeAudioInputDevice(defaultId, session, true)).toBeTruthy();
+    const result = await client.changeAudioInputDevice(defaultId, session, true);
+    expect(result).toBeTruthy();
+  });
+
+  describe('setVideoInputDevice', () => {
+    it('should retain its original video values', () => {
+      const video = { height: { min: 480, max: 720 }, width: { min: 640, max: 1280 } };
+
+      client.video = video;
+      client.setVideoInputDevice(deviceId);
+      expect(client.video).toEqual({ ...video, deviceId: { exact: deviceId } });
+    });
+
+    it('should set deviceId when video\'s original value is true', () => {
+      client.video = true;
+      client.setVideoInputDevice(deviceId);
+      expect(client.video).toEqual({ deviceId: { exact: deviceId } });
+    });
+
+    it('should set deviceId when video\'s original value is not set', () => {
+      client.video = undefined;
+      client.setVideoInputDevice(deviceId);
+      expect(client.video).toEqual({ deviceId: { exact: deviceId } });
+    });
+
+    it('should NOT set deviceId when its value does not change', () => {
+      client.video = { deviceId: { exact: deviceId } };
+      const result = client.setVideoInputDevice(deviceId);
+      expect(result).toEqual(null);
+      expect(client.video).toEqual({ deviceId: { exact: deviceId } });
+    });
   });
 });

package/src/api/calld.js

@@ -137,6 +137,14 @@ export default (client: ApiRequester, baseUrl: string) => ({
   getMeetingParticipantsAsUser: async (meetingUuid: string): Promise<Object> =>
     client.get(`${baseUrl}/users/me/meetings/${meetingUuid}/participants`),
 
+  banMeetingParticipant: (meetingUuid: string, participantUuid: string) =>
+    client.delete(
+      `${baseUrl}/users/me/meetings/${meetingUuid}/participants/${participantUuid}`,
+      null,
+      null,
+      ApiRequester.successResponseParser,
+    ),
+
   listTrunks: () => client.get(`${baseUrl}/trunks`),
 
   mute: (callId: string) =>

package/src/api/confd.js

@@ -1,10 +1,13 @@
 /* @flow */
 import ApiRequester from '../utils/api-requester';
 import type { UUID, ListConfdUsersResponse, ListApplicationsResponse } from '../domain/types';
+import type { MeetingCreateArguments, MeetingUpdateArguments } from '../domain/Meeting';
 import Profile from '../domain/Profile';
 import SipLine from '../domain/SipLine';
 import ExternalApp from '../domain/ExternalApp';
 import Meeting from '../domain/Meeting';
+import MeetingAuthorization from '../domain/MeetingAuthorization';
+import { convertKeysFromCamelToUnderscore } from '../utils/object';
 
 export default (client: ApiRequester, baseUrl: string) => ({
   listUsers: (): Promise<ListConfdUsersResponse> => client.get(`${baseUrl}/users`, null),
@@ -72,8 +75,18 @@ export default (client: ApiRequester, baseUrl: string) => ({
   getMyMeetings: (): Promise<Meeting> =>
     client.get(`${baseUrl}/users/me/meetings`).then(response => Meeting.parseMany(response.items)),
 
-  createMyMeeting: (name: string, persistent: boolean): Promise<Meeting> =>
-    client.post(`${baseUrl}/users/me/meetings`, { name, persistent }).then(Meeting.parse),
+  createMyMeeting: (args: MeetingCreateArguments): Promise<Meeting> =>
+    client
+      .post(`${baseUrl}/users/me/meetings`, convertKeysFromCamelToUnderscore(args))
+      .then(Meeting.parse),
+
+  updateMyMeeting: (meetingUuid: string, data: MeetingUpdateArguments): Promise<Boolean> =>
+    client.put(
+      `${baseUrl}/users/me/meetings/${meetingUuid}`,
+      convertKeysFromCamelToUnderscore(data),
+      null,
+      ApiRequester.successResponseParser,
+    ),
 
   deleteMyMeeting: (meetingUuid: string): Promise<Meeting> =>
     client.delete(`${baseUrl}/users/me/meetings/${meetingUuid}`, null),
@@ -81,6 +94,34 @@ export default (client: ApiRequester, baseUrl: string) => ({
   getMeeting: (meetingUuid: string): Promise<Meeting> =>
     client.get(`${baseUrl}/meetings/${meetingUuid}`, null).then(Meeting.parse),
 
+  meetingAuthorizations: (meetingUuid: string): Promise<Array<MeetingAuthorization>> =>
+    client.get(`${baseUrl}/users/me/meetings/${meetingUuid}/authorizations`, null).then(MeetingAuthorization.parseMany),
+
+  meetingAuthorizationReject: (meetingUuid: string, authorizationUuid: string): Promise<Boolean> =>
+    client.put(
+      `${baseUrl}/users/me/meetings/${meetingUuid}/authorizations/${authorizationUuid}/reject`,
+      {},
+      null,
+      ApiRequester.successResponseParser,
+    ),
+
+  meetingAuthorizationAccept: (meetingUuid: string, authorizationUuid: string): Promise<Boolean> =>
+    client.put(
+      `${baseUrl}/users/me/meetings/${meetingUuid}/authorizations/${authorizationUuid}/accept`,
+      {},
+      null,
+      ApiRequester.successResponseParser,
+    ),
+
   guestGetMeeting: (meetingUuid: string): Promise<Meeting> =>
     client.get(`${baseUrl}/guests/me/meetings/${meetingUuid}`, null).then(Meeting.parse),
+
+  guestAuthorizationRequest: (userUuid: string, meetingUuid: string, username: string): Promise<> =>
+    client
+      .post(`${baseUrl}/guests/${userUuid}/meetings/${meetingUuid}/authorizations`, { guest_name: username })
+      .then(MeetingAuthorization.parse),
+
+  guestAuthorizationCheck: (userUuid: string, meetingUuid: string, authorizationUuid: string): Promise<> =>
+    client.get(`${baseUrl}/guests/${userUuid}/meetings/${meetingUuid}/authorizations/${authorizationUuid}`, null),
+
 });

package/src/domain/Meeting.js

@@ -3,6 +3,19 @@ import moment from 'moment';
 
 import newFrom from '../utils/new-from';
 
+import MeetingAuthorization from './MeetingAuthorization';
+
+export type MeetingCreateArguments = {
+  name: string,
+  requireAuthorization: boolean,
+  persistent: boolean,
+}
+
+export type MeetingUpdateArguments = {
+  name?: string,
+  requireAuthorization?: boolean,
+}
+
 export type MeetingCreationResponse = {
   guest_sip_authorization: string,
   ingress_http_uri: string,
@@ -13,6 +26,7 @@ export type MeetingCreationResponse = {
   exten: string,
   persistent: boolean,
   creation_time: string,
+  require_authorization: boolean,
 }
 
 export default class Meeting {
@@ -27,6 +41,8 @@ export default class Meeting {
   persistent: boolean;
   ownerUuids: Array<string>;
   creationTime: Date;
+  pendingAuthorizations: Array<MeetingAuthorization>
+  requireAuthorization: boolean;
 
   static parse(plain: MeetingCreationResponse): Meeting {
     return new Meeting({
@@ -39,6 +55,7 @@ export default class Meeting {
       extension: plain.exten,
       persistent: plain.persistent,
       creationTime: moment(plain.creation_time).toDate(),
+      requireAuthorization: plain.require_authorization,
     });
   }
 
@@ -63,6 +80,7 @@ export default class Meeting {
     extension,
     persistent,
     creationTime,
+    requireAuthorization,
   }: Object = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
@@ -73,6 +91,7 @@ export default class Meeting {
     this.extension = extension;
     this.persistent = persistent;
     this.creationTime = creationTime;
+    this.requireAuthorization = requireAuthorization;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Meeting';
@@ -83,4 +102,5 @@ export default class Meeting {
     const [username, secret] = atob(this.guestSipAuthorization).split(':');
     return { username, secret };
   }
+
 }

package/src/domain/MeetingAuthorization.js

@@ -0,0 +1,67 @@
+// @flow
+
+export type RawMeetingAuthorization = {
+  created_at: string,
+  meeting_uuid: string,
+  uuid: string,
+  guest_uuid: string,
+  guest_name: string,
+}
+
+export const PENDING = 'pending';
+export const ACCEPTED = 'accepted';
+export const REJECTED = 'rejected';
+export const POST_PROCESSING = 'post_processing';
+export const POST_PROCESSED_SUCCESS = 'post_processed_success';
+export const POST_PROCESSED_ERROR = 'post_processed_error';
+
+export default class MeetingAuthorization {
+  meetingUuid: string;
+  uuid: string;
+  userUuid: string;
+  userName: string;
+  status: string;
+
+  constructor({
+    meetingUuid,
+    uuid,
+    userUuid,
+    userName,
+  }: Object = {}) {
+    this.meetingUuid = meetingUuid;
+    this.uuid = uuid;
+    this.userUuid = userUuid;
+    this.userName = userName;
+  }
+
+  setStatus(status: string) {
+    this.status = status;
+  }
+
+  getStatus() {
+    return this.status;
+  }
+
+  static parse(plain: RawMeetingAuthorization) {
+    const {
+      meeting_uuid: meetingUuid,
+      uuid,
+      guest_uuid: userUuid,
+      guest_name: userName,
+    } = plain;
+
+    return new MeetingAuthorization({
+      meetingUuid,
+      uuid,
+      userUuid,
+      userName,
+    });
+  }
+
+  static parseMany(items: RawMeetingAuthorization[]): Array<MeetingAuthorization> {
+    if (!items) {
+      return [];
+    }
+    return items.map(MeetingAuthorization.parse);
+  }
+}