@wazo/sdk 0.37.41 → 0.38.0

package/lib/service/CallApi.js

@@ -2436,13 +2436,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -2450,6 +2446,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -2791,9 +2796,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 +4580,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -4624,23 +4633,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 +4680,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }
@@ -4698,7 +4719,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 +4737,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 +4764,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]);

package/lib/service/IssueReporter.js

@@ -365,13 +365,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -379,6 +375,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);

package/lib/service/__tests__/IssueReporter.test.js

@@ -365,13 +365,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -379,6 +375,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -494,4 +499,10 @@ describe('IssueReporter', () => {
     expect(IssueReporter$1.removeSlashes('\"')).toBe("'");
     expect(IssueReporter$1.removeSlashes('\\\"')).toBe("'");
   });
+
+  it('Add retry count', () => {
+    expect(IssueReporter$1._writeRetryCount('', 1)).toBe('');
+    expect(IssueReporter$1._writeRetryCount('{}', 1)).toBe('{}');
+    expect(IssueReporter$1._writeRetryCount({}, 1)).toEqual({ _retry: 1 });
+  });
 });

package/lib/service/getApiClient.js

@@ -404,13 +404,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -418,6 +414,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -2253,9 +2258,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 +4582,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -4626,23 +4635,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 +4682,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }
@@ -4700,7 +4721,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 +4745,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 +4783,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 +4810,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 +4828,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;