@wazo/sdk 0.37.36 → 0.37.39

package/lib/simple/utils.js

@@ -2220,6 +2220,7 @@ class ApiRequester {
 /*       */
 
 const DEFAULT_BACKEND_USER = 'wazo_user';
+const BACKEND_LDAP_USER = 'ldap_user';
 const DETAULT_EXPIRATION = 3600;
 
 var authMethods = (client              , baseUrl        ) => ({
@@ -2269,12 +2270,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         = {
@@ -5426,6 +5429,7 @@ class ApiClient {
                             
                              
                           
+                           
                     
                        
 
@@ -5466,6 +5470,7 @@ class ApiClient {
     logger$a.info('refresh token callback called', {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
+      refreshTenantId: this.refreshTenantId,
       refreshExpiration: this.refreshExpiration,
       isMobile: this.isMobile,
     });
@@ -5479,6 +5484,7 @@ class ApiClient {
       this.refreshBackend,
       this.refreshExpiration,
       this.isMobile,
+      this.refreshTenantId,
     );
 
     logger$a.info('token refreshed', { token: session.token });
@@ -5520,6 +5526,10 @@ class ApiClient {
     this.refreshBackend = refreshBackend;
   }
 
+  setRefreshTenantId(tenantId         ) {
+    this.refreshTenantId = tenantId;
+  }
+
   setIsMobile(isMobile         ) {
     this.isMobile = isMobile;
   }
@@ -5621,6 +5631,7 @@ var getApiClient = (forServer         )                => {
 
 class InvalidSubscription extends Error {}
 class InvalidAuthorization extends Error {}
+class NoTenantIdError extends Error {}
 
 const logger$9 = IssueReporter$1.loggerFor('simple-auth');
 
@@ -5634,11 +5645,15 @@ class Auth {
                                     
                          
                   
+                       
+                       
 
   constructor() {
     this.expiration = DETAULT_EXPIRATION;
     this.authenticated = false;
     this.minSubscriptionType = null;
+    this.BACKEND_WAZO = DEFAULT_BACKEND_USER;
+    this.BACKEND_LDAP = BACKEND_LDAP_USER;
   }
 
   init(clientId        ,
@@ -5671,15 +5686,28 @@ class Auth {
     setFetchOptions(options);
   }
 
-  async logIn(username        , password        ) {
+  async logIn(username        , password        , backend         , tenantId         ) {
+    if (backend && backend !== this.BACKEND_WAZO && !tenantId) {
+      throw new NoTenantIdError('No tenant id');
+    }
+
     this.authenticated = false;
     this.session = null;
     const rawSession = await getApiClient().auth.logIn({
       username,
       password,
+      backend,
+      tenantId,
       expiration: this.expiration,
       mobile: this.mobile,
     });
+
+    if (backend) {
+      getApiClient().setRefreshBackend(backend);
+    }
+
+    getApiClient().setRefreshTenantId(tenantId);
+
     return this._onAuthenticated(rawSession);
   }
 
@@ -5906,7 +5934,7 @@ var Auth$1 = global.wazoAuthInstance;
                      
                                         
                     
-                      
+                       
                          
                   
                    
@@ -5926,7 +5954,7 @@ class AdHocAPIConference {
 
                        
 
-                     
+                      
 
                  
 
@@ -5938,7 +5966,7 @@ class AdHocAPIConference {
     participants,
     started,
     finished,
-    startTime,
+    answerTime,
     conferenceId,
     muted,
     paused,
@@ -5948,7 +5976,7 @@ 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;
@@ -5961,7 +5989,7 @@ 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);
@@ -13239,7 +13267,7 @@ class Room {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13265,7 +13293,7 @@ class SwitchboardCall {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -13279,7 +13307,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,
@@ -13292,7 +13320,7 @@ class SwitchboardCall {
     callerIdName,
     callerIdNumber,
     participantId,
-    startTime,
+    answerTime,
     state,
     switchboardName,
     switchboardUuid,
@@ -13302,7 +13330,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;
@@ -13939,6 +13967,7 @@ const Wazo = {
   InvalidAuthorization,
   CanceledCallError,
   SFUNotAvailableError,
+  NoTenantIdError,
 };
 
 if (window) {

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

package/package.json

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

package/src/api/auth.js

@@ -16,7 +16,8 @@ import type {
 } from '../domain/types';
 import Session from '../domain/Session';
 
-const DEFAULT_BACKEND_USER = 'wazo_user';
+export const DEFAULT_BACKEND_USER = 'wazo_user';
+export const BACKEND_LDAP_USER = 'ldap_user';
 export const DETAULT_EXPIRATION = 3600;
 
 export default (client: ApiRequester, baseUrl: string) => ({
@@ -66,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/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

@@ -1,7 +1,7 @@
 // @flow
 /* eslint-disable max-classes-per-file */
 import Session from '../domain/Session';
-import { DETAULT_EXPIRATION } from '../api/auth';
+import { BACKEND_LDAP_USER, DEFAULT_BACKEND_USER, DETAULT_EXPIRATION } from '../api/auth';
 import getApiClient, {
   setCurrentServer,
   setApiToken,
@@ -17,6 +17,7 @@ import Wazo from './index';
 
 export class InvalidSubscription extends Error {}
 export class InvalidAuthorization extends Error {}
+export class NoTenantIdError extends Error {}
 
 const logger = IssueReporter.loggerFor('simple-auth');
 
@@ -30,11 +31,15 @@ class Auth {
   onRefreshTokenCallback: ?Function;
   authenticated: boolean;
   mobile: boolean;
+  BACKEND_WAZO: string;
+  BACKEND_LDAP: string;
 
   constructor() {
     this.expiration = DETAULT_EXPIRATION;
     this.authenticated = false;
     this.minSubscriptionType = null;
+    this.BACKEND_WAZO = DEFAULT_BACKEND_USER;
+    this.BACKEND_LDAP = BACKEND_LDAP_USER;
   }
 
   init(clientId: string,
@@ -67,15 +72,28 @@ class Auth {
     setFetchOptions(options);
   }
 
-  async logIn(username: string, password: string) {
+  async logIn(username: string, password: string, backend?: string, tenantId?: string) {
+    if (backend && backend !== this.BACKEND_WAZO && !tenantId) {
+      throw new NoTenantIdError('No tenant id');
+    }
+
     this.authenticated = false;
     this.session = null;
     const rawSession = await getApiClient().auth.logIn({
       username,
       password,
+      backend,
+      tenantId,
       expiration: this.expiration,
       mobile: this.mobile,
     });
+
+    if (backend) {
+      getApiClient().setRefreshBackend(backend);
+    }
+
+    getApiClient().setRefreshTenantId(tenantId);
+
     return this._onAuthenticated(rawSession);
   }
 

package/src/simple/index.js

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