@wazo/sdk 0.37.39 → 0.37.42

package/lib/web-rtc-client.js

@@ -2804,9 +2804,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' } : {}),
@@ -4094,7 +4097,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 || {};
@@ -5140,6 +5145,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -5192,23 +5198,31 @@ class ApiClient {
       return null;
     }
 
-    const session = await this.auth.refreshToken(
-      this.refreshToken,
-      this.refreshBackend,
-      this.refreshExpiration,
-      this.isMobile,
-      this.refreshTenantId,
-    );
-
-    logger$1.info('token refreshed', { token: session.token });
+    try {
+      const session = await this.auth.refreshToken(
+        this.refreshToken,
+        this.refreshBackend,
+        this.refreshExpiration,
+        this.isMobile,
+        this.refreshTenantId,
+      );
+
+      logger$1.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$1.error('token refresh, error', error);
 
-    return session.token;
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -5231,6 +5245,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }
@@ -7411,11 +7429,14 @@ class WebRTCClient extends Emitter {
   }
 
   async _disconnectTransport(force          = false) {
-    if (force) {
+    if (force && this.userAgent && this.userAgent.transport) {
       // Bypass sip.js state machine that prevent to close WS with the state `Connecting`
       this.userAgent.transport.disconnectResolve = () => {};
-      // eslint-disable-next-line
-      this.userAgent.transport._ws.close(1000);
+
+      if (this.userAgent.transport._ws) {
+        this.userAgent.transport._ws.close(1000);
+      }
+
       return;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.37.39",
+  "version": "0.37.42",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "dist/wazo-sdk.js",
   "author": "Wazo (http://wazo.io)",

package/src/api/auth.js

@@ -74,9 +74,12 @@ export default (client: ApiRequester, baseUrl: string) => ({
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
-      tenant_id: tenantId,
     };
 
+    if (tenantId) {
+      body.tenant_id = tenantId;
+    }
+
     const headers: Object = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),

package/src/api-client.js

@@ -53,6 +53,7 @@ export default class ApiClient {
 
   refreshToken: ?string;
   onRefreshToken: ?Function;
+  onRefreshTokenError: ?Function;
   refreshExpiration: ?number;
   refreshBackend: ?string;
   refreshTenantId: ?string;
@@ -105,23 +106,31 @@ export default 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.info('token refreshed', { token: session.token });
+      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: string) {
@@ -144,6 +153,10 @@ export default class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback: Function) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration: number) {
     this.refreshExpiration = refreshExpiration;
   }

package/src/domain/Phone/WebRTCPhone.js

@@ -543,7 +543,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
         // When stopping screenshare and we had video before that, we have to re-upgrade
         // When upgrading directly to screenshare (eg: we don't have a videoLocalStream to replace)
         // We have to downgrade to audio.
-        const screenshareStopped = this.currentScreenShare.sender && this.currentScreenShare.hadVideo;
+        const screenshareStopped = this.currentScreenShare.hadVideo;
         const constraints = { audio: false, video: screenshareStopped };
 
         // We have to remove the video sender to be able to re-upgrade to video in `sendReinvite` below
@@ -987,7 +987,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
 
     logger.info('WebRTC hold sip session', { sipId: sipSession.id, hasVideo });
 
-    // Stop screenshre if needed
+    // Stop screenshare if needed
     if (this.currentScreenShare && this.currentScreenShare.sipSessionId === sessionId) {
       this.lastScreenShare = this.currentScreenShare;
       await this.stopScreenSharing(false, callSession);
@@ -1751,7 +1751,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
       endTime: fromSession ? fromSession.endTime : null,
       answered: state === SessionState.Established,
       paused: this.client.isCallHeld(sipSession),
-      isCaller: 'incoming' in extra ? !extra.incoming : false,
+      isCaller: fromSession ? fromSession.isCaller : ('incoming' in extra ? !extra.incoming : false),
       cameraEnabled: fromSession ? fromSession.isCameraEnabled() : this.client.hasVideo(sessionId),
       number,
       ringing: false,

package/src/service/getApiClient.js

@@ -10,7 +10,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 || {};
@@ -32,10 +34,18 @@ export const setRefreshToken = (newRefreshToken: ?string, forServer: ?string = n
   global.wazoRefreshToken[forServer] = newRefreshToken;
 };
 
+export const setRefreshTenantId = (refreshTenantId: ?string, forServer: ?string = null) => {
+  global.wazoRefreshTenantId[forServer] = refreshTenantId;
+};
+
 export const setOnRefreshToken = (onRefreshToken: Function, forServer: ?string = null) => {
   global.wazoOnRefreshToken[forServer] = onRefreshToken;
 };
 
+export const setOnRefreshTokenError = (callback: Function, forServer: ?string = null) => {
+  global.wazoOnRefreshTokenError[forServer] = callback;
+};
+
 export const setRefreshExpiration = (refreshExpiration: number, forServer: ?string = null) => {
   global.wazoRefreshExpiration[forServer] = refreshExpiration;
 };
@@ -62,12 +72,20 @@ const fillClient = (apiClient: WazoApiClient) => {
 
   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,
   );
@@ -81,7 +99,7 @@ const fillClient = (apiClient: WazoApiClient) => {
   return apiClient;
 };
 
-export default (forServer: ?string): WazoApiClient => {
+export default (forServer: ?string = null): WazoApiClient => {
   const server: string = forServer || global.wazoCurrentServer || '';
   if (server in global.wazoClients) {
     return fillClient(global.wazoClients[server]);

package/src/simple/Auth.js

@@ -10,6 +10,8 @@ import getApiClient, {
   setRefreshExpiration,
   setOnRefreshToken,
   setFetchOptions,
+  setRefreshTenantId,
+  setOnRefreshTokenError,
 } from '../service/getApiClient';
 import IssueReporter from '../service/IssueReporter';
 
@@ -29,6 +31,7 @@ class Auth {
   host: ?string;
   session: ?Session;
   onRefreshTokenCallback: ?Function;
+  onRefreshTokenCallbackError: ?Function;
   authenticated: boolean;
   mobile: boolean;
   BACKEND_WAZO: string;
@@ -66,6 +69,14 @@ class Auth {
         this.onRefreshTokenCallback(token, session);
       }
     });
+
+    setOnRefreshTokenError(error => {
+      logger.error('on refresh token error', error);
+
+      if (this.onRefreshTokenCallbackError) {
+        this.onRefreshTokenCallbackError(error);
+      }
+    });
   }
 
   setFetchOptions(options: Object) {
@@ -154,6 +165,10 @@ class Auth {
     this.onRefreshTokenCallback = callback;
   }
 
+  setOnRefreshTokenError(callback: Function) {
+    this.onRefreshTokenCallbackError = callback;
+  }
+
   checkAuthorizations(session: Session, authorizationName: ?string) {
     if (!authorizationName) {
       return;
@@ -186,6 +201,12 @@ class Auth {
     setRefreshToken(refreshToken);
   }
 
+  setRefreshTenantId(refreshTenantId: string) {
+    setRefreshTenantId(refreshTenantId);
+
+    getApiClient().setRefreshTenantId(refreshTenantId);
+  }
+
   forceRefreshToken() {
     getApiClient().forceRefreshToken();
   }

package/src/web-rtc-client.js

@@ -1,5 +1,5 @@
 // @flow
-/* eslint-disable class-methods-use-this, no-param-reassign, max-classes-per-file */
+/* eslint-disable class-methods-use-this, no-param-reassign, max-classes-per-file, no-underscore-dangle */
 /* global window, document, navigator */
 import 'webrtc-adapter';
 import type InviterInviteOptions from 'sip.js/lib/api/inviter-invite-options';
@@ -2084,11 +2084,14 @@ export default class WebRTCClient extends Emitter {
   }
 
   async _disconnectTransport(force: boolean = false) {
-    if (force) {
+    if (force && this.userAgent && this.userAgent.transport) {
       // Bypass sip.js state machine that prevent to close WS with the state `Connecting`
       this.userAgent.transport.disconnectResolve = () => {};
-      // eslint-disable-next-line
-      this.userAgent.transport._ws.close(1000);
+
+      if (this.userAgent.transport._ws) {
+        this.userAgent.transport._ws.close(1000);
+      }
+
       return;
     }