@wazo/sdk 0.38.9 → 0.38.10

package/lib/web-rtc-client.js

@@ -2797,6 +2797,7 @@ var authMethods = (client              , baseUrl        ) => ({
                        
                      
                       
+                        
    )                    {
     const body         = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -2817,9 +2818,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));
   },
 
@@ -2832,6 +2838,7 @@ var authMethods = (client              , baseUrl        ) => ({
     expiration        ,
     isMobile          = false,
     tenantId         ,
+    domainName         ,
   )                    => {
     const body         = {
       backend: backend || DEFAULT_BACKEND_USER,
@@ -2841,9 +2848,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' } : {}),
@@ -4270,6 +4282,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 || {};
@@ -5329,6 +5342,7 @@ class ApiClient {
                              
                           
                            
+                             
                     
                        
 
@@ -5370,6 +5384,7 @@ class ApiClient {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
       refreshTenantId: this.refreshTenantId,
+      refreshDomainName: this.refreshDomainName,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -5385,6 +5400,7 @@ class ApiClient {
         this.refreshExpiration,
         this.isMobile,
         this.refreshTenantId,
+        this.refreshDomainName,
       );
 
       logger$1.info('token refreshed', { token: session.token });
@@ -5438,9 +5454,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;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.38.9",
+  "version": "0.38.10",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "dist/wazo-sdk.js",
   "author": "Wazo (http://wazo.io)",
@@ -100,4 +100,4 @@
   "react-native": {
     "node-fetch/lib/index": false
   }
-}
+}

package/src/api/auth.js

@@ -33,6 +33,7 @@ export default (client: ApiRequester, baseUrl: string) => ({
     expiration: number,
     mobile?: boolean,
     tenantId?: string,
+    domainName?: string,
   }): Promise<?Session> {
     const body: Object = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -53,9 +54,14 @@ export default (client: ApiRequester, baseUrl: string) => ({
     }
 
     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));
   },
 
@@ -68,6 +74,7 @@ export default (client: ApiRequester, baseUrl: string) => ({
     expiration: number,
     isMobile: boolean = false,
     tenantId: ?string,
+    domainName?: string,
   ): Promise<?Session> => {
     const body: Object = {
       backend: backend || DEFAULT_BACKEND_USER,
@@ -77,9 +84,14 @@ export default (client: ApiRequester, baseUrl: string) => ({
     };
 
     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: Object = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),

package/src/api-client.js

@@ -57,6 +57,7 @@ export default class ApiClient {
   refreshExpiration: ?number;
   refreshBackend: ?string;
   refreshTenantId: ?string;
+  refreshDomainName: ?string;
   isMobile: boolean;
   fetchOptions: Object;
 
@@ -98,6 +99,7 @@ export default class ApiClient {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
       refreshTenantId: this.refreshTenantId,
+      refreshDomainName: this.refreshDomainName,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -113,6 +115,7 @@ export default class ApiClient {
         this.refreshExpiration,
         this.isMobile,
         this.refreshTenantId,
+        this.refreshDomainName,
       );
 
       logger.info('token refreshed', { token: session.token });
@@ -166,9 +169,14 @@ export default class ApiClient {
   }
 
   setRefreshTenantId(tenantId: ?string) {
+    console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead');
     this.refreshTenantId = tenantId;
   }
 
+  setRefreshDomainName(domainName: ?string) {
+    this.refreshDomainName = domainName;
+  }
+
   setIsMobile(isMobile: boolean) {
     this.isMobile = isMobile;
   }

package/src/service/getApiClient.js

@@ -11,6 +11,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 || {};
@@ -35,9 +36,14 @@ export const setRefreshToken = (newRefreshToken: ?string, forServer: ?string = n
 };
 
 export const setRefreshTenantId = (refreshTenantId: ?string, forServer: ?string = null) => {
+  console.warn('Use of `setRefreshTenantId` is deprecated, please use `setRefreshDomainName` instead');
   global.wazoRefreshTenantId[forServer] = refreshTenantId;
 };
 
+export const setRefreshDomainName = (refreshDomainName: ?string, forServer: ?string = null) => {
+  global.wazoRefreshDomainName[forServer] = refreshDomainName;
+};
+
 export const setOnRefreshToken = (onRefreshToken: Function, forServer: ?string = null) => {
   global.wazoOnRefreshToken[forServer] = onRefreshToken;
 };
@@ -64,6 +70,7 @@ export const setFetchOptions = (fetchOptions: Object, forServer: ?string = null)
 
 const fillClient = (apiClient: WazoApiClient) => {
   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);
@@ -72,8 +79,12 @@ const fillClient = (apiClient: WazoApiClient) => {
 
   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);

package/src/simple/Auth.js

@@ -11,6 +11,7 @@ import getApiClient, {
   setOnRefreshToken,
   setFetchOptions,
   setRefreshTenantId,
+  setRefreshDomainName,
   setOnRefreshTokenError,
 } from '../service/getApiClient';
 import IssueReporter from '../service/IssueReporter';
@@ -20,6 +21,7 @@ import Wazo from './index';
 export class InvalidSubscription extends Error {}
 export class InvalidAuthorization extends Error {}
 export class NoTenantIdError extends Error {}
+export class NoDomainNameError extends Error {}
 
 const logger = IssueReporter.loggerFor('simple-auth');
 
@@ -83,9 +85,24 @@ class Auth {
     setFetchOptions(options);
   }
 
-  async logIn(username: string, password: string, backend?: string, tenantId?: string) {
-    if (backend && backend !== this.BACKEND_WAZO && !tenantId) {
-      throw new NoTenantIdError('No tenant id');
+  async logIn(username: string, password: string, backend?: string, extra?: string | Object) {
+    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;
@@ -95,6 +112,7 @@ class Auth {
       password,
       backend,
       tenantId,
+      domainName,
       expiration: this.expiration,
       mobile: this.mobile,
     });
@@ -103,7 +121,13 @@ class Auth {
       getApiClient().setRefreshBackend(backend);
     }
 
-    getApiClient().setRefreshTenantId(tenantId);
+    if (tenantId) {
+      getApiClient().setRefreshTenantId(tenantId);
+    }
+
+    if (domainName) {
+      getApiClient().setRefreshDomainName(domainName);
+    }
 
     return this._onAuthenticated(rawSession);
   }
@@ -202,11 +226,18 @@ class Auth {
   }
 
   setRefreshTenantId(refreshTenantId: string) {
+    console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead.');
     setRefreshTenantId(refreshTenantId);
 
     getApiClient().setRefreshTenantId(refreshTenantId);
   }
 
+  setRefreshDomainName(domainName: string) {
+    setRefreshDomainName(domainName);
+
+    getApiClient().setRefreshDomainName(domainName);
+  }
+
   forceRefreshToken() {
     getApiClient().forceRefreshToken();
   }

package/src/simple/Softphone.js

@@ -107,6 +107,7 @@ class Softphone {
     wrapUpDuration,
     enableAgent = true,
     tenantId,
+    domainName,
     debug = false,
   }: Object = {}) {
     this.url = url || 'https://softphone.wazo.io';
@@ -131,8 +132,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;
     }

package/src/simple/index.js

@@ -1,5 +1,5 @@
 /* global window */
-import Auth, { InvalidSubscription, InvalidAuthorization, NoTenantIdError } from './Auth';
+import Auth, { InvalidSubscription, InvalidAuthorization, NoTenantIdError, NoDomainNameError } from './Auth';
 import Phone from './Phone';
 import Websocket from './Websocket';
 import Room from './room/Room';
@@ -106,6 +106,7 @@ const Wazo = {
   CanceledCallError,
   SFUNotAvailableError,
   NoTenantIdError,
+  NoDomainNameError,
 };
 
 if (window) {