@wazo/sdk 0.37.36 → 0.37.39

package/lib/simple/room/SipRoom.js

@@ -2218,6 +2218,7 @@ class Session {
 /*       */
 
 const DEFAULT_BACKEND_USER = 'wazo_user';
+const BACKEND_LDAP_USER = 'ldap_user';
 const DETAULT_EXPIRATION = 3600;
 
 var authMethods = (client              , baseUrl        ) => ({
@@ -2267,12 +2268,14 @@ var authMethods = (client              , baseUrl        ) => ({
     backend        ,
     expiration        ,
     isMobile          = false,
+    tenantId         ,
   )                    => {
     const body         = {
       backend: backend || DEFAULT_BACKEND_USER,
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
+      tenant_id: tenantId,
     };
 
     const headers         = {
@@ -5424,6 +5427,7 @@ class ApiClient {
                             
                              
                           
+                           
                     
                        
 
@@ -5464,6 +5468,7 @@ class ApiClient {
     logger$a.info('refresh token callback called', {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
+      refreshTenantId: this.refreshTenantId,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -5477,6 +5482,7 @@ class ApiClient {
       this.refreshBackend,
       this.refreshExpiration,
       this.isMobile,
+      this.refreshTenantId,
     );
 
     logger$a.info('token refreshed', { token: session.token });
@@ -5518,6 +5524,10 @@ class ApiClient {
     this.refreshBackend = refreshBackend;
   }
 
+  setRefreshTenantId(tenantId         ) {
+    this.refreshTenantId = tenantId;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }
@@ -5619,6 +5629,7 @@ var getApiClient = (forServer         )                => {
 
 class InvalidSubscription extends Error {}
 class InvalidAuthorization extends Error {}
+class NoTenantIdError extends Error {}
 
 const logger$9 = IssueReporter$1.loggerFor('simple-auth');
 
@@ -5632,11 +5643,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        ,
@@ -5669,15 +5684,28 @@ 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,
     });
+
+    if (backend) {
+      getApiClient().setRefreshBackend(backend);
+    }
+
+    getApiClient().setRefreshTenantId(tenantId);
+
     return this._onAuthenticated(rawSession);
   }
 
@@ -5904,7 +5932,7 @@ var Auth$1 = global.wazoAuthInstance;
                      
                                         
                     
-                      
+                       
                          
                   
                    
@@ -5924,7 +5952,7 @@ class AdHocAPIConference {
 
                        
 
-                     
+                      
 
                  
 
@@ -5936,7 +5964,7 @@ class AdHocAPIConference {
     participants,
     started,
     finished,
-    startTime,
+    answerTime,
     conferenceId,
     muted,
     paused,
@@ -5946,7 +5974,7 @@ 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;
@@ -5959,7 +5987,7 @@ class AdHocAPIConference {
   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);
@@ -13114,7 +13142,7 @@ class Room {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13140,7 +13168,7 @@ class SwitchboardCall {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13154,7 +13182,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,
@@ -13167,7 +13195,7 @@ class SwitchboardCall {
     callerIdName,
     callerIdNumber,
     participantId,
-    startTime,
+    answerTime,
     state,
     switchboardName,
     switchboardUuid,
@@ -13177,7 +13205,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;
@@ -13814,6 +13842,7 @@ const Wazo = {
   InvalidAuthorization,
   CanceledCallError,
   SFUNotAvailableError,
+  NoTenantIdError,
 };
 
 if (window) {

package/lib/simple/room/Stream.js

@@ -2218,6 +2218,7 @@ class ApiRequester {
 /*       */
 
 const DEFAULT_BACKEND_USER = 'wazo_user';
+const BACKEND_LDAP_USER = 'ldap_user';
 const DETAULT_EXPIRATION = 3600;
 
 var authMethods = (client              , baseUrl        ) => ({
@@ -2267,12 +2268,14 @@ var authMethods = (client              , baseUrl        ) => ({
     backend        ,
     expiration        ,
     isMobile          = false,
+    tenantId         ,
   )                    => {
     const body         = {
       backend: backend || DEFAULT_BACKEND_USER,
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
+      tenant_id: tenantId,
     };
 
     const headers         = {
@@ -5424,6 +5427,7 @@ class ApiClient {
                             
                              
                           
+                           
                     
                        
 
@@ -5464,6 +5468,7 @@ class ApiClient {
     logger$a.info('refresh token callback called', {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
+      refreshTenantId: this.refreshTenantId,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -5477,6 +5482,7 @@ class ApiClient {
       this.refreshBackend,
       this.refreshExpiration,
       this.isMobile,
+      this.refreshTenantId,
     );
 
     logger$a.info('token refreshed', { token: session.token });
@@ -5518,6 +5524,10 @@ class ApiClient {
     this.refreshBackend = refreshBackend;
   }
 
+  setRefreshTenantId(tenantId         ) {
+    this.refreshTenantId = tenantId;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }
@@ -5619,6 +5629,7 @@ var getApiClient = (forServer         )                => {
 
 class InvalidSubscription extends Error {}
 class InvalidAuthorization extends Error {}
+class NoTenantIdError extends Error {}
 
 const logger$9 = IssueReporter$1.loggerFor('simple-auth');
 
@@ -5632,11 +5643,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        ,
@@ -5669,15 +5684,28 @@ 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,
     });
+
+    if (backend) {
+      getApiClient().setRefreshBackend(backend);
+    }
+
+    getApiClient().setRefreshTenantId(tenantId);
+
     return this._onAuthenticated(rawSession);
   }
 
@@ -5904,7 +5932,7 @@ var Auth$1 = global.wazoAuthInstance;
                      
                                         
                     
-                      
+                       
                          
                   
                    
@@ -5924,7 +5952,7 @@ class AdHocAPIConference {
 
                        
 
-                     
+                      
 
                  
 
@@ -5936,7 +5964,7 @@ class AdHocAPIConference {
     participants,
     started,
     finished,
-    startTime,
+    answerTime,
     conferenceId,
     muted,
     paused,
@@ -5946,7 +5974,7 @@ 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;
@@ -5959,7 +5987,7 @@ class AdHocAPIConference {
   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);
@@ -13195,7 +13223,7 @@ class Room {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13221,7 +13249,7 @@ class SwitchboardCall {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13235,7 +13263,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,
@@ -13248,7 +13276,7 @@ class SwitchboardCall {
     callerIdName,
     callerIdNumber,
     participantId,
-    startTime,
+    answerTime,
     state,
     switchboardName,
     switchboardUuid,
@@ -13258,7 +13286,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;
@@ -13895,6 +13923,7 @@ const Wazo = {
   InvalidAuthorization,
   CanceledCallError,
   SFUNotAvailableError,
+  NoTenantIdError,
 };
 
 if (window) {

package/lib/simple/room/__tests__/RemoteParticipant.test.js

@@ -2218,6 +2218,7 @@ class ApiRequester {
 /*       */
 
 const DEFAULT_BACKEND_USER = 'wazo_user';
+const BACKEND_LDAP_USER = 'ldap_user';
 const DETAULT_EXPIRATION = 3600;
 
 var authMethods = (client              , baseUrl        ) => ({
@@ -2267,12 +2268,14 @@ var authMethods = (client              , baseUrl        ) => ({
     backend        ,
     expiration        ,
     isMobile          = false,
+    tenantId         ,
   )                    => {
     const body         = {
       backend: backend || DEFAULT_BACKEND_USER,
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
+      tenant_id: tenantId,
     };
 
     const headers         = {
@@ -5424,6 +5427,7 @@ class ApiClient {
                             
                              
                           
+                           
                     
                        
 
@@ -5464,6 +5468,7 @@ class ApiClient {
     logger$a.info('refresh token callback called', {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
+      refreshTenantId: this.refreshTenantId,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -5477,6 +5482,7 @@ class ApiClient {
       this.refreshBackend,
       this.refreshExpiration,
       this.isMobile,
+      this.refreshTenantId,
     );
 
     logger$a.info('token refreshed', { token: session.token });
@@ -5518,6 +5524,10 @@ class ApiClient {
     this.refreshBackend = refreshBackend;
   }
 
+  setRefreshTenantId(tenantId         ) {
+    this.refreshTenantId = tenantId;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }
@@ -5619,6 +5629,7 @@ var getApiClient = (forServer         )                => {
 
 class InvalidSubscription extends Error {}
 class InvalidAuthorization extends Error {}
+class NoTenantIdError extends Error {}
 
 const logger$9 = IssueReporter$1.loggerFor('simple-auth');
 
@@ -5632,11 +5643,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        ,
@@ -5669,15 +5684,28 @@ 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,
     });
+
+    if (backend) {
+      getApiClient().setRefreshBackend(backend);
+    }
+
+    getApiClient().setRefreshTenantId(tenantId);
+
     return this._onAuthenticated(rawSession);
   }
 
@@ -5904,7 +5932,7 @@ var Auth$1 = global.wazoAuthInstance;
                      
                                         
                     
-                      
+                       
                          
                   
                    
@@ -5924,7 +5952,7 @@ class AdHocAPIConference {
 
                        
 
-                     
+                      
 
                  
 
@@ -5936,7 +5964,7 @@ class AdHocAPIConference {
     participants,
     started,
     finished,
-    startTime,
+    answerTime,
     conferenceId,
     muted,
     paused,
@@ -5946,7 +5974,7 @@ 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;
@@ -5959,7 +5987,7 @@ class AdHocAPIConference {
   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);
@@ -13253,7 +13281,7 @@ class Room {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13279,7 +13307,7 @@ class SwitchboardCall {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13293,7 +13321,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,
@@ -13306,7 +13334,7 @@ class SwitchboardCall {
     callerIdName,
     callerIdNumber,
     participantId,
-    startTime,
+    answerTime,
     state,
     switchboardName,
     switchboardUuid,
@@ -13316,7 +13344,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;
@@ -13953,6 +13981,7 @@ const Wazo = {
   InvalidAuthorization,
   CanceledCallError,
   SFUNotAvailableError,
+  NoTenantIdError,
 };
 
 if (window) {