@wazo/sdk 0.38.9 → 0.38.10

package/esm/index.js

@@ -2230,6 +2230,7 @@ var authMethods = (client              , baseUrl        ) => ({
                        
                      
                       
+                        
    )                    {
     const body         = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -2250,9 +2251,14 @@ var authMethods = (client              , baseUrl        ) => ({
     }
 
     if (params.tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling logIn() method, use `domainName` instead.');
       body.tenant_id = params.tenantId;
     }
 
+    if (params.domainName) {
+      body.domain_name = params.domainName;
+    }
+
     return client.post(`${baseUrl}/token`, body, headers).then(response => Session.parse(response));
   },
 
@@ -2265,6 +2271,7 @@ var authMethods = (client              , baseUrl        ) => ({
     expiration        ,
     isMobile          = false,
     tenantId         ,
+    domainName         ,
   )                    => {
     const body         = {
       backend: backend || DEFAULT_BACKEND_USER,
@@ -2274,9 +2281,14 @@ var authMethods = (client              , baseUrl        ) => ({
     };
 
     if (tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling refreshToken() method, use `domainName` instead.');
       body.tenant_id = tenantId;
     }
 
+    if (domainName) {
+      body.domain_name = domainName;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -4123,6 +4135,7 @@ global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
 global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
+global.wazoRefreshDomainName = global.wazoRefreshDomainName || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
 global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
@@ -4147,9 +4160,14 @@ const setRefreshToken = (newRefreshToken         , forServer          = null) =>
 };
 
 const setRefreshTenantId = (refreshTenantId         , forServer          = null) => {
+  console.warn('Use of `setRefreshTenantId` is deprecated, please use `setRefreshDomainName` instead');
   global.wazoRefreshTenantId[forServer] = refreshTenantId;
 };
 
+const setRefreshDomainName = (refreshDomainName         , forServer          = null) => {
+  global.wazoRefreshDomainName[forServer] = refreshDomainName;
+};
+
 const setOnRefreshToken = (onRefreshToken          , forServer          = null) => {
   global.wazoOnRefreshToken[forServer] = onRefreshToken;
 };
@@ -4168,6 +4186,7 @@ const setFetchOptions = (fetchOptions        , forServer          = null) => {
 
 const fillClient = (apiClient               ) => {
   const { server, token, clientId } = apiClient.client;
+  const tenantId = global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId;
 
   //  try with null server when dealing with non-related server info
   apiClient.setToken(global.wazoClientToken[server] || global.wazoClientToken[null] || token);
@@ -4176,8 +4195,12 @@ const fillClient = (apiClient               ) => {
 
   apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
 
-  apiClient.setRefreshTenantId(
-    global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId,
+  if (tenantId) {
+    apiClient.setRefreshTenantId(tenantId);
+  }
+
+  apiClient.setRefreshDomainName(
+    global.wazoRefreshDomainName[server] || global.wazoRefreshDomainName[null] || apiClient.refreshDomainName,
   );
 
   apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
@@ -5675,6 +5698,7 @@ class ApiClient {
                              
                           
                            
+                             
                     
                        
 
@@ -5716,6 +5740,7 @@ class ApiClient {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
       refreshTenantId: this.refreshTenantId,
+      refreshDomainName: this.refreshDomainName,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -5731,6 +5756,7 @@ class ApiClient {
         this.refreshExpiration,
         this.isMobile,
         this.refreshTenantId,
+        this.refreshDomainName,
       );
 
       logger$a.info('token refreshed', { token: session.token });
@@ -5784,9 +5810,14 @@ class ApiClient {
   }
 
   setRefreshTenantId(tenantId         ) {
+    console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead');
     this.refreshTenantId = tenantId;
   }
 
+  setRefreshDomainName(domainName         ) {
+    this.refreshDomainName = domainName;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }
@@ -11944,6 +11975,7 @@ const getCallableNumber = (number        , country         )          => {
 class InvalidSubscription extends Error {}
 class InvalidAuthorization extends Error {}
 class NoTenantIdError extends Error {}
+class NoDomainNameError extends Error {}
 
 const logger$5 = IssueReporter$1.loggerFor('simple-auth');
 
@@ -12007,9 +12039,24 @@ class Auth {
     setFetchOptions(options);
   }
 
-  async logIn(username        , password        , backend         , tenantId         ) {
-    if (backend && backend !== this.BACKEND_WAZO && !tenantId) {
-      throw new NoTenantIdError('No tenant id');
+  async logIn(username        , password        , backend         , extra                  ) {
+    let tenantId = null;
+    let domainName = null;
+    if (typeof extra === 'string') {
+      tenantId = extra;
+    }
+    if (extra && typeof extra === 'object') {
+      domainName = extra.domainName;
+    }
+
+    if (backend && backend !== this.BACKEND_WAZO && !tenantId && !domainName) {
+      if (!tenantId) {
+        throw new NoTenantIdError('No tenant id');
+      }
+
+      if (!domainName) {
+        throw new NoDomainNameError('No domain name');
+      }
     }
 
     this.authenticated = false;
@@ -12019,6 +12066,7 @@ class Auth {
       password,
       backend,
       tenantId,
+      domainName,
       expiration: this.expiration,
       mobile: this.mobile,
     });
@@ -12027,7 +12075,13 @@ class Auth {
       getApiClient().setRefreshBackend(backend);
     }
 
-    getApiClient().setRefreshTenantId(tenantId);
+    if (tenantId) {
+      getApiClient().setRefreshTenantId(tenantId);
+    }
+
+    if (domainName) {
+      getApiClient().setRefreshDomainName(domainName);
+    }
 
     return this._onAuthenticated(rawSession);
   }
@@ -12126,11 +12180,18 @@ class Auth {
   }
 
   setRefreshTenantId(refreshTenantId        ) {
+    console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead.');
     setRefreshTenantId(refreshTenantId);
 
     getApiClient().setRefreshTenantId(refreshTenantId);
   }
 
+  setRefreshDomainName(domainName        ) {
+    setRefreshDomainName(domainName);
+
+    getApiClient().setRefreshDomainName(domainName);
+  }
+
   forceRefreshToken() {
     getApiClient().forceRefreshToken();
   }
@@ -14448,6 +14509,7 @@ class Softphone {
     wrapUpDuration,
     enableAgent = true,
     tenantId,
+    domainName,
     debug = false,
   }         = {}) {
     this.url = url || 'https://softphone.wazo.io';
@@ -14472,8 +14534,12 @@ class Softphone {
       config.port = port;
     }
     if (tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling `Softphone.init()`, use `domainName` instead');
       config.tenantId = tenantId;
     }
+    if (domainName) {
+      config.domainName = domainName;
+    }
     if (wrapUpDuration) {
       config.wrapUpDuration = wrapUpDuration;
     }
@@ -14794,6 +14860,7 @@ const Wazo = {
   CanceledCallError,
   SFUNotAvailableError,
   NoTenantIdError,
+  NoDomainNameError,
 };
 
 if (window) {

package/esm/service/CallApi.js

@@ -2755,6 +2755,7 @@ var authMethods = (client              , baseUrl        ) => ({
                        
                      
                       
+                        
    )                    {
     const body         = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -2775,9 +2776,14 @@ var authMethods = (client              , baseUrl        ) => ({
     }
 
     if (params.tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling logIn() method, use `domainName` instead.');
       body.tenant_id = params.tenantId;
     }
 
+    if (params.domainName) {
+      body.domain_name = params.domainName;
+    }
+
     return client.post(`${baseUrl}/token`, body, headers).then(response => Session.parse(response));
   },
 
@@ -2790,6 +2796,7 @@ var authMethods = (client              , baseUrl        ) => ({
     expiration        ,
     isMobile          = false,
     tenantId         ,
+    domainName         ,
   )                    => {
     const body         = {
       backend: backend || DEFAULT_BACKEND_USER,
@@ -2799,9 +2806,14 @@ var authMethods = (client              , baseUrl        ) => ({
     };
 
     if (tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling refreshToken() method, use `domainName` instead.');
       body.tenant_id = tenantId;
     }
 
+    if (domainName) {
+      body.domain_name = domainName;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -4724,6 +4736,7 @@ class ApiClient {
                              
                           
                            
+                             
                     
                        
 
@@ -4765,6 +4778,7 @@ class ApiClient {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
       refreshTenantId: this.refreshTenantId,
+      refreshDomainName: this.refreshDomainName,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -4780,6 +4794,7 @@ class ApiClient {
         this.refreshExpiration,
         this.isMobile,
         this.refreshTenantId,
+        this.refreshDomainName,
       );
 
       logger.info('token refreshed', { token: session.token });
@@ -4833,9 +4848,14 @@ class ApiClient {
   }
 
   setRefreshTenantId(tenantId         ) {
+    console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead');
     this.refreshTenantId = tenantId;
   }
 
+  setRefreshDomainName(domainName         ) {
+    this.refreshDomainName = domainName;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }
@@ -4860,6 +4880,7 @@ global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
 global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
+global.wazoRefreshDomainName = global.wazoRefreshDomainName || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
 global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
@@ -4869,6 +4890,7 @@ global.wazoFetchOptions = global.wazoFetchOptions || {};
 
 const fillClient = (apiClient               ) => {
   const { server, token, clientId } = apiClient.client;
+  const tenantId = global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId;
 
   //  try with null server when dealing with non-related server info
   apiClient.setToken(global.wazoClientToken[server] || global.wazoClientToken[null] || token);
@@ -4877,8 +4899,12 @@ const fillClient = (apiClient               ) => {
 
   apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
 
-  apiClient.setRefreshTenantId(
-    global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId,
+  if (tenantId) {
+    apiClient.setRefreshTenantId(tenantId);
+  }
+
+  apiClient.setRefreshDomainName(
+    global.wazoRefreshDomainName[server] || global.wazoRefreshDomainName[null] || apiClient.refreshDomainName,
   );
 
   apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);

package/esm/service/getApiClient.js

@@ -2209,6 +2209,7 @@ var authMethods = (client              , baseUrl        ) => ({
                        
                      
                       
+                        
    )                    {
     const body         = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -2229,9 +2230,14 @@ var authMethods = (client              , baseUrl        ) => ({
     }
 
     if (params.tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling logIn() method, use `domainName` instead.');
       body.tenant_id = params.tenantId;
     }
 
+    if (params.domainName) {
+      body.domain_name = params.domainName;
+    }
+
     return client.post(`${baseUrl}/token`, body, headers).then(response => Session.parse(response));
   },
 
@@ -2244,6 +2250,7 @@ var authMethods = (client              , baseUrl        ) => ({
     expiration        ,
     isMobile          = false,
     tenantId         ,
+    domainName         ,
   )                    => {
     const body         = {
       backend: backend || DEFAULT_BACKEND_USER,
@@ -2253,9 +2260,14 @@ var authMethods = (client              , baseUrl        ) => ({
     };
 
     if (tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling refreshToken() method, use `domainName` instead.');
       body.tenant_id = tenantId;
     }
 
+    if (domainName) {
+      body.domain_name = domainName;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -4724,6 +4736,7 @@ class ApiClient {
                              
                           
                            
+                             
                     
                        
 
@@ -4765,6 +4778,7 @@ class ApiClient {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
       refreshTenantId: this.refreshTenantId,
+      refreshDomainName: this.refreshDomainName,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -4780,6 +4794,7 @@ class ApiClient {
         this.refreshExpiration,
         this.isMobile,
         this.refreshTenantId,
+        this.refreshDomainName,
       );
 
       logger.info('token refreshed', { token: session.token });
@@ -4833,9 +4848,14 @@ class ApiClient {
   }
 
   setRefreshTenantId(tenantId         ) {
+    console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead');
     this.refreshTenantId = tenantId;
   }
 
+  setRefreshDomainName(domainName         ) {
+    this.refreshDomainName = domainName;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }
@@ -4860,6 +4880,7 @@ global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
 global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
+global.wazoRefreshDomainName = global.wazoRefreshDomainName || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
 global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
@@ -4884,9 +4905,14 @@ const setRefreshToken = (newRefreshToken         , forServer          = null) =>
 };
 
 const setRefreshTenantId = (refreshTenantId         , forServer          = null) => {
+  console.warn('Use of `setRefreshTenantId` is deprecated, please use `setRefreshDomainName` instead');
   global.wazoRefreshTenantId[forServer] = refreshTenantId;
 };
 
+const setRefreshDomainName = (refreshDomainName         , forServer          = null) => {
+  global.wazoRefreshDomainName[forServer] = refreshDomainName;
+};
+
 const setOnRefreshToken = (onRefreshToken          , forServer          = null) => {
   global.wazoOnRefreshToken[forServer] = onRefreshToken;
 };
@@ -4913,6 +4939,7 @@ const setFetchOptions = (fetchOptions        , forServer          = null) => {
 
 const fillClient = (apiClient               ) => {
   const { server, token, clientId } = apiClient.client;
+  const tenantId = global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId;
 
   //  try with null server when dealing with non-related server info
   apiClient.setToken(global.wazoClientToken[server] || global.wazoClientToken[null] || token);
@@ -4921,8 +4948,12 @@ const fillClient = (apiClient               ) => {
 
   apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
 
-  apiClient.setRefreshTenantId(
-    global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId,
+  if (tenantId) {
+    apiClient.setRefreshTenantId(tenantId);
+  }
+
+  apiClient.setRefreshDomainName(
+    global.wazoRefreshDomainName[server] || global.wazoRefreshDomainName[null] || apiClient.refreshDomainName,
   );
 
   apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
@@ -4960,4 +4991,4 @@ var getApiClient = (forServer          = null)                => {
 };
 
 export default getApiClient;
-export { setApiClientId, setApiToken, setCurrentServer, setFetchOptions, setIsMobile, setOnRefreshToken, setOnRefreshTokenError, setRefreshBackend, setRefreshExpiration, setRefreshTenantId, setRefreshToken };
+export { setApiClientId, setApiToken, setCurrentServer, setFetchOptions, setIsMobile, setOnRefreshToken, setOnRefreshTokenError, setRefreshBackend, setRefreshDomainName, setRefreshExpiration, setRefreshTenantId, setRefreshToken };