@wazo/sdk 0.37.36 → 0.37.39

package/lib/service/CallApi.js

@@ -2784,12 +2784,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         = {
@@ -4572,6 +4574,7 @@ class ApiClient {
                             
                              
                           
+                           
                     
                        
 
@@ -4612,6 +4615,7 @@ class ApiClient {
     logger.info('refresh token callback called', {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
+      refreshTenantId: this.refreshTenantId,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -4625,6 +4629,7 @@ class ApiClient {
       this.refreshBackend,
       this.refreshExpiration,
       this.isMobile,
+      this.refreshTenantId,
     );
 
     logger.info('token refreshed', { token: session.token });
@@ -4666,6 +4671,10 @@ class ApiClient {
     this.refreshBackend = refreshBackend;
   }
 
+  setRefreshTenantId(tenantId         ) {
+    this.refreshTenantId = tenantId;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }

package/lib/service/getApiClient.js

@@ -2246,12 +2246,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         = {
@@ -4574,6 +4576,7 @@ class ApiClient {
                             
                              
                           
+                           
                     
                        
 
@@ -4614,6 +4617,7 @@ class ApiClient {
     logger.info('refresh token callback called', {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
+      refreshTenantId: this.refreshTenantId,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -4627,6 +4631,7 @@ class ApiClient {
       this.refreshBackend,
       this.refreshExpiration,
       this.isMobile,
+      this.refreshTenantId,
     );
 
     logger.info('token refreshed', { token: session.token });
@@ -4668,6 +4673,10 @@ class ApiClient {
     this.refreshBackend = refreshBackend;
   }
 
+  setRefreshTenantId(tenantId         ) {
+    this.refreshTenantId = tenantId;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }

package/lib/simple/Auth.js

@@ -2220,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        ) => ({
@@ -2269,12 +2270,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         = {
@@ -5426,6 +5429,7 @@ class ApiClient {
                             
                              
                           
+                           
                     
                        
 
@@ -5466,6 +5470,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,
     });
@@ -5479,6 +5484,7 @@ class ApiClient {
       this.refreshBackend,
       this.refreshExpiration,
       this.isMobile,
+      this.refreshTenantId,
     );
 
     logger$a.info('token refreshed', { token: session.token });
@@ -5520,6 +5526,10 @@ class ApiClient {
     this.refreshBackend = refreshBackend;
   }
 
+  setRefreshTenantId(tenantId         ) {
+    this.refreshTenantId = tenantId;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }
@@ -5642,7 +5652,7 @@ var getApiClient = (forServer         )                => {
                      
                                         
                     
-                      
+                       
                          
                   
                    
@@ -5662,7 +5672,7 @@ class AdHocAPIConference {
 
                        
 
-                     
+                      
 
                  
 
@@ -5674,7 +5684,7 @@ class AdHocAPIConference {
     participants,
     started,
     finished,
-    startTime,
+    answerTime,
     conferenceId,
     muted,
     paused,
@@ -5684,7 +5694,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;
@@ -5697,7 +5707,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);
@@ -12991,7 +13001,7 @@ class Room {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13017,7 +13027,7 @@ class SwitchboardCall {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13031,7 +13041,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,
@@ -13044,7 +13054,7 @@ class SwitchboardCall {
     callerIdName,
     callerIdNumber,
     participantId,
-    startTime,
+    answerTime,
     state,
     switchboardName,
     switchboardUuid,
@@ -13054,7 +13064,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;
@@ -13691,6 +13701,7 @@ const Wazo = {
   InvalidAuthorization,
   CanceledCallError,
   SFUNotAvailableError,
+  NoTenantIdError,
 };
 
 if (window) {
@@ -13704,6 +13715,7 @@ if (global) {
 
 class InvalidSubscription extends Error {}
 class InvalidAuthorization extends Error {}
+class NoTenantIdError extends Error {}
 
 const logger = IssueReporter$1.loggerFor('simple-auth');
 
@@ -13717,11 +13729,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        ,
@@ -13754,15 +13770,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);
   }
 
@@ -13966,4 +13995,5 @@ var Auth$1 = global.wazoAuthInstance;
 
 exports.InvalidAuthorization = InvalidAuthorization;
 exports.InvalidSubscription = InvalidSubscription;
+exports.NoTenantIdError = NoTenantIdError;
 exports.default = Auth$1;

package/lib/simple/Configuration.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;
   }
@@ -5640,7 +5650,7 @@ var getApiClient = (forServer         )                => {
                      
                                         
                     
-                      
+                       
                          
                   
                    
@@ -5660,7 +5670,7 @@ class AdHocAPIConference {
 
                        
 
-                     
+                      
 
                  
 
@@ -5672,7 +5682,7 @@ class AdHocAPIConference {
     participants,
     started,
     finished,
-    startTime,
+    answerTime,
     conferenceId,
     muted,
     paused,
@@ -5682,7 +5692,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;
@@ -5695,7 +5705,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);
@@ -12972,7 +12982,7 @@ class Room {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -12998,7 +13008,7 @@ class SwitchboardCall {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13012,7 +13022,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,
@@ -13025,7 +13035,7 @@ class SwitchboardCall {
     callerIdName,
     callerIdNumber,
     participantId,
-    startTime,
+    answerTime,
     state,
     switchboardName,
     switchboardUuid,
@@ -13035,7 +13045,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;
@@ -13672,6 +13682,7 @@ const Wazo = {
   InvalidAuthorization,
   CanceledCallError,
   SFUNotAvailableError,
+  NoTenantIdError,
 };
 
 if (window) {
@@ -13685,6 +13696,7 @@ if (global) {
 
 class InvalidSubscription extends Error {}
 class InvalidAuthorization extends Error {}
+class NoTenantIdError extends Error {}
 
 const logger = IssueReporter$1.loggerFor('simple-auth');
 
@@ -13698,11 +13710,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        ,
@@ -13735,15 +13751,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);
   }
 

package/lib/simple/Directory.js

@@ -2244,12 +2244,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         = {
@@ -4572,6 +4574,7 @@ class ApiClient {
                             
                              
                           
+                           
                     
                        
 
@@ -4612,6 +4615,7 @@ class ApiClient {
     logger.info('refresh token callback called', {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
+      refreshTenantId: this.refreshTenantId,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -4625,6 +4629,7 @@ class ApiClient {
       this.refreshBackend,
       this.refreshExpiration,
       this.isMobile,
+      this.refreshTenantId,
     );
 
     logger.info('token refreshed', { token: session.token });
@@ -4666,6 +4671,10 @@ class ApiClient {
     this.refreshBackend = refreshBackend;
   }
 
+  setRefreshTenantId(tenantId         ) {
+    this.refreshTenantId = tenantId;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }