@wazo/sdk 0.37.35 → 0.37.38

package/lib/simple/utils.js

@@ -396,6 +396,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -432,6 +433,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -463,6 +465,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -479,6 +482,7 @@ class Profile {
       lines: plain.lines.map(line => Line.parse(line)),
       username: plain.username,
       mobileNumber: plain.mobile_phone_number || '',
+      ringSeconds: plain.ring_seconds,
       forwards: [
         ForwardOption.parse(plain.forwards.unconditional, FORWARD_KEYS.UNCONDITIONAL),
         ForwardOption.parse(plain.forwards.noanswer, FORWARD_KEYS.NO_ANSWER),
@@ -515,6 +519,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -536,6 +541,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }
@@ -2214,6 +2220,7 @@ class ApiRequester {
 /*       */
 
 const DEFAULT_BACKEND_USER = 'wazo_user';
+const BACKEND_LDAP_USER = 'ldap_user';
 const DETAULT_EXPIRATION = 3600;
 
 var authMethods = (client              , baseUrl        ) => ({
@@ -3292,6 +3299,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -3354,6 +3362,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -3385,6 +3395,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -3413,6 +3424,7 @@ class CallSession {
     this.videoRemotelyDowngraded = videoRemotelyDowngraded;
     this.sipSession = sipSession;
     this.answerTime = answerTime || this.answerTime;
+    this.conference = conference;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'CallSession';
@@ -3470,6 +3482,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -3546,6 +3562,10 @@ class CallSession {
     return this.sipStatus === sessionState.SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -3637,6 +3657,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }
@@ -3732,7 +3753,7 @@ class Recording {
              
                            
                       
-                           
+                            
                                   
                               
                          
@@ -5601,6 +5622,7 @@ var getApiClient = (forServer         )                => {
 
 class InvalidSubscription extends Error {}
 class InvalidAuthorization extends Error {}
+class NoTenantIdError extends Error {}
 
 const logger$9 = IssueReporter$1.loggerFor('simple-auth');
 
@@ -5614,11 +5636,15 @@ class Auth {
                                     
                          
                   
+                       
+                       
 
   constructor() {
     this.expiration = DETAULT_EXPIRATION;
     this.authenticated = false;
     this.minSubscriptionType = null;
+    this.BACKEND_WAZO = DEFAULT_BACKEND_USER;
+    this.BACKEND_LDAP = BACKEND_LDAP_USER;
   }
 
   init(clientId        ,
@@ -5651,12 +5677,18 @@ class Auth {
     setFetchOptions(options);
   }
 
-  async logIn(username        , password        ) {
+  async logIn(username        , password        , backend         , tenantId         ) {
+    if (backend && backend !== this.BACKEND_WAZO && !tenantId) {
+      throw new NoTenantIdError('No tenant id');
+    }
+
     this.authenticated = false;
     this.session = null;
     const rawSession = await getApiClient().auth.logIn({
       username,
       password,
+      backend,
+      tenantId,
       expiration: this.expiration,
       mobile: this.mobile,
     });
@@ -5886,7 +5918,7 @@ var Auth$1 = global.wazoAuthInstance;
                      
                                         
                     
-                      
+                       
                          
                   
                    
@@ -5906,7 +5938,7 @@ class AdHocAPIConference {
 
                        
 
-                     
+                      
 
                  
 
@@ -5918,7 +5950,7 @@ class AdHocAPIConference {
     participants,
     started,
     finished,
-    startTime,
+    answerTime,
     conferenceId,
     muted,
     paused,
@@ -5928,16 +5960,20 @@ class AdHocAPIConference {
     this.participants = participants || {};
     this.started = started || false;
     this.finished = finished || false;
-    this.startTime = startTime;
+    this.answerTime = answerTime;
     this.conferenceId = conferenceId || '';
     this.muted = muted || false;
     this.paused = paused || false;
+
+    if (this.host) {
+      this.host.setIsConference(true);
+    }
   }
 
   async start() {
     this.started = true;
     // $FlowFixMe
-    this.startTime = Object.values(this.participants).length ? Object.values(this.participants)[0].startTime : null;
+    this.answerTime = Object.values(this.participants).length ? Object.values(this.participants)[0].answerTime : null;
 
     const participantIds = Object.keys(this.participants);
     const conference = await getApiClient().calld.createAdHocConference(this.host.callId, participantIds);
@@ -9641,7 +9677,11 @@ class WebRTCPhone extends Emitter                  {
   accept(callSession             , cameraEnabled          )                         {
     logger$7.info('WebRTC phone - accept call', { id: callSession ? callSession.getId() : 'n/a', cameraEnabled });
     if (this.currentSipSession) {
-      this.holdSipSession(this.currentSipSession, this.currentCallSession, true);
+      this.holdSipSession(
+        this.currentSipSession,
+        this.currentCallSession,
+        true,
+      );
     }
 
     if (!callSession) {
@@ -9734,22 +9774,22 @@ class WebRTCPhone extends Emitter                  {
     }
   }
 
-  hold(callSession             , withEvent          = true, isConference          = false)                {
+  hold(callSession             , withEvent          = true)                {
     logger$7.info('WebRTC hold', { id: callSession.getId() });
 
     const sipSession = this.findSipSession(callSession);
 
-    return sipSession ? this.holdSipSession(sipSession, callSession, withEvent, isConference) : null;
+    return sipSession ? this.holdSipSession(sipSession, callSession, withEvent) : null;
   }
 
   // @Deprecated
-  unhold(callSession             , withEvent          = true, isConference          = false)                {
+  unhold(callSession             , withEvent          = true)                {
     console.warn('Please note that `phone.unhold()` is being deprecated; `phone.resume()` is the preferred method');
 
-    return this.resume(callSession, isConference, withEvent);
+    return this.resume(callSession, withEvent);
   }
 
-  resume(callSession              , isConference          = false, withEvent          = true)               {
+  resume(callSession              , withEvent          = true)               {
     logger$7.info('WebRTC resume called', { id: callSession ? callSession.getId() : null });
 
     const sipSession = this.findSipSession(callSession);
@@ -9762,10 +9802,14 @@ class WebRTCPhone extends Emitter                  {
     // Hold current session if different from the current one (we don't want 2 sessions active at the same time).
     if (this.currentSipSession && this.currentSipSession.id !== sipSession.id) {
       logger$7.info('WebRTC hold call after resume', { id: this.currentSipSession.id });
-      this.holdSipSession(this.currentSipSession, this.currentCallSession);
+      this.holdSipSession(
+        this.currentSipSession,
+        this.currentCallSession,
+        withEvent,
+      );
     }
 
-    const promise = this.unholdSipSession(sipSession, callSession, withEvent, isConference);
+    const promise = this.unholdSipSession(sipSession, callSession, withEvent);
     this.currentSipSession = sipSession;
     if (callSession) {
       this.currentCallSession = callSession;
@@ -9778,7 +9822,6 @@ class WebRTCPhone extends Emitter                  {
     sipSession         ,
     callSession              ,
     withEvent          = true,
-    isConference          = false,
   )               {
     if (!sipSession) {
       return new Promise((resolve, reject) => reject(new Error('No session to hold')));
@@ -9799,6 +9842,8 @@ class WebRTCPhone extends Emitter                  {
       await this.client.downgradeToAudio(sipSession);
     }
 
+    const isConference = !!callSession && callSession.isConference();
+
     const promise = this.client.hold(sipSession, isConference, hasVideo);
     if (withEvent) {
       this.eventEmitter.emit(ON_CALL_HELD, this._createCallSession(sipSession, callSession));
@@ -9811,11 +9856,13 @@ class WebRTCPhone extends Emitter                  {
     sipSession         ,
     callSession              ,
     withEvent          = true,
-    isConference          = false,
   )               {
     if (!sipSession) {
       return new Promise((resolve, reject) => reject(new Error('No session to unhold')));
     }
+
+    const isConference = !!callSession && callSession.isConference();
+
     const sessionId = this.getSipSessionId(sipSession);
     logger$7.info('WebRTC unhold sip session', { sessionId, isConference });
 
@@ -9957,7 +10004,11 @@ class WebRTCPhone extends Emitter                  {
       await this.client.register();
     }
     if (this.currentSipSession) {
-      this.holdSipSession(this.currentSipSession, this.currentCallSession, true).catch(e => {
+      this.holdSipSession(
+        this.currentSipSession,
+        this.currentCallSession,
+        true,
+      ).catch(e => {
         logger$7.warn('Unable to hold current session when making another call', e);
       });
     }
@@ -9972,6 +10023,7 @@ class WebRTCPhone extends Emitter                  {
       return Promise.resolve(null);
     }
     const callSession = this._createOutgoingCallSession(sipSession, cameraEnabled || false);
+    callSession.setIsConference(conference);
     callSession.creationTime = new Date();
     this._updateCallSession(callSession);
 
@@ -10550,6 +10602,7 @@ class WebRTCPhone extends Emitter                  {
       recording: fromSession ? fromSession.isRecording() : false,
       recordingPaused: false, // @TODO
       sipSession,
+      conference: !!fromSession && fromSession.isConference(),
       ...extra,
     });
 
@@ -10806,16 +10859,16 @@ class Phone extends Emitter {
     }
   }
 
-  hold(callSession             , isConference          = false) {
-    return this.phone && this.phone.hold(callSession, true, isConference);
+  hold(callSession             ) {
+    return this.phone && this.phone.hold(callSession, true);
   }
 
-  unhold(callSession             , isConference          = false) {
-    return this.phone && this.phone.unhold(callSession, true, isConference);
+  unhold(callSession             ) {
+    return this.phone && this.phone.unhold(callSession, true);
   }
 
-  resume(callSession             , isConference          = false) {
-    return this.phone && this.phone.resume(callSession, isConference);
+  resume(callSession             ) {
+    return this.phone && this.phone.resume(callSession);
   }
 
   reject(callSession             ) {
@@ -13198,7 +13251,7 @@ class Room {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13224,7 +13277,7 @@ class SwitchboardCall {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13238,7 +13291,7 @@ class SwitchboardCall {
       callerIdName: plain.caller_id_name || null,
       callerIdNumber: plain.caller_id_number || null,
       participantId: plain.participantId || null,
-      startTime: plain.startTime,
+      answerTime: plain.startTime,
       state: plain.state,
       switchboardName: plain.switchboardName,
       switchboardUuid: plain.switchboardUuid,
@@ -13251,7 +13304,7 @@ class SwitchboardCall {
     callerIdName,
     callerIdNumber,
     participantId,
-    startTime,
+    answerTime,
     state,
     switchboardName,
     switchboardUuid,
@@ -13261,7 +13314,7 @@ class SwitchboardCall {
     this.callerIdName = callerIdName;
     this.callerIdNumber = callerIdNumber;
     this.participantId = participantId;
-    this.startTime = startTime;
+    this.answerTime = answerTime;
     this.state = state;
     this.switchboardName = switchboardName;
     this.switchboardUuid = switchboardUuid;
@@ -13898,6 +13951,7 @@ const Wazo = {
   InvalidAuthorization,
   CanceledCallError,
   SFUNotAvailableError,
+  NoTenantIdError,
 };
 
 if (window) {

package/lib/web-rtc-client.js

@@ -1611,6 +1611,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -1647,6 +1648,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -1678,6 +1680,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -1694,6 +1697,7 @@ class Profile {
       lines: plain.lines.map(line => Line.parse(line)),
       username: plain.username,
       mobileNumber: plain.mobile_phone_number || '',
+      ringSeconds: plain.ring_seconds,
       forwards: [
         ForwardOption.parse(plain.forwards.unconditional, FORWARD_KEYS.UNCONDITIONAL),
         ForwardOption.parse(plain.forwards.noanswer, FORWARD_KEYS.NO_ANSWER),
@@ -1730,6 +1734,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -1751,6 +1756,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }
@@ -3854,7 +3860,7 @@ class Recording {
              
                            
                       
-                           
+                            
                                   
                               
                          

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.37.35",
+  "version": "0.37.38",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "dist/wazo-sdk.js",
   "author": "Wazo (http://wazo.io)",

package/src/api/auth.js

@@ -16,7 +16,8 @@ import type {
 } from '../domain/types';
 import Session from '../domain/Session';
 
-const DEFAULT_BACKEND_USER = 'wazo_user';
+export const DEFAULT_BACKEND_USER = 'wazo_user';
+export const BACKEND_LDAP_USER = 'ldap_user';
 export const DETAULT_EXPIRATION = 3600;
 
 export default (client: ApiRequester, baseUrl: string) => ({

package/src/domain/AdHocAPIConference.js

@@ -27,7 +27,7 @@ export type ConferenceArguments = {
   finished?: boolean,
   participants: {[string]: CallSession};
   started?: boolean,
-  startTime?: ?number,
+  answerTime?: ?number,
   conferenceId?: ?string,
   muted?: boolean,
   paused?: boolean,
@@ -47,7 +47,7 @@ export default class AdHocAPIConference {
 
   conferenceId: string;
 
-  startTime: ?number;
+  answerTime: ?number;
 
   muted: boolean;
 
@@ -59,7 +59,7 @@ export default class AdHocAPIConference {
     participants,
     started,
     finished,
-    startTime,
+    answerTime,
     conferenceId,
     muted,
     paused,
@@ -69,16 +69,20 @@ export default class AdHocAPIConference {
     this.participants = participants || {};
     this.started = started || false;
     this.finished = finished || false;
-    this.startTime = startTime;
+    this.answerTime = answerTime;
     this.conferenceId = conferenceId || '';
     this.muted = muted || false;
     this.paused = paused || false;
+
+    if (this.host) {
+      this.host.setIsConference(true);
+    }
   }
 
   async start() {
     this.started = true;
     // $FlowFixMe
-    this.startTime = Object.values(this.participants).length ? Object.values(this.participants)[0].startTime : null;
+    this.answerTime = Object.values(this.participants).length ? Object.values(this.participants)[0].answerTime : null;
 
     const participantIds = Object.keys(this.participants);
     const conference = await getApiClient().calld.createAdHocConference(this.host.callId, participantIds);

package/src/domain/CallLog.js

@@ -19,7 +19,7 @@ type CallLogResponse = {
   id: number,
   source_extension: string,
   source_name: string,
-  source_user_uuid: string,
+  source_user_uuid: ?string,
   recordings: RecordingResponse[],
   requested_extension: string,
   requested_name: string,

package/src/domain/CallSession.js

@@ -35,6 +35,7 @@ type CallSessionArguments = {
   recording: boolean,
   recordingPaused: boolean,
   sipSession?: Session,
+  conference: boolean,
 };
 
 export default class CallSession {
@@ -100,6 +101,8 @@ export default class CallSession {
 
   sipSession: Session;
 
+  conference: boolean;
+
   constructor({
     answered,
     answeredBySystem,
@@ -128,6 +131,7 @@ export default class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }: CallSessionArguments) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -156,6 +160,7 @@ export default class CallSession {
     this.videoRemotelyDowngraded = videoRemotelyDowngraded;
     this.sipSession = sipSession;
     this.answerTime = answerTime || this.answerTime;
+    this.conference = conference;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'CallSession';
@@ -213,6 +218,10 @@ export default class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference: boolean) {
+    this.conference = conference;
+  }
+
   isIncoming(): boolean {
     return !this.isCaller && !this.answered;
   }
@@ -289,6 +298,10 @@ export default class CallSession {
     return this.sipStatus === SessionState.Terminated;
   }
 
+  isConference(): boolean {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -380,6 +393,7 @@ export default class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }