@wazo/sdk 0.37.35 → 0.37.38

package/esm/domain/__tests__/CallSession.test.js

@@ -59,6 +59,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -121,6 +122,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -152,6 +155,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -180,6 +184,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';
@@ -237,6 +242,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -313,6 +322,10 @@ class CallSession {
     return this.sipStatus === SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -404,6 +417,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }

package/esm/domain/__tests__/IndirectTransfer.test.js

@@ -59,6 +59,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -121,6 +122,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -152,6 +155,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -180,6 +184,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';
@@ -237,6 +242,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -313,6 +322,10 @@ class CallSession {
     return this.sipStatus === SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -404,6 +417,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }

package/esm/domain/__tests__/Profile.test.js

@@ -191,6 +191,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -227,6 +228,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -258,6 +260,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -274,6 +277,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),
@@ -310,6 +314,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -331,6 +336,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }

package/esm/domain/__tests__/Room.test.js

@@ -59,6 +59,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -121,6 +122,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -152,6 +155,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -180,6 +184,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';
@@ -237,6 +242,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -313,6 +322,10 @@ class CallSession {
     return this.sipStatus === SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -404,6 +417,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }

package/esm/domain/__tests__/Session.test.js

@@ -205,6 +205,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -241,6 +242,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -272,6 +274,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -288,6 +291,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),
@@ -324,6 +328,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -345,6 +350,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }

package/esm/index.js

@@ -1072,6 +1072,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -1108,6 +1109,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -1139,6 +1141,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -1155,6 +1158,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),
@@ -1191,6 +1195,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -1212,6 +1217,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }
@@ -2203,6 +2209,7 @@ class Session {
 /*       */
 
 const DEFAULT_BACKEND_USER = 'wazo_user';
+const BACKEND_LDAP_USER = 'ldap_user';
 const DETAULT_EXPIRATION = 3600;
 
 var authMethods = (client              , baseUrl        ) => ({
@@ -3281,6 +3288,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -3343,6 +3351,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -3374,6 +3384,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -3402,6 +3413,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';
@@ -3459,6 +3471,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -3535,6 +3551,10 @@ class CallSession {
     return this.sipStatus === SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -3626,6 +3646,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }
@@ -3721,7 +3742,7 @@ class Recording {
              
                            
                       
-                           
+                            
                                   
                               
                          
@@ -9181,7 +9202,7 @@ class Room$1 {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -9207,7 +9228,7 @@ class SwitchboardCall {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -9221,7 +9242,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,
@@ -9234,7 +9255,7 @@ class SwitchboardCall {
     callerIdName,
     callerIdNumber,
     participantId,
-    startTime,
+    answerTime,
     state,
     switchboardName,
     switchboardUuid,
@@ -9244,7 +9265,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;
@@ -10092,7 +10113,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) {
@@ -10185,22 +10210,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);
@@ -10213,10 +10238,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;
@@ -10229,7 +10258,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')));
@@ -10250,6 +10278,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));
@@ -10262,11 +10292,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 });
 
@@ -10408,7 +10440,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);
       });
     }
@@ -10423,6 +10459,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);
 
@@ -11001,6 +11038,7 @@ class WebRTCPhone extends Emitter                  {
       recording: fromSession ? fromSession.isRecording() : false,
       recordingPaused: false, // @TODO
       sipSession,
+      conference: !!fromSession && fromSession.isConference(),
       ...extra,
     });
 
@@ -11659,6 +11697,7 @@ const getCallableNumber = (number        , country         )          => {
 
 class InvalidSubscription extends Error {}
 class InvalidAuthorization extends Error {}
+class NoTenantIdError extends Error {}
 
 const logger$5 = IssueReporter$1.loggerFor('simple-auth');
 
@@ -11672,11 +11711,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        ,
@@ -11709,12 +11752,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,
     });
@@ -11944,7 +11993,7 @@ var Auth$1 = global.wazoAuthInstance;
                      
                                         
                     
-                      
+                       
                          
                   
                    
@@ -11964,7 +12013,7 @@ class AdHocAPIConference {
 
                        
 
-                     
+                      
 
                  
 
@@ -11976,7 +12025,7 @@ class AdHocAPIConference {
     participants,
     started,
     finished,
-    startTime,
+    answerTime,
     conferenceId,
     muted,
     paused,
@@ -11986,16 +12035,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);
@@ -12284,16 +12337,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             ) {
@@ -14040,6 +14093,7 @@ const Wazo = {
   InvalidAuthorization,
   CanceledCallError,
   SFUNotAvailableError,
+  NoTenantIdError,
 };
 
 if (window) {