@wazo/sdk 0.37.41 → 0.37.42

package/lib/service/getApiClient.js

@@ -2253,9 +2253,12 @@ var authMethods = (client              , baseUrl        ) => ({
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
-      tenant_id: tenantId,
     };
 
+    if (tenantId) {
+      body.tenant_id = tenantId;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -4574,6 +4577,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -4626,23 +4630,31 @@ class ApiClient {
       return null;
     }
 
-    const session = await this.auth.refreshToken(
-      this.refreshToken,
-      this.refreshBackend,
-      this.refreshExpiration,
-      this.isMobile,
-      this.refreshTenantId,
-    );
-
-    logger.info('token refreshed', { token: session.token });
+    try {
+      const session = await this.auth.refreshToken(
+        this.refreshToken,
+        this.refreshBackend,
+        this.refreshExpiration,
+        this.isMobile,
+        this.refreshTenantId,
+      );
+
+      logger.info('token refreshed', { token: session.token });
+
+      if (this.onRefreshToken) {
+        this.onRefreshToken(session.token, session);
+      }
 
-    if (this.onRefreshToken) {
-      this.onRefreshToken(session.token, session);
-    }
+      this.setToken(session.token);
 
-    this.setToken(session.token);
+      return session.token;
+    } catch (error) {
+      logger.error('token refresh, error', error);
 
-    return session.token;
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -4665,6 +4677,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }
@@ -4700,7 +4716,9 @@ global.wazoClients = global.wazoClients || {};
 global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
+global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
+global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
 global.wazoRefreshBackend = global.wazoRefreshBackend || {};
 global.wazoIsMobile = global.wazoIsMobile || {};
@@ -4722,10 +4740,18 @@ const setRefreshToken = (newRefreshToken         , forServer          = null) =>
   global.wazoRefreshToken[forServer] = newRefreshToken;
 };
 
+const setRefreshTenantId = (refreshTenantId         , forServer          = null) => {
+  global.wazoRefreshTenantId[forServer] = refreshTenantId;
+};
+
 const setOnRefreshToken = (onRefreshToken          , forServer          = null) => {
   global.wazoOnRefreshToken[forServer] = onRefreshToken;
 };
 
+const setOnRefreshTokenError = (callback          , forServer          = null) => {
+  global.wazoOnRefreshTokenError[forServer] = callback;
+};
+
 const setRefreshExpiration = (refreshExpiration        , forServer          = null) => {
   global.wazoRefreshExpiration[forServer] = refreshExpiration;
 };
@@ -4752,12 +4778,20 @@ const fillClient = (apiClient               ) => {
 
   apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
 
+  apiClient.setRefreshTenantId(
+    global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId,
+  );
+
   apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
 
   apiClient.setOnRefreshToken(
     global.wazoOnRefreshToken[server] || global.wazoOnRefreshToken[null] || apiClient.onRefreshToken,
   );
 
+  apiClient.setOnRefreshTokenError(
+    global.wazoOnRefreshTokenError[server] || global.wazoOnRefreshTokenError[null] || apiClient.onRefreshTokenError,
+  );
+
   apiClient.setRefreshExpiration(
     global.wazoRefreshExpiration[server] || global.wazoRefreshExpiration[null] || apiClient.refreshExpiration,
   );
@@ -4771,7 +4805,7 @@ const fillClient = (apiClient               ) => {
   return apiClient;
 };
 
-var getApiClient = (forServer         )                => {
+var getApiClient = (forServer          = null)                => {
   const server         = forServer || global.wazoCurrentServer || '';
   if (server in global.wazoClients) {
     return fillClient(global.wazoClients[server]);
@@ -4789,6 +4823,8 @@ exports.setCurrentServer = setCurrentServer;
 exports.setFetchOptions = setFetchOptions;
 exports.setIsMobile = setIsMobile;
 exports.setOnRefreshToken = setOnRefreshToken;
+exports.setOnRefreshTokenError = setOnRefreshTokenError;
 exports.setRefreshBackend = setRefreshBackend;
 exports.setRefreshExpiration = setRefreshExpiration;
+exports.setRefreshTenantId = setRefreshTenantId;
 exports.setRefreshToken = setRefreshToken;

package/lib/simple/Auth.js

@@ -2277,9 +2277,12 @@ var authMethods = (client              , baseUrl        ) => ({
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
-      tenant_id: tenantId,
     };
 
+    if (tenantId) {
+      body.tenant_id = tenantId;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -5427,6 +5430,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -5479,23 +5483,31 @@ class ApiClient {
       return null;
     }
 
-    const session = await this.auth.refreshToken(
-      this.refreshToken,
-      this.refreshBackend,
-      this.refreshExpiration,
-      this.isMobile,
-      this.refreshTenantId,
-    );
+    try {
+      const session = await this.auth.refreshToken(
+        this.refreshToken,
+        this.refreshBackend,
+        this.refreshExpiration,
+        this.isMobile,
+        this.refreshTenantId,
+      );
 
-    logger$a.info('token refreshed', { token: session.token });
+      logger$a.info('token refreshed', { token: session.token });
 
-    if (this.onRefreshToken) {
-      this.onRefreshToken(session.token, session);
-    }
+      if (this.onRefreshToken) {
+        this.onRefreshToken(session.token, session);
+      }
 
-    this.setToken(session.token);
+      this.setToken(session.token);
 
-    return session.token;
+      return session.token;
+    } catch (error) {
+      logger$a.error('token refresh, error', error);
+
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -5518,6 +5530,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }
@@ -5553,7 +5569,9 @@ global.wazoClients = global.wazoClients || {};
 global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
+global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
+global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
 global.wazoRefreshBackend = global.wazoRefreshBackend || {};
 global.wazoIsMobile = global.wazoIsMobile || {};
@@ -5575,10 +5593,18 @@ const setRefreshToken = (newRefreshToken         , forServer          = null) =>
   global.wazoRefreshToken[forServer] = newRefreshToken;
 };
 
+const setRefreshTenantId = (refreshTenantId         , forServer          = null) => {
+  global.wazoRefreshTenantId[forServer] = refreshTenantId;
+};
+
 const setOnRefreshToken = (onRefreshToken          , forServer          = null) => {
   global.wazoOnRefreshToken[forServer] = onRefreshToken;
 };
 
+const setOnRefreshTokenError = (callback          , forServer          = null) => {
+  global.wazoOnRefreshTokenError[forServer] = callback;
+};
+
 const setRefreshExpiration = (refreshExpiration        , forServer          = null) => {
   global.wazoRefreshExpiration[forServer] = refreshExpiration;
 };
@@ -5597,12 +5623,20 @@ const fillClient = (apiClient               ) => {
 
   apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
 
+  apiClient.setRefreshTenantId(
+    global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId,
+  );
+
   apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
 
   apiClient.setOnRefreshToken(
     global.wazoOnRefreshToken[server] || global.wazoOnRefreshToken[null] || apiClient.onRefreshToken,
   );
 
+  apiClient.setOnRefreshTokenError(
+    global.wazoOnRefreshTokenError[server] || global.wazoOnRefreshTokenError[null] || apiClient.onRefreshTokenError,
+  );
+
   apiClient.setRefreshExpiration(
     global.wazoRefreshExpiration[server] || global.wazoRefreshExpiration[null] || apiClient.refreshExpiration,
   );
@@ -5616,7 +5650,7 @@ const fillClient = (apiClient               ) => {
   return apiClient;
 };
 
-var getApiClient = (forServer         )                => {
+var getApiClient = (forServer          = null)                => {
   const server         = forServer || global.wazoCurrentServer || '';
   if (server in global.wazoClients) {
     return fillClient(global.wazoClients[server]);
@@ -13730,6 +13764,7 @@ class Auth {
                 
                     
                                     
+                                         
                          
                   
                        
@@ -13767,6 +13802,14 @@ class Auth {
         this.onRefreshTokenCallback(token, session);
       }
     });
+
+    setOnRefreshTokenError(error => {
+      logger.error('on refresh token error', error);
+
+      if (this.onRefreshTokenCallbackError) {
+        this.onRefreshTokenCallbackError(error);
+      }
+    });
   }
 
   setFetchOptions(options        ) {
@@ -13855,6 +13898,10 @@ class Auth {
     this.onRefreshTokenCallback = callback;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenCallbackError = callback;
+  }
+
   checkAuthorizations(session         , authorizationName         ) {
     if (!authorizationName) {
       return;
@@ -13887,6 +13934,12 @@ class Auth {
     setRefreshToken(refreshToken);
   }
 
+  setRefreshTenantId(refreshTenantId        ) {
+    setRefreshTenantId(refreshTenantId);
+
+    getApiClient().setRefreshTenantId(refreshTenantId);
+  }
+
   forceRefreshToken() {
     getApiClient().forceRefreshToken();
   }

package/lib/simple/Configuration.js

@@ -2275,9 +2275,12 @@ var authMethods = (client              , baseUrl        ) => ({
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
-      tenant_id: tenantId,
     };
 
+    if (tenantId) {
+      body.tenant_id = tenantId;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -5425,6 +5428,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -5477,23 +5481,31 @@ class ApiClient {
       return null;
     }
 
-    const session = await this.auth.refreshToken(
-      this.refreshToken,
-      this.refreshBackend,
-      this.refreshExpiration,
-      this.isMobile,
-      this.refreshTenantId,
-    );
+    try {
+      const session = await this.auth.refreshToken(
+        this.refreshToken,
+        this.refreshBackend,
+        this.refreshExpiration,
+        this.isMobile,
+        this.refreshTenantId,
+      );
 
-    logger$a.info('token refreshed', { token: session.token });
+      logger$a.info('token refreshed', { token: session.token });
 
-    if (this.onRefreshToken) {
-      this.onRefreshToken(session.token, session);
-    }
+      if (this.onRefreshToken) {
+        this.onRefreshToken(session.token, session);
+      }
 
-    this.setToken(session.token);
+      this.setToken(session.token);
 
-    return session.token;
+      return session.token;
+    } catch (error) {
+      logger$a.error('token refresh, error', error);
+
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -5516,6 +5528,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }
@@ -5551,7 +5567,9 @@ global.wazoClients = global.wazoClients || {};
 global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
+global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
+global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
 global.wazoRefreshBackend = global.wazoRefreshBackend || {};
 global.wazoIsMobile = global.wazoIsMobile || {};
@@ -5573,10 +5591,18 @@ const setRefreshToken = (newRefreshToken         , forServer          = null) =>
   global.wazoRefreshToken[forServer] = newRefreshToken;
 };
 
+const setRefreshTenantId = (refreshTenantId         , forServer          = null) => {
+  global.wazoRefreshTenantId[forServer] = refreshTenantId;
+};
+
 const setOnRefreshToken = (onRefreshToken          , forServer          = null) => {
   global.wazoOnRefreshToken[forServer] = onRefreshToken;
 };
 
+const setOnRefreshTokenError = (callback          , forServer          = null) => {
+  global.wazoOnRefreshTokenError[forServer] = callback;
+};
+
 const setRefreshExpiration = (refreshExpiration        , forServer          = null) => {
   global.wazoRefreshExpiration[forServer] = refreshExpiration;
 };
@@ -5595,12 +5621,20 @@ const fillClient = (apiClient               ) => {
 
   apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
 
+  apiClient.setRefreshTenantId(
+    global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId,
+  );
+
   apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
 
   apiClient.setOnRefreshToken(
     global.wazoOnRefreshToken[server] || global.wazoOnRefreshToken[null] || apiClient.onRefreshToken,
   );
 
+  apiClient.setOnRefreshTokenError(
+    global.wazoOnRefreshTokenError[server] || global.wazoOnRefreshTokenError[null] || apiClient.onRefreshTokenError,
+  );
+
   apiClient.setRefreshExpiration(
     global.wazoRefreshExpiration[server] || global.wazoRefreshExpiration[null] || apiClient.refreshExpiration,
   );
@@ -5614,7 +5648,7 @@ const fillClient = (apiClient               ) => {
   return apiClient;
 };
 
-var getApiClient = (forServer         )                => {
+var getApiClient = (forServer          = null)                => {
   const server         = forServer || global.wazoCurrentServer || '';
   if (server in global.wazoClients) {
     return fillClient(global.wazoClients[server]);
@@ -13711,6 +13745,7 @@ class Auth {
                 
                     
                                     
+                                         
                          
                   
                        
@@ -13748,6 +13783,14 @@ class Auth {
         this.onRefreshTokenCallback(token, session);
       }
     });
+
+    setOnRefreshTokenError(error => {
+      logger.error('on refresh token error', error);
+
+      if (this.onRefreshTokenCallbackError) {
+        this.onRefreshTokenCallbackError(error);
+      }
+    });
   }
 
   setFetchOptions(options        ) {
@@ -13836,6 +13879,10 @@ class Auth {
     this.onRefreshTokenCallback = callback;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenCallbackError = callback;
+  }
+
   checkAuthorizations(session         , authorizationName         ) {
     if (!authorizationName) {
       return;
@@ -13868,6 +13915,12 @@ class Auth {
     setRefreshToken(refreshToken);
   }
 
+  setRefreshTenantId(refreshTenantId        ) {
+    setRefreshTenantId(refreshTenantId);
+
+    getApiClient().setRefreshTenantId(refreshTenantId);
+  }
+
   forceRefreshToken() {
     getApiClient().forceRefreshToken();
   }

package/lib/simple/Directory.js

@@ -2251,9 +2251,12 @@ var authMethods = (client              , baseUrl        ) => ({
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
-      tenant_id: tenantId,
     };
 
+    if (tenantId) {
+      body.tenant_id = tenantId;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -4572,6 +4575,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -4624,23 +4628,31 @@ class ApiClient {
       return null;
     }
 
-    const session = await this.auth.refreshToken(
-      this.refreshToken,
-      this.refreshBackend,
-      this.refreshExpiration,
-      this.isMobile,
-      this.refreshTenantId,
-    );
-
-    logger.info('token refreshed', { token: session.token });
+    try {
+      const session = await this.auth.refreshToken(
+        this.refreshToken,
+        this.refreshBackend,
+        this.refreshExpiration,
+        this.isMobile,
+        this.refreshTenantId,
+      );
+
+      logger.info('token refreshed', { token: session.token });
+
+      if (this.onRefreshToken) {
+        this.onRefreshToken(session.token, session);
+      }
 
-    if (this.onRefreshToken) {
-      this.onRefreshToken(session.token, session);
-    }
+      this.setToken(session.token);
 
-    this.setToken(session.token);
+      return session.token;
+    } catch (error) {
+      logger.error('token refresh, error', error);
 
-    return session.token;
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -4663,6 +4675,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }
@@ -4698,7 +4714,9 @@ global.wazoClients = global.wazoClients || {};
 global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
+global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
+global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
 global.wazoRefreshBackend = global.wazoRefreshBackend || {};
 global.wazoIsMobile = global.wazoIsMobile || {};
@@ -4714,12 +4732,20 @@ const fillClient = (apiClient               ) => {
 
   apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
 
+  apiClient.setRefreshTenantId(
+    global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId,
+  );
+
   apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
 
   apiClient.setOnRefreshToken(
     global.wazoOnRefreshToken[server] || global.wazoOnRefreshToken[null] || apiClient.onRefreshToken,
   );
 
+  apiClient.setOnRefreshTokenError(
+    global.wazoOnRefreshTokenError[server] || global.wazoOnRefreshTokenError[null] || apiClient.onRefreshTokenError,
+  );
+
   apiClient.setRefreshExpiration(
     global.wazoRefreshExpiration[server] || global.wazoRefreshExpiration[null] || apiClient.refreshExpiration,
   );
@@ -4733,7 +4759,7 @@ const fillClient = (apiClient               ) => {
   return apiClient;
 };
 
-var getApiClient = (forServer         )                => {
+var getApiClient = (forServer          = null)                => {
   const server         = forServer || global.wazoCurrentServer || '';
   if (server in global.wazoClients) {
     return fillClient(global.wazoClients[server]);