@wazo/sdk 0.37.37 → 0.37.40

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.37",
+  "version": "0.37.40",
   "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/AdHocAPIConference.js

@@ -27,7 +27,7 @@ export type ConferenceArguments = {
   finished?: boolean,
   participants: {[string]: CallSession};
   started?: boolean,
-  startTime?: ?number,
+  answerTime?: ?number,
   conferenceId?: ?string,
   muted?: boolean,
   paused?: boolean,
@@ -47,7 +47,7 @@ export default class AdHocAPIConference {
 
   conferenceId: string;
 
-  startTime: ?number;
+  answerTime: ?number;
 
   muted: boolean;
 
@@ -59,7 +59,7 @@ export default class AdHocAPIConference {
     participants,
     started,
     finished,
-    startTime,
+    answerTime,
     conferenceId,
     muted,
     paused,
@@ -69,7 +69,7 @@ export default class AdHocAPIConference {
     this.participants = participants || {};
     this.started = started || false;
     this.finished = finished || false;
-    this.startTime = startTime;
+    this.answerTime = answerTime;
     this.conferenceId = conferenceId || '';
     this.muted = muted || false;
     this.paused = paused || false;
@@ -82,7 +82,7 @@ export default class AdHocAPIConference {
   async start() {
     this.started = true;
     // $FlowFixMe
-    this.startTime = Object.values(this.participants).length ? Object.values(this.participants)[0].startTime : null;
+    this.answerTime = Object.values(this.participants).length ? Object.values(this.participants)[0].answerTime : null;
 
     const participantIds = Object.keys(this.participants);
     const conference = await getApiClient().calld.createAdHocConference(this.host.callId, participantIds);

package/src/domain/Phone/WebRTCPhone.js

@@ -1563,7 +1563,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
     });
 
     this.client.on(this.client.DISCONNECTED, () => {
-      logger.info('WebRTC client disconnected');
+      logger.warn('WebRTC client disconnected');
 
       this.eventEmitter.emit(ON_UNREGISTERED);
 

package/src/domain/SwitchboardCall.js

@@ -28,7 +28,7 @@ type SwitchboardCallArguments = {
   callSession: ?CallSession,
   callerIdName: ?string,
   callerIdNumber: ?string,
-  startTime: ?Date,
+  answerTime: ?Date,
   participantId: ?string,
   state: string,
   switchboardName: string,
@@ -54,7 +54,7 @@ class SwitchboardCall {
   callSession: ?CallSession;
   callerIdName: ?string;
   callerIdNumber: ?string;
-  startTime: ?Date;
+  answerTime: ?Date;
   participantId: ?string;
   state: string;
   switchboardName: string;
@@ -68,7 +68,7 @@ class SwitchboardCall {
       callerIdName: plain.caller_id_name || null,
       callerIdNumber: plain.caller_id_number || null,
       participantId: plain.participantId || null,
-      startTime: plain.startTime,
+      answerTime: plain.startTime,
       state: plain.state,
       switchboardName: plain.switchboardName,
       switchboardUuid: plain.switchboardUuid,
@@ -81,7 +81,7 @@ class SwitchboardCall {
     callerIdName,
     callerIdNumber,
     participantId,
-    startTime,
+    answerTime,
     state,
     switchboardName,
     switchboardUuid,
@@ -91,7 +91,7 @@ class SwitchboardCall {
     this.callerIdName = callerIdName;
     this.callerIdNumber = callerIdNumber;
     this.participantId = participantId;
-    this.startTime = startTime;
+    this.answerTime = answerTime;
     this.state = state;
     this.switchboardName = switchboardName;
     this.switchboardUuid = switchboardUuid;

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