@wazo/sdk 0.37.38 → 0.37.41

package/lib/web-rtc-client.js

@@ -2797,12 +2797,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         = {
@@ -5140,6 +5142,7 @@ class ApiClient {
                             
                              
                           
+                           
                     
                        
 
@@ -5180,6 +5183,7 @@ class ApiClient {
     logger$1.info('refresh token callback called', {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
+      refreshTenantId: this.refreshTenantId,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -5193,6 +5197,7 @@ class ApiClient {
       this.refreshBackend,
       this.refreshExpiration,
       this.isMobile,
+      this.refreshTenantId,
     );
 
     logger$1.info('token refreshed', { token: session.token });
@@ -5234,6 +5239,10 @@ class ApiClient {
     this.refreshBackend = refreshBackend;
   }
 
+  setRefreshTenantId(tenantId         ) {
+    this.refreshTenantId = tenantId;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }
@@ -7402,11 +7411,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.38",
+  "version": "0.37.41",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "dist/wazo-sdk.js",
   "author": "Wazo (http://wazo.io)",

package/src/api/auth.js

@@ -67,12 +67,14 @@ export default (client: ApiRequester, baseUrl: string) => ({
     backend: string,
     expiration: number,
     isMobile: boolean = false,
+    tenantId: ?string,
   ): Promise<?Session> => {
     const body: Object = {
       backend: backend || DEFAULT_BACKEND_USER,
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
+      tenant_id: tenantId,
     };
 
     const headers: Object = {

package/src/api-client.js

@@ -55,6 +55,7 @@ export default class ApiClient {
   onRefreshToken: ?Function;
   refreshExpiration: ?number;
   refreshBackend: ?string;
+  refreshTenantId: ?string;
   isMobile: boolean;
   fetchOptions: Object;
 
@@ -95,6 +96,7 @@ export default class ApiClient {
     logger.info('refresh token callback called', {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
+      refreshTenantId: this.refreshTenantId,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -108,6 +110,7 @@ export default class ApiClient {
       this.refreshBackend,
       this.refreshExpiration,
       this.isMobile,
+      this.refreshTenantId,
     );
 
     logger.info('token refreshed', { token: session.token });
@@ -149,6 +152,10 @@ export default class ApiClient {
     this.refreshBackend = refreshBackend;
   }
 
+  setRefreshTenantId(tenantId: ?string) {
+    this.refreshTenantId = tenantId;
+  }
+
   setIsMobile(isMobile: boolean) {
     this.isMobile = isMobile;
   }

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/simple/Auth.js

@@ -87,6 +87,13 @@ class Auth {
       expiration: this.expiration,
       mobile: this.mobile,
     });
+
+    if (backend) {
+      getApiClient().setRefreshBackend(backend);
+    }
+
+    getApiClient().setRefreshTenantId(tenantId);
+
     return this._onAuthenticated(rawSession);
   }
 

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;
     }