@wazo/sdk 0.38.9 → 0.38.12

package/lib/simple/room/SipRoom.js

@@ -2239,6 +2239,7 @@ var authMethods = (client              , baseUrl        ) => ({
                        
                      
                       
+                        
    )                    {
     const body         = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -2259,9 +2260,14 @@ var authMethods = (client              , baseUrl        ) => ({
     }
 
     if (params.tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling logIn() method, use `domainName` instead.');
       body.tenant_id = params.tenantId;
     }
 
+    if (params.domainName) {
+      body.domain_name = params.domainName;
+    }
+
     return client.post(`${baseUrl}/token`, body, headers).then(response => Session.parse(response));
   },
 
@@ -2274,6 +2280,7 @@ var authMethods = (client              , baseUrl        ) => ({
     expiration        ,
     isMobile          = false,
     tenantId         ,
+    domainName         ,
   )                    => {
     const body         = {
       backend: backend || DEFAULT_BACKEND_USER,
@@ -2283,9 +2290,14 @@ var authMethods = (client              , baseUrl        ) => ({
     };
 
     if (tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling refreshToken() method, use `domainName` instead.');
       body.tenant_id = tenantId;
     }
 
+    if (domainName) {
+      body.domain_name = domainName;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -5583,6 +5595,7 @@ class ApiClient {
                              
                           
                            
+                             
                     
                        
 
@@ -5624,6 +5637,7 @@ class ApiClient {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
       refreshTenantId: this.refreshTenantId,
+      refreshDomainName: this.refreshDomainName,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -5639,6 +5653,7 @@ class ApiClient {
         this.refreshExpiration,
         this.isMobile,
         this.refreshTenantId,
+        this.refreshDomainName,
       );
 
       logger$a.info('token refreshed', { token: session.token });
@@ -5692,9 +5707,14 @@ class ApiClient {
   }
 
   setRefreshTenantId(tenantId         ) {
+    console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead');
     this.refreshTenantId = tenantId;
   }
 
+  setRefreshDomainName(domainName         ) {
+    this.refreshDomainName = domainName;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }
@@ -5719,6 +5739,7 @@ global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
 global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
+global.wazoRefreshDomainName = global.wazoRefreshDomainName || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
 global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
@@ -5743,9 +5764,14 @@ const setRefreshToken = (newRefreshToken         , forServer          = null) =>
 };
 
 const setRefreshTenantId = (refreshTenantId         , forServer          = null) => {
+  console.warn('Use of `setRefreshTenantId` is deprecated, please use `setRefreshDomainName` instead');
   global.wazoRefreshTenantId[forServer] = refreshTenantId;
 };
 
+const setRefreshDomainName = (refreshDomainName         , forServer          = null) => {
+  global.wazoRefreshDomainName[forServer] = refreshDomainName;
+};
+
 const setOnRefreshToken = (onRefreshToken          , forServer          = null) => {
   global.wazoOnRefreshToken[forServer] = onRefreshToken;
 };
@@ -5764,6 +5790,7 @@ const setFetchOptions = (fetchOptions        , forServer          = null) => {
 
 const fillClient = (apiClient               ) => {
   const { server, token, clientId } = apiClient.client;
+  const tenantId = global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId;
 
   //  try with null server when dealing with non-related server info
   apiClient.setToken(global.wazoClientToken[server] || global.wazoClientToken[null] || token);
@@ -5772,8 +5799,12 @@ const fillClient = (apiClient               ) => {
 
   apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
 
-  apiClient.setRefreshTenantId(
-    global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId,
+  if (tenantId) {
+    apiClient.setRefreshTenantId(tenantId);
+  }
+
+  apiClient.setRefreshDomainName(
+    global.wazoRefreshDomainName[server] || global.wazoRefreshDomainName[null] || apiClient.refreshDomainName,
   );
 
   apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
@@ -5815,6 +5846,7 @@ var getApiClient = (forServer          = null)                => {
 class InvalidSubscription extends Error {}
 class InvalidAuthorization extends Error {}
 class NoTenantIdError extends Error {}
+class NoDomainNameError extends Error {}
 
 const logger$9 = IssueReporter$1.loggerFor('simple-auth');
 
@@ -5878,9 +5910,24 @@ class Auth {
     setFetchOptions(options);
   }
 
-  async logIn(username        , password        , backend         , tenantId         ) {
-    if (backend && backend !== this.BACKEND_WAZO && !tenantId) {
-      throw new NoTenantIdError('No tenant id');
+  async logIn(username        , password        , backend         , extra                  ) {
+    let tenantId = null;
+    let domainName = null;
+    if (typeof extra === 'string') {
+      tenantId = extra;
+    }
+    if (extra && typeof extra === 'object') {
+      domainName = extra.domainName;
+    }
+
+    if (backend && backend !== this.BACKEND_WAZO && !tenantId && !domainName) {
+      if (!tenantId) {
+        throw new NoTenantIdError('No tenant id');
+      }
+
+      if (!domainName) {
+        throw new NoDomainNameError('No domain name');
+      }
     }
 
     this.authenticated = false;
@@ -5890,6 +5937,7 @@ class Auth {
       password,
       backend,
       tenantId,
+      domainName,
       expiration: this.expiration,
       mobile: this.mobile,
     });
@@ -5898,7 +5946,13 @@ class Auth {
       getApiClient().setRefreshBackend(backend);
     }
 
-    getApiClient().setRefreshTenantId(tenantId);
+    if (tenantId) {
+      getApiClient().setRefreshTenantId(tenantId);
+    }
+
+    if (domainName) {
+      getApiClient().setRefreshDomainName(domainName);
+    }
 
     return this._onAuthenticated(rawSession);
   }
@@ -5997,11 +6051,18 @@ class Auth {
   }
 
   setRefreshTenantId(refreshTenantId        ) {
+    console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead.');
     setRefreshTenantId(refreshTenantId);
 
     getApiClient().setRefreshTenantId(refreshTenantId);
   }
 
+  setRefreshDomainName(domainName        ) {
+    setRefreshDomainName(domainName);
+
+    getApiClient().setRefreshDomainName(domainName);
+  }
+
   forceRefreshToken() {
     getApiClient().forceRefreshToken();
   }
@@ -7730,7 +7791,7 @@ class WebRTCClient extends Emitter {
 
       videoSender = transceiverIdx !== -1 ? transceivers[transceiverIdx].sender : null;
     } else {
-      videoSender = pc.getSenders().find(sender => sender.track === null);
+      videoSender = pc && pc.getSenders && pc.getSenders().find(sender => sender.track === null);
     }
 
     if (!videoSender) {
@@ -7771,9 +7832,11 @@ class WebRTCClient extends Emitter {
     const videoTracks = localStream.getVideoTracks();
 
     // Remove video senders
-    pc.getSenders().filter(sender => sender.track && sender.track.kind === 'video').forEach(videoSender => {
-      videoSender.replaceTrack(null);
-    });
+    if (pc.getSenders) {
+      pc.getSenders().filter(sender => sender.track && sender.track.kind === 'video').forEach(videoSender => {
+        videoSender.replaceTrack(null);
+      });
+    }
 
     videoTracks.forEach(videoTrack => {
       videoTrack.enabled = false;
@@ -8006,7 +8069,8 @@ class WebRTCClient extends Emitter {
       const constraints = { audio: { deviceId: { exact: deviceId } } };
       const stream = await navigator.mediaDevices.getUserMedia(constraints);
       const audioTrack = stream.getAudioTracks()[0];
-      const sender = pc && pc.getSenders().find(s => audioTrack && s && s.track && s.track.kind === audioTrack.kind);
+      const sender = pc && pc.getSenders
+        && pc.getSenders().find(s => audioTrack && s && s.track && s.track.kind === audioTrack.kind);
 
       if (sender) {
         if (sender.track) {
@@ -8069,10 +8133,11 @@ class WebRTCClient extends Emitter {
     // $FlowFixMe
     return navigator.mediaDevices.getUserMedia(constraints).then(async stream => {
       const videoTrack = stream.getVideoTracks()[0];
-      let sender = pc && pc.getSenders().find(s => videoTrack && s && s.track && s.track.kind === videoTrack.kind);
+      let sender = pc && pc.getSenders
+        && pc.getSenders().find(s => videoTrack && s && s.track && s.track.kind === videoTrack.kind);
       let wasTrackEnabled = false;
       if (!sender) {
-        sender = pc && pc.getSenders().find(s => !s.track);
+        sender = pc && pc.getSenders && pc.getSenders().find(s => !s.track);
       }
 
       if (sender) {
@@ -9606,7 +9671,7 @@ class WebRTCPhone extends Emitter                  {
     const screenTrack = screenShareStream.getVideoTracks()[0];
     const sipSession = this.currentSipSession;
     const pc = this.client.getPeerConnection(this.getSipSessionId(sipSession));
-    const sender = pc && pc.getSenders().find(s => s && s.track && s.track.kind === 'video');
+    const sender = pc && pc.getSenders && pc.getSenders().find(s => s && s.track && s.track.kind === 'video');
     const localStream = this.client.getLocalStream(this.getSipSessionId(sipSession));
     const videoTrack = localStream ? localStream.getTracks().find(track => track.kind === 'video') : null;
     const hadVideo = !!videoTrack;
@@ -9688,7 +9753,7 @@ class WebRTCPhone extends Emitter                  {
     const screenTrack = screenStream.getVideoTracks()[0];
     const sipSessionId = this.getSipSessionId(sipSession);
     const pc = this.client.getPeerConnection(sipSessionId);
-    const sender = pc && pc.getSenders().find(s => s && s.track && s.track.kind === 'video');
+    const sender = pc && pc.getSenders && pc.getSenders().find(s => s && s.track && s.track.kind === 'video');
 
     logger$7.info('WebRTC phone - on screensharing', {
       hadVideo,
@@ -14181,6 +14246,7 @@ class Softphone {
     wrapUpDuration,
     enableAgent = true,
     tenantId,
+    domainName,
     debug = false,
   }         = {}) {
     this.url = url || 'https://softphone.wazo.io';
@@ -14205,8 +14271,12 @@ class Softphone {
       config.port = port;
     }
     if (tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling `Softphone.init()`, use `domainName` instead');
       config.tenantId = tenantId;
     }
+    if (domainName) {
+      config.domainName = domainName;
+    }
     if (wrapUpDuration) {
       config.wrapUpDuration = wrapUpDuration;
     }
@@ -14527,6 +14597,7 @@ const Wazo = {
   CanceledCallError,
   SFUNotAvailableError,
   NoTenantIdError,
+  NoDomainNameError,
 };
 
 if (window) {

package/lib/simple/room/Stream.js

@@ -2239,6 +2239,7 @@ var authMethods = (client              , baseUrl        ) => ({
                        
                      
                       
+                        
    )                    {
     const body         = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -2259,9 +2260,14 @@ var authMethods = (client              , baseUrl        ) => ({
     }
 
     if (params.tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling logIn() method, use `domainName` instead.');
       body.tenant_id = params.tenantId;
     }
 
+    if (params.domainName) {
+      body.domain_name = params.domainName;
+    }
+
     return client.post(`${baseUrl}/token`, body, headers).then(response => Session.parse(response));
   },
 
@@ -2274,6 +2280,7 @@ var authMethods = (client              , baseUrl        ) => ({
     expiration        ,
     isMobile          = false,
     tenantId         ,
+    domainName         ,
   )                    => {
     const body         = {
       backend: backend || DEFAULT_BACKEND_USER,
@@ -2283,9 +2290,14 @@ var authMethods = (client              , baseUrl        ) => ({
     };
 
     if (tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling refreshToken() method, use `domainName` instead.');
       body.tenant_id = tenantId;
     }
 
+    if (domainName) {
+      body.domain_name = domainName;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -5583,6 +5595,7 @@ class ApiClient {
                              
                           
                            
+                             
                     
                        
 
@@ -5624,6 +5637,7 @@ class ApiClient {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
       refreshTenantId: this.refreshTenantId,
+      refreshDomainName: this.refreshDomainName,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -5639,6 +5653,7 @@ class ApiClient {
         this.refreshExpiration,
         this.isMobile,
         this.refreshTenantId,
+        this.refreshDomainName,
       );
 
       logger$a.info('token refreshed', { token: session.token });
@@ -5692,9 +5707,14 @@ class ApiClient {
   }
 
   setRefreshTenantId(tenantId         ) {
+    console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead');
     this.refreshTenantId = tenantId;
   }
 
+  setRefreshDomainName(domainName         ) {
+    this.refreshDomainName = domainName;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }
@@ -5719,6 +5739,7 @@ global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
 global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
+global.wazoRefreshDomainName = global.wazoRefreshDomainName || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
 global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
@@ -5743,9 +5764,14 @@ const setRefreshToken = (newRefreshToken         , forServer          = null) =>
 };
 
 const setRefreshTenantId = (refreshTenantId         , forServer          = null) => {
+  console.warn('Use of `setRefreshTenantId` is deprecated, please use `setRefreshDomainName` instead');
   global.wazoRefreshTenantId[forServer] = refreshTenantId;
 };
 
+const setRefreshDomainName = (refreshDomainName         , forServer          = null) => {
+  global.wazoRefreshDomainName[forServer] = refreshDomainName;
+};
+
 const setOnRefreshToken = (onRefreshToken          , forServer          = null) => {
   global.wazoOnRefreshToken[forServer] = onRefreshToken;
 };
@@ -5764,6 +5790,7 @@ const setFetchOptions = (fetchOptions        , forServer          = null) => {
 
 const fillClient = (apiClient               ) => {
   const { server, token, clientId } = apiClient.client;
+  const tenantId = global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId;
 
   //  try with null server when dealing with non-related server info
   apiClient.setToken(global.wazoClientToken[server] || global.wazoClientToken[null] || token);
@@ -5772,8 +5799,12 @@ const fillClient = (apiClient               ) => {
 
   apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
 
-  apiClient.setRefreshTenantId(
-    global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId,
+  if (tenantId) {
+    apiClient.setRefreshTenantId(tenantId);
+  }
+
+  apiClient.setRefreshDomainName(
+    global.wazoRefreshDomainName[server] || global.wazoRefreshDomainName[null] || apiClient.refreshDomainName,
   );
 
   apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
@@ -5815,6 +5846,7 @@ var getApiClient = (forServer          = null)                => {
 class InvalidSubscription extends Error {}
 class InvalidAuthorization extends Error {}
 class NoTenantIdError extends Error {}
+class NoDomainNameError extends Error {}
 
 const logger$9 = IssueReporter$1.loggerFor('simple-auth');
 
@@ -5878,9 +5910,24 @@ class Auth {
     setFetchOptions(options);
   }
 
-  async logIn(username        , password        , backend         , tenantId         ) {
-    if (backend && backend !== this.BACKEND_WAZO && !tenantId) {
-      throw new NoTenantIdError('No tenant id');
+  async logIn(username        , password        , backend         , extra                  ) {
+    let tenantId = null;
+    let domainName = null;
+    if (typeof extra === 'string') {
+      tenantId = extra;
+    }
+    if (extra && typeof extra === 'object') {
+      domainName = extra.domainName;
+    }
+
+    if (backend && backend !== this.BACKEND_WAZO && !tenantId && !domainName) {
+      if (!tenantId) {
+        throw new NoTenantIdError('No tenant id');
+      }
+
+      if (!domainName) {
+        throw new NoDomainNameError('No domain name');
+      }
     }
 
     this.authenticated = false;
@@ -5890,6 +5937,7 @@ class Auth {
       password,
       backend,
       tenantId,
+      domainName,
       expiration: this.expiration,
       mobile: this.mobile,
     });
@@ -5898,7 +5946,13 @@ class Auth {
       getApiClient().setRefreshBackend(backend);
     }
 
-    getApiClient().setRefreshTenantId(tenantId);
+    if (tenantId) {
+      getApiClient().setRefreshTenantId(tenantId);
+    }
+
+    if (domainName) {
+      getApiClient().setRefreshDomainName(domainName);
+    }
 
     return this._onAuthenticated(rawSession);
   }
@@ -5997,11 +6051,18 @@ class Auth {
   }
 
   setRefreshTenantId(refreshTenantId        ) {
+    console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead.');
     setRefreshTenantId(refreshTenantId);
 
     getApiClient().setRefreshTenantId(refreshTenantId);
   }
 
+  setRefreshDomainName(domainName        ) {
+    setRefreshDomainName(domainName);
+
+    getApiClient().setRefreshDomainName(domainName);
+  }
+
   forceRefreshToken() {
     getApiClient().forceRefreshToken();
   }
@@ -7730,7 +7791,7 @@ class WebRTCClient extends Emitter {
 
       videoSender = transceiverIdx !== -1 ? transceivers[transceiverIdx].sender : null;
     } else {
-      videoSender = pc.getSenders().find(sender => sender.track === null);
+      videoSender = pc && pc.getSenders && pc.getSenders().find(sender => sender.track === null);
     }
 
     if (!videoSender) {
@@ -7771,9 +7832,11 @@ class WebRTCClient extends Emitter {
     const videoTracks = localStream.getVideoTracks();
 
     // Remove video senders
-    pc.getSenders().filter(sender => sender.track && sender.track.kind === 'video').forEach(videoSender => {
-      videoSender.replaceTrack(null);
-    });
+    if (pc.getSenders) {
+      pc.getSenders().filter(sender => sender.track && sender.track.kind === 'video').forEach(videoSender => {
+        videoSender.replaceTrack(null);
+      });
+    }
 
     videoTracks.forEach(videoTrack => {
       videoTrack.enabled = false;
@@ -8006,7 +8069,8 @@ class WebRTCClient extends Emitter {
       const constraints = { audio: { deviceId: { exact: deviceId } } };
       const stream = await navigator.mediaDevices.getUserMedia(constraints);
       const audioTrack = stream.getAudioTracks()[0];
-      const sender = pc && pc.getSenders().find(s => audioTrack && s && s.track && s.track.kind === audioTrack.kind);
+      const sender = pc && pc.getSenders
+        && pc.getSenders().find(s => audioTrack && s && s.track && s.track.kind === audioTrack.kind);
 
       if (sender) {
         if (sender.track) {
@@ -8069,10 +8133,11 @@ class WebRTCClient extends Emitter {
     // $FlowFixMe
     return navigator.mediaDevices.getUserMedia(constraints).then(async stream => {
       const videoTrack = stream.getVideoTracks()[0];
-      let sender = pc && pc.getSenders().find(s => videoTrack && s && s.track && s.track.kind === videoTrack.kind);
+      let sender = pc && pc.getSenders
+        && pc.getSenders().find(s => videoTrack && s && s.track && s.track.kind === videoTrack.kind);
       let wasTrackEnabled = false;
       if (!sender) {
-        sender = pc && pc.getSenders().find(s => !s.track);
+        sender = pc && pc.getSenders && pc.getSenders().find(s => !s.track);
       }
 
       if (sender) {
@@ -9606,7 +9671,7 @@ class WebRTCPhone extends Emitter                  {
     const screenTrack = screenShareStream.getVideoTracks()[0];
     const sipSession = this.currentSipSession;
     const pc = this.client.getPeerConnection(this.getSipSessionId(sipSession));
-    const sender = pc && pc.getSenders().find(s => s && s.track && s.track.kind === 'video');
+    const sender = pc && pc.getSenders && pc.getSenders().find(s => s && s.track && s.track.kind === 'video');
     const localStream = this.client.getLocalStream(this.getSipSessionId(sipSession));
     const videoTrack = localStream ? localStream.getTracks().find(track => track.kind === 'video') : null;
     const hadVideo = !!videoTrack;
@@ -9688,7 +9753,7 @@ class WebRTCPhone extends Emitter                  {
     const screenTrack = screenStream.getVideoTracks()[0];
     const sipSessionId = this.getSipSessionId(sipSession);
     const pc = this.client.getPeerConnection(sipSessionId);
-    const sender = pc && pc.getSenders().find(s => s && s.track && s.track.kind === 'video');
+    const sender = pc && pc.getSenders && pc.getSenders().find(s => s && s.track && s.track.kind === 'video');
 
     logger$7.info('WebRTC phone - on screensharing', {
       hadVideo,
@@ -14262,6 +14327,7 @@ class Softphone {
     wrapUpDuration,
     enableAgent = true,
     tenantId,
+    domainName,
     debug = false,
   }         = {}) {
     this.url = url || 'https://softphone.wazo.io';
@@ -14286,8 +14352,12 @@ class Softphone {
       config.port = port;
     }
     if (tenantId) {
+      console.warn('Use of `tenantId` is deprecated when calling `Softphone.init()`, use `domainName` instead');
       config.tenantId = tenantId;
     }
+    if (domainName) {
+      config.domainName = domainName;
+    }
     if (wrapUpDuration) {
       config.wrapUpDuration = wrapUpDuration;
     }
@@ -14608,6 +14678,7 @@ const Wazo = {
   CanceledCallError,
   SFUNotAvailableError,
   NoTenantIdError,
+  NoDomainNameError,
 };
 
 if (window) {