@wazo/sdk 0.38.9 → 0.38.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/wazo-sdk.js +2 -2
- package/esm/__tests__/api-client.test.js +21 -0
- package/esm/__tests__/web-rtc-client.test.js +21 -0
- package/esm/api/auth.js +12 -0
- package/esm/api/ctid-ng.js +1 -0
- package/esm/api-client.js +21 -0
- package/esm/checker/Checker.js +21 -0
- package/esm/checker/checks/aor.js +21 -0
- package/esm/checker/checks/api.js +21 -0
- package/esm/checker/checks/index.js +21 -0
- package/esm/checker/checks/webrtc-transport.js +21 -0
- package/esm/checker/checks/webrtc.js +21 -0
- package/esm/domain/AdHocAPIConference.js +28 -2
- package/esm/domain/Features.js +28 -2
- package/esm/domain/Phone/CTIPhone.js +28 -2
- package/esm/domain/Phone/WebRTCPhone.js +1 -0
- package/esm/index.js +73 -6
- package/esm/service/CallApi.js +28 -2
- package/esm/service/getApiClient.js +34 -3
- package/esm/simple/Auth.js +74 -7
- package/esm/simple/Configuration.js +73 -6
- package/esm/simple/Directory.js +28 -2
- package/esm/simple/Phone.js +73 -6
- package/esm/simple/Softphone.js +5 -0
- package/esm/simple/index.js +73 -6
- package/esm/simple/room/LocalParticipant.js +73 -6
- package/esm/simple/room/Participant.js +73 -6
- package/esm/simple/room/RemoteParticipant.js +73 -6
- package/esm/simple/room/Room.js +73 -6
- package/esm/simple/room/SipRoom.js +73 -6
- package/esm/simple/room/Stream.js +73 -6
- package/esm/simple/room/__tests__/Participant.test.js +73 -6
- package/esm/simple/room/__tests__/RemoteParticipant.test.js +73 -6
- package/esm/simple/utils.js +73 -6
- package/esm/web-rtc-client.js +21 -0
- package/lib/__tests__/api-client.test.js +21 -0
- package/lib/__tests__/web-rtc-client.test.js +21 -0
- package/lib/api/auth.js +12 -0
- package/lib/api/ctid-ng.js +1 -0
- package/lib/api-client.js +21 -0
- package/lib/checker/Checker.js +21 -0
- package/lib/checker/checks/aor.js +21 -0
- package/lib/checker/checks/api.js +21 -0
- package/lib/checker/checks/index.js +21 -0
- package/lib/checker/checks/webrtc-transport.js +21 -0
- package/lib/checker/checks/webrtc.js +21 -0
- package/lib/domain/AdHocAPIConference.js +28 -2
- package/lib/domain/Features.js +28 -2
- package/lib/domain/Phone/CTIPhone.js +28 -2
- package/lib/domain/Phone/WebRTCPhone.js +1 -0
- package/lib/index.js +73 -6
- package/lib/service/CallApi.js +28 -2
- package/lib/service/getApiClient.js +34 -2
- package/lib/simple/Auth.js +74 -6
- package/lib/simple/Configuration.js +73 -6
- package/lib/simple/Directory.js +28 -2
- package/lib/simple/Phone.js +73 -6
- package/lib/simple/Softphone.js +5 -0
- package/lib/simple/index.js +73 -6
- package/lib/simple/room/LocalParticipant.js +73 -6
- package/lib/simple/room/Participant.js +73 -6
- package/lib/simple/room/RemoteParticipant.js +73 -6
- package/lib/simple/room/Room.js +73 -6
- package/lib/simple/room/SipRoom.js +73 -6
- package/lib/simple/room/Stream.js +73 -6
- package/lib/simple/room/__tests__/Participant.test.js +73 -6
- package/lib/simple/room/__tests__/RemoteParticipant.test.js +73 -6
- package/lib/simple/utils.js +73 -6
- package/lib/web-rtc-client.js +21 -0
- package/package.json +2 -2
- package/src/api/auth.js +12 -0
- package/src/api-client.js +8 -0
- package/src/service/getApiClient.js +13 -2
- package/src/simple/Auth.js +35 -4
- package/src/simple/Softphone.js +5 -0
- package/src/simple/index.js +2 -1
|
@@ -2265,6 +2265,7 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2265
2265
|
|
|
2266
2266
|
|
|
2267
2267
|
|
|
2268
|
+
|
|
2268
2269
|
) {
|
|
2269
2270
|
const body = {
|
|
2270
2271
|
backend: params.backend || DEFAULT_BACKEND_USER,
|
|
@@ -2285,9 +2286,14 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2285
2286
|
}
|
|
2286
2287
|
|
|
2287
2288
|
if (params.tenantId) {
|
|
2289
|
+
console.warn('Use of `tenantId` is deprecated when calling logIn() method, use `domainName` instead.');
|
|
2288
2290
|
body.tenant_id = params.tenantId;
|
|
2289
2291
|
}
|
|
2290
2292
|
|
|
2293
|
+
if (params.domainName) {
|
|
2294
|
+
body.domain_name = params.domainName;
|
|
2295
|
+
}
|
|
2296
|
+
|
|
2291
2297
|
return client.post(`${baseUrl}/token`, body, headers).then(response => Session.parse(response));
|
|
2292
2298
|
},
|
|
2293
2299
|
|
|
@@ -2300,6 +2306,7 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2300
2306
|
expiration ,
|
|
2301
2307
|
isMobile = false,
|
|
2302
2308
|
tenantId ,
|
|
2309
|
+
domainName ,
|
|
2303
2310
|
) => {
|
|
2304
2311
|
const body = {
|
|
2305
2312
|
backend: backend || DEFAULT_BACKEND_USER,
|
|
@@ -2309,9 +2316,14 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2309
2316
|
};
|
|
2310
2317
|
|
|
2311
2318
|
if (tenantId) {
|
|
2319
|
+
console.warn('Use of `tenantId` is deprecated when calling refreshToken() method, use `domainName` instead.');
|
|
2312
2320
|
body.tenant_id = tenantId;
|
|
2313
2321
|
}
|
|
2314
2322
|
|
|
2323
|
+
if (domainName) {
|
|
2324
|
+
body.domain_name = domainName;
|
|
2325
|
+
}
|
|
2326
|
+
|
|
2315
2327
|
const headers = {
|
|
2316
2328
|
'Content-Type': 'application/json',
|
|
2317
2329
|
...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
|
|
@@ -5583,6 +5595,7 @@ class ApiClient {
|
|
|
5583
5595
|
|
|
5584
5596
|
|
|
5585
5597
|
|
|
5598
|
+
|
|
5586
5599
|
|
|
5587
5600
|
|
|
5588
5601
|
|
|
@@ -5624,6 +5637,7 @@ class ApiClient {
|
|
|
5624
5637
|
refreshToken: this.refreshToken,
|
|
5625
5638
|
refreshBackend: this.refreshBackend,
|
|
5626
5639
|
refreshTenantId: this.refreshTenantId,
|
|
5640
|
+
refreshDomainName: this.refreshDomainName,
|
|
5627
5641
|
refreshExpiration: this.refreshExpiration,
|
|
5628
5642
|
isMobile: this.isMobile,
|
|
5629
5643
|
});
|
|
@@ -5639,6 +5653,7 @@ class ApiClient {
|
|
|
5639
5653
|
this.refreshExpiration,
|
|
5640
5654
|
this.isMobile,
|
|
5641
5655
|
this.refreshTenantId,
|
|
5656
|
+
this.refreshDomainName,
|
|
5642
5657
|
);
|
|
5643
5658
|
|
|
5644
5659
|
logger$a.info('token refreshed', { token: session.token });
|
|
@@ -5692,9 +5707,14 @@ class ApiClient {
|
|
|
5692
5707
|
}
|
|
5693
5708
|
|
|
5694
5709
|
setRefreshTenantId(tenantId ) {
|
|
5710
|
+
console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead');
|
|
5695
5711
|
this.refreshTenantId = tenantId;
|
|
5696
5712
|
}
|
|
5697
5713
|
|
|
5714
|
+
setRefreshDomainName(domainName ) {
|
|
5715
|
+
this.refreshDomainName = domainName;
|
|
5716
|
+
}
|
|
5717
|
+
|
|
5698
5718
|
setIsMobile(isMobile ) {
|
|
5699
5719
|
this.isMobile = isMobile;
|
|
5700
5720
|
}
|
|
@@ -5719,6 +5739,7 @@ global.wazoClientId = global.wazoClientId || {};
|
|
|
5719
5739
|
global.wazoClientToken = global.wazoClientToken || {};
|
|
5720
5740
|
global.wazoRefreshToken = global.wazoRefreshToken || {};
|
|
5721
5741
|
global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
|
|
5742
|
+
global.wazoRefreshDomainName = global.wazoRefreshDomainName || {};
|
|
5722
5743
|
global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
|
|
5723
5744
|
global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
|
|
5724
5745
|
global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
|
|
@@ -5743,9 +5764,14 @@ const setRefreshToken = (newRefreshToken , forServer = null) =>
|
|
|
5743
5764
|
};
|
|
5744
5765
|
|
|
5745
5766
|
const setRefreshTenantId = (refreshTenantId , forServer = null) => {
|
|
5767
|
+
console.warn('Use of `setRefreshTenantId` is deprecated, please use `setRefreshDomainName` instead');
|
|
5746
5768
|
global.wazoRefreshTenantId[forServer] = refreshTenantId;
|
|
5747
5769
|
};
|
|
5748
5770
|
|
|
5771
|
+
const setRefreshDomainName = (refreshDomainName , forServer = null) => {
|
|
5772
|
+
global.wazoRefreshDomainName[forServer] = refreshDomainName;
|
|
5773
|
+
};
|
|
5774
|
+
|
|
5749
5775
|
const setOnRefreshToken = (onRefreshToken , forServer = null) => {
|
|
5750
5776
|
global.wazoOnRefreshToken[forServer] = onRefreshToken;
|
|
5751
5777
|
};
|
|
@@ -5764,6 +5790,7 @@ const setFetchOptions = (fetchOptions , forServer = null) => {
|
|
|
5764
5790
|
|
|
5765
5791
|
const fillClient = (apiClient ) => {
|
|
5766
5792
|
const { server, token, clientId } = apiClient.client;
|
|
5793
|
+
const tenantId = global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId;
|
|
5767
5794
|
|
|
5768
5795
|
// try with null server when dealing with non-related server info
|
|
5769
5796
|
apiClient.setToken(global.wazoClientToken[server] || global.wazoClientToken[null] || token);
|
|
@@ -5772,8 +5799,12 @@ const fillClient = (apiClient ) => {
|
|
|
5772
5799
|
|
|
5773
5800
|
apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
|
|
5774
5801
|
|
|
5775
|
-
|
|
5776
|
-
|
|
5802
|
+
if (tenantId) {
|
|
5803
|
+
apiClient.setRefreshTenantId(tenantId);
|
|
5804
|
+
}
|
|
5805
|
+
|
|
5806
|
+
apiClient.setRefreshDomainName(
|
|
5807
|
+
global.wazoRefreshDomainName[server] || global.wazoRefreshDomainName[null] || apiClient.refreshDomainName,
|
|
5777
5808
|
);
|
|
5778
5809
|
|
|
5779
5810
|
apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
|
|
@@ -5815,6 +5846,7 @@ var getApiClient = (forServer = null) => {
|
|
|
5815
5846
|
class InvalidSubscription extends Error {}
|
|
5816
5847
|
class InvalidAuthorization extends Error {}
|
|
5817
5848
|
class NoTenantIdError extends Error {}
|
|
5849
|
+
class NoDomainNameError extends Error {}
|
|
5818
5850
|
|
|
5819
5851
|
const logger$9 = IssueReporter$1.loggerFor('simple-auth');
|
|
5820
5852
|
|
|
@@ -5878,9 +5910,24 @@ class Auth {
|
|
|
5878
5910
|
setFetchOptions(options);
|
|
5879
5911
|
}
|
|
5880
5912
|
|
|
5881
|
-
async logIn(username , password , backend ,
|
|
5882
|
-
|
|
5883
|
-
|
|
5913
|
+
async logIn(username , password , backend , extra ) {
|
|
5914
|
+
let tenantId = null;
|
|
5915
|
+
let domainName = null;
|
|
5916
|
+
if (typeof extra === 'string') {
|
|
5917
|
+
tenantId = extra;
|
|
5918
|
+
}
|
|
5919
|
+
if (extra && typeof extra === 'object') {
|
|
5920
|
+
domainName = extra.domainName;
|
|
5921
|
+
}
|
|
5922
|
+
|
|
5923
|
+
if (backend && backend !== this.BACKEND_WAZO && !tenantId && !domainName) {
|
|
5924
|
+
if (!tenantId) {
|
|
5925
|
+
throw new NoTenantIdError('No tenant id');
|
|
5926
|
+
}
|
|
5927
|
+
|
|
5928
|
+
if (!domainName) {
|
|
5929
|
+
throw new NoDomainNameError('No domain name');
|
|
5930
|
+
}
|
|
5884
5931
|
}
|
|
5885
5932
|
|
|
5886
5933
|
this.authenticated = false;
|
|
@@ -5890,6 +5937,7 @@ class Auth {
|
|
|
5890
5937
|
password,
|
|
5891
5938
|
backend,
|
|
5892
5939
|
tenantId,
|
|
5940
|
+
domainName,
|
|
5893
5941
|
expiration: this.expiration,
|
|
5894
5942
|
mobile: this.mobile,
|
|
5895
5943
|
});
|
|
@@ -5898,7 +5946,13 @@ class Auth {
|
|
|
5898
5946
|
getApiClient().setRefreshBackend(backend);
|
|
5899
5947
|
}
|
|
5900
5948
|
|
|
5901
|
-
|
|
5949
|
+
if (tenantId) {
|
|
5950
|
+
getApiClient().setRefreshTenantId(tenantId);
|
|
5951
|
+
}
|
|
5952
|
+
|
|
5953
|
+
if (domainName) {
|
|
5954
|
+
getApiClient().setRefreshDomainName(domainName);
|
|
5955
|
+
}
|
|
5902
5956
|
|
|
5903
5957
|
return this._onAuthenticated(rawSession);
|
|
5904
5958
|
}
|
|
@@ -5997,11 +6051,18 @@ class Auth {
|
|
|
5997
6051
|
}
|
|
5998
6052
|
|
|
5999
6053
|
setRefreshTenantId(refreshTenantId ) {
|
|
6054
|
+
console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead.');
|
|
6000
6055
|
setRefreshTenantId(refreshTenantId);
|
|
6001
6056
|
|
|
6002
6057
|
getApiClient().setRefreshTenantId(refreshTenantId);
|
|
6003
6058
|
}
|
|
6004
6059
|
|
|
6060
|
+
setRefreshDomainName(domainName ) {
|
|
6061
|
+
setRefreshDomainName(domainName);
|
|
6062
|
+
|
|
6063
|
+
getApiClient().setRefreshDomainName(domainName);
|
|
6064
|
+
}
|
|
6065
|
+
|
|
6005
6066
|
forceRefreshToken() {
|
|
6006
6067
|
getApiClient().forceRefreshToken();
|
|
6007
6068
|
}
|
|
@@ -13150,6 +13211,7 @@ class Softphone {
|
|
|
13150
13211
|
wrapUpDuration,
|
|
13151
13212
|
enableAgent = true,
|
|
13152
13213
|
tenantId,
|
|
13214
|
+
domainName,
|
|
13153
13215
|
debug = false,
|
|
13154
13216
|
} = {}) {
|
|
13155
13217
|
this.url = url || 'https://softphone.wazo.io';
|
|
@@ -13174,8 +13236,12 @@ class Softphone {
|
|
|
13174
13236
|
config.port = port;
|
|
13175
13237
|
}
|
|
13176
13238
|
if (tenantId) {
|
|
13239
|
+
console.warn('Use of `tenantId` is deprecated when calling `Softphone.init()`, use `domainName` instead');
|
|
13177
13240
|
config.tenantId = tenantId;
|
|
13178
13241
|
}
|
|
13242
|
+
if (domainName) {
|
|
13243
|
+
config.domainName = domainName;
|
|
13244
|
+
}
|
|
13179
13245
|
if (wrapUpDuration) {
|
|
13180
13246
|
config.wrapUpDuration = wrapUpDuration;
|
|
13181
13247
|
}
|
|
@@ -13496,6 +13562,7 @@ const Wazo = {
|
|
|
13496
13562
|
CanceledCallError,
|
|
13497
13563
|
SFUNotAvailableError,
|
|
13498
13564
|
NoTenantIdError,
|
|
13565
|
+
NoDomainNameError,
|
|
13499
13566
|
};
|
|
13500
13567
|
|
|
13501
13568
|
if (window) {
|
|
@@ -2265,6 +2265,7 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2265
2265
|
|
|
2266
2266
|
|
|
2267
2267
|
|
|
2268
|
+
|
|
2268
2269
|
) {
|
|
2269
2270
|
const body = {
|
|
2270
2271
|
backend: params.backend || DEFAULT_BACKEND_USER,
|
|
@@ -2285,9 +2286,14 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2285
2286
|
}
|
|
2286
2287
|
|
|
2287
2288
|
if (params.tenantId) {
|
|
2289
|
+
console.warn('Use of `tenantId` is deprecated when calling logIn() method, use `domainName` instead.');
|
|
2288
2290
|
body.tenant_id = params.tenantId;
|
|
2289
2291
|
}
|
|
2290
2292
|
|
|
2293
|
+
if (params.domainName) {
|
|
2294
|
+
body.domain_name = params.domainName;
|
|
2295
|
+
}
|
|
2296
|
+
|
|
2291
2297
|
return client.post(`${baseUrl}/token`, body, headers).then(response => Session.parse(response));
|
|
2292
2298
|
},
|
|
2293
2299
|
|
|
@@ -2300,6 +2306,7 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2300
2306
|
expiration ,
|
|
2301
2307
|
isMobile = false,
|
|
2302
2308
|
tenantId ,
|
|
2309
|
+
domainName ,
|
|
2303
2310
|
) => {
|
|
2304
2311
|
const body = {
|
|
2305
2312
|
backend: backend || DEFAULT_BACKEND_USER,
|
|
@@ -2309,9 +2316,14 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2309
2316
|
};
|
|
2310
2317
|
|
|
2311
2318
|
if (tenantId) {
|
|
2319
|
+
console.warn('Use of `tenantId` is deprecated when calling refreshToken() method, use `domainName` instead.');
|
|
2312
2320
|
body.tenant_id = tenantId;
|
|
2313
2321
|
}
|
|
2314
2322
|
|
|
2323
|
+
if (domainName) {
|
|
2324
|
+
body.domain_name = domainName;
|
|
2325
|
+
}
|
|
2326
|
+
|
|
2315
2327
|
const headers = {
|
|
2316
2328
|
'Content-Type': 'application/json',
|
|
2317
2329
|
...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
|
|
@@ -5583,6 +5595,7 @@ class ApiClient {
|
|
|
5583
5595
|
|
|
5584
5596
|
|
|
5585
5597
|
|
|
5598
|
+
|
|
5586
5599
|
|
|
5587
5600
|
|
|
5588
5601
|
|
|
@@ -5624,6 +5637,7 @@ class ApiClient {
|
|
|
5624
5637
|
refreshToken: this.refreshToken,
|
|
5625
5638
|
refreshBackend: this.refreshBackend,
|
|
5626
5639
|
refreshTenantId: this.refreshTenantId,
|
|
5640
|
+
refreshDomainName: this.refreshDomainName,
|
|
5627
5641
|
refreshExpiration: this.refreshExpiration,
|
|
5628
5642
|
isMobile: this.isMobile,
|
|
5629
5643
|
});
|
|
@@ -5639,6 +5653,7 @@ class ApiClient {
|
|
|
5639
5653
|
this.refreshExpiration,
|
|
5640
5654
|
this.isMobile,
|
|
5641
5655
|
this.refreshTenantId,
|
|
5656
|
+
this.refreshDomainName,
|
|
5642
5657
|
);
|
|
5643
5658
|
|
|
5644
5659
|
logger$a.info('token refreshed', { token: session.token });
|
|
@@ -5692,9 +5707,14 @@ class ApiClient {
|
|
|
5692
5707
|
}
|
|
5693
5708
|
|
|
5694
5709
|
setRefreshTenantId(tenantId ) {
|
|
5710
|
+
console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead');
|
|
5695
5711
|
this.refreshTenantId = tenantId;
|
|
5696
5712
|
}
|
|
5697
5713
|
|
|
5714
|
+
setRefreshDomainName(domainName ) {
|
|
5715
|
+
this.refreshDomainName = domainName;
|
|
5716
|
+
}
|
|
5717
|
+
|
|
5698
5718
|
setIsMobile(isMobile ) {
|
|
5699
5719
|
this.isMobile = isMobile;
|
|
5700
5720
|
}
|
|
@@ -5719,6 +5739,7 @@ global.wazoClientId = global.wazoClientId || {};
|
|
|
5719
5739
|
global.wazoClientToken = global.wazoClientToken || {};
|
|
5720
5740
|
global.wazoRefreshToken = global.wazoRefreshToken || {};
|
|
5721
5741
|
global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
|
|
5742
|
+
global.wazoRefreshDomainName = global.wazoRefreshDomainName || {};
|
|
5722
5743
|
global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
|
|
5723
5744
|
global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
|
|
5724
5745
|
global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
|
|
@@ -5743,9 +5764,14 @@ const setRefreshToken = (newRefreshToken , forServer = null) =>
|
|
|
5743
5764
|
};
|
|
5744
5765
|
|
|
5745
5766
|
const setRefreshTenantId = (refreshTenantId , forServer = null) => {
|
|
5767
|
+
console.warn('Use of `setRefreshTenantId` is deprecated, please use `setRefreshDomainName` instead');
|
|
5746
5768
|
global.wazoRefreshTenantId[forServer] = refreshTenantId;
|
|
5747
5769
|
};
|
|
5748
5770
|
|
|
5771
|
+
const setRefreshDomainName = (refreshDomainName , forServer = null) => {
|
|
5772
|
+
global.wazoRefreshDomainName[forServer] = refreshDomainName;
|
|
5773
|
+
};
|
|
5774
|
+
|
|
5749
5775
|
const setOnRefreshToken = (onRefreshToken , forServer = null) => {
|
|
5750
5776
|
global.wazoOnRefreshToken[forServer] = onRefreshToken;
|
|
5751
5777
|
};
|
|
@@ -5764,6 +5790,7 @@ const setFetchOptions = (fetchOptions , forServer = null) => {
|
|
|
5764
5790
|
|
|
5765
5791
|
const fillClient = (apiClient ) => {
|
|
5766
5792
|
const { server, token, clientId } = apiClient.client;
|
|
5793
|
+
const tenantId = global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId;
|
|
5767
5794
|
|
|
5768
5795
|
// try with null server when dealing with non-related server info
|
|
5769
5796
|
apiClient.setToken(global.wazoClientToken[server] || global.wazoClientToken[null] || token);
|
|
@@ -5772,8 +5799,12 @@ const fillClient = (apiClient ) => {
|
|
|
5772
5799
|
|
|
5773
5800
|
apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
|
|
5774
5801
|
|
|
5775
|
-
|
|
5776
|
-
|
|
5802
|
+
if (tenantId) {
|
|
5803
|
+
apiClient.setRefreshTenantId(tenantId);
|
|
5804
|
+
}
|
|
5805
|
+
|
|
5806
|
+
apiClient.setRefreshDomainName(
|
|
5807
|
+
global.wazoRefreshDomainName[server] || global.wazoRefreshDomainName[null] || apiClient.refreshDomainName,
|
|
5777
5808
|
);
|
|
5778
5809
|
|
|
5779
5810
|
apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
|
|
@@ -5815,6 +5846,7 @@ var getApiClient = (forServer = null) => {
|
|
|
5815
5846
|
class InvalidSubscription extends Error {}
|
|
5816
5847
|
class InvalidAuthorization extends Error {}
|
|
5817
5848
|
class NoTenantIdError extends Error {}
|
|
5849
|
+
class NoDomainNameError extends Error {}
|
|
5818
5850
|
|
|
5819
5851
|
const logger$9 = IssueReporter$1.loggerFor('simple-auth');
|
|
5820
5852
|
|
|
@@ -5878,9 +5910,24 @@ class Auth {
|
|
|
5878
5910
|
setFetchOptions(options);
|
|
5879
5911
|
}
|
|
5880
5912
|
|
|
5881
|
-
async logIn(username , password , backend ,
|
|
5882
|
-
|
|
5883
|
-
|
|
5913
|
+
async logIn(username , password , backend , extra ) {
|
|
5914
|
+
let tenantId = null;
|
|
5915
|
+
let domainName = null;
|
|
5916
|
+
if (typeof extra === 'string') {
|
|
5917
|
+
tenantId = extra;
|
|
5918
|
+
}
|
|
5919
|
+
if (extra && typeof extra === 'object') {
|
|
5920
|
+
domainName = extra.domainName;
|
|
5921
|
+
}
|
|
5922
|
+
|
|
5923
|
+
if (backend && backend !== this.BACKEND_WAZO && !tenantId && !domainName) {
|
|
5924
|
+
if (!tenantId) {
|
|
5925
|
+
throw new NoTenantIdError('No tenant id');
|
|
5926
|
+
}
|
|
5927
|
+
|
|
5928
|
+
if (!domainName) {
|
|
5929
|
+
throw new NoDomainNameError('No domain name');
|
|
5930
|
+
}
|
|
5884
5931
|
}
|
|
5885
5932
|
|
|
5886
5933
|
this.authenticated = false;
|
|
@@ -5890,6 +5937,7 @@ class Auth {
|
|
|
5890
5937
|
password,
|
|
5891
5938
|
backend,
|
|
5892
5939
|
tenantId,
|
|
5940
|
+
domainName,
|
|
5893
5941
|
expiration: this.expiration,
|
|
5894
5942
|
mobile: this.mobile,
|
|
5895
5943
|
});
|
|
@@ -5898,7 +5946,13 @@ class Auth {
|
|
|
5898
5946
|
getApiClient().setRefreshBackend(backend);
|
|
5899
5947
|
}
|
|
5900
5948
|
|
|
5901
|
-
|
|
5949
|
+
if (tenantId) {
|
|
5950
|
+
getApiClient().setRefreshTenantId(tenantId);
|
|
5951
|
+
}
|
|
5952
|
+
|
|
5953
|
+
if (domainName) {
|
|
5954
|
+
getApiClient().setRefreshDomainName(domainName);
|
|
5955
|
+
}
|
|
5902
5956
|
|
|
5903
5957
|
return this._onAuthenticated(rawSession);
|
|
5904
5958
|
}
|
|
@@ -5997,11 +6051,18 @@ class Auth {
|
|
|
5997
6051
|
}
|
|
5998
6052
|
|
|
5999
6053
|
setRefreshTenantId(refreshTenantId ) {
|
|
6054
|
+
console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead.');
|
|
6000
6055
|
setRefreshTenantId(refreshTenantId);
|
|
6001
6056
|
|
|
6002
6057
|
getApiClient().setRefreshTenantId(refreshTenantId);
|
|
6003
6058
|
}
|
|
6004
6059
|
|
|
6060
|
+
setRefreshDomainName(domainName ) {
|
|
6061
|
+
setRefreshDomainName(domainName);
|
|
6062
|
+
|
|
6063
|
+
getApiClient().setRefreshDomainName(domainName);
|
|
6064
|
+
}
|
|
6065
|
+
|
|
6005
6066
|
forceRefreshToken() {
|
|
6006
6067
|
getApiClient().forceRefreshToken();
|
|
6007
6068
|
}
|
|
@@ -13155,6 +13216,7 @@ class Softphone {
|
|
|
13155
13216
|
wrapUpDuration,
|
|
13156
13217
|
enableAgent = true,
|
|
13157
13218
|
tenantId,
|
|
13219
|
+
domainName,
|
|
13158
13220
|
debug = false,
|
|
13159
13221
|
} = {}) {
|
|
13160
13222
|
this.url = url || 'https://softphone.wazo.io';
|
|
@@ -13179,8 +13241,12 @@ class Softphone {
|
|
|
13179
13241
|
config.port = port;
|
|
13180
13242
|
}
|
|
13181
13243
|
if (tenantId) {
|
|
13244
|
+
console.warn('Use of `tenantId` is deprecated when calling `Softphone.init()`, use `domainName` instead');
|
|
13182
13245
|
config.tenantId = tenantId;
|
|
13183
13246
|
}
|
|
13247
|
+
if (domainName) {
|
|
13248
|
+
config.domainName = domainName;
|
|
13249
|
+
}
|
|
13184
13250
|
if (wrapUpDuration) {
|
|
13185
13251
|
config.wrapUpDuration = wrapUpDuration;
|
|
13186
13252
|
}
|
|
@@ -13501,6 +13567,7 @@ const Wazo = {
|
|
|
13501
13567
|
CanceledCallError,
|
|
13502
13568
|
SFUNotAvailableError,
|
|
13503
13569
|
NoTenantIdError,
|
|
13570
|
+
NoDomainNameError,
|
|
13504
13571
|
};
|
|
13505
13572
|
|
|
13506
13573
|
if (window) {
|
|
@@ -2239,6 +2239,7 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2239
2239
|
|
|
2240
2240
|
|
|
2241
2241
|
|
|
2242
|
+
|
|
2242
2243
|
) {
|
|
2243
2244
|
const body = {
|
|
2244
2245
|
backend: params.backend || DEFAULT_BACKEND_USER,
|
|
@@ -2259,9 +2260,14 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2259
2260
|
}
|
|
2260
2261
|
|
|
2261
2262
|
if (params.tenantId) {
|
|
2263
|
+
console.warn('Use of `tenantId` is deprecated when calling logIn() method, use `domainName` instead.');
|
|
2262
2264
|
body.tenant_id = params.tenantId;
|
|
2263
2265
|
}
|
|
2264
2266
|
|
|
2267
|
+
if (params.domainName) {
|
|
2268
|
+
body.domain_name = params.domainName;
|
|
2269
|
+
}
|
|
2270
|
+
|
|
2265
2271
|
return client.post(`${baseUrl}/token`, body, headers).then(response => Session.parse(response));
|
|
2266
2272
|
},
|
|
2267
2273
|
|
|
@@ -2274,6 +2280,7 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2274
2280
|
expiration ,
|
|
2275
2281
|
isMobile = false,
|
|
2276
2282
|
tenantId ,
|
|
2283
|
+
domainName ,
|
|
2277
2284
|
) => {
|
|
2278
2285
|
const body = {
|
|
2279
2286
|
backend: backend || DEFAULT_BACKEND_USER,
|
|
@@ -2283,9 +2290,14 @@ var authMethods = (client , baseUrl ) => ({
|
|
|
2283
2290
|
};
|
|
2284
2291
|
|
|
2285
2292
|
if (tenantId) {
|
|
2293
|
+
console.warn('Use of `tenantId` is deprecated when calling refreshToken() method, use `domainName` instead.');
|
|
2286
2294
|
body.tenant_id = tenantId;
|
|
2287
2295
|
}
|
|
2288
2296
|
|
|
2297
|
+
if (domainName) {
|
|
2298
|
+
body.domain_name = domainName;
|
|
2299
|
+
}
|
|
2300
|
+
|
|
2289
2301
|
const headers = {
|
|
2290
2302
|
'Content-Type': 'application/json',
|
|
2291
2303
|
...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
|
|
@@ -5583,6 +5595,7 @@ class ApiClient {
|
|
|
5583
5595
|
|
|
5584
5596
|
|
|
5585
5597
|
|
|
5598
|
+
|
|
5586
5599
|
|
|
5587
5600
|
|
|
5588
5601
|
|
|
@@ -5624,6 +5637,7 @@ class ApiClient {
|
|
|
5624
5637
|
refreshToken: this.refreshToken,
|
|
5625
5638
|
refreshBackend: this.refreshBackend,
|
|
5626
5639
|
refreshTenantId: this.refreshTenantId,
|
|
5640
|
+
refreshDomainName: this.refreshDomainName,
|
|
5627
5641
|
refreshExpiration: this.refreshExpiration,
|
|
5628
5642
|
isMobile: this.isMobile,
|
|
5629
5643
|
});
|
|
@@ -5639,6 +5653,7 @@ class ApiClient {
|
|
|
5639
5653
|
this.refreshExpiration,
|
|
5640
5654
|
this.isMobile,
|
|
5641
5655
|
this.refreshTenantId,
|
|
5656
|
+
this.refreshDomainName,
|
|
5642
5657
|
);
|
|
5643
5658
|
|
|
5644
5659
|
logger$a.info('token refreshed', { token: session.token });
|
|
@@ -5692,9 +5707,14 @@ class ApiClient {
|
|
|
5692
5707
|
}
|
|
5693
5708
|
|
|
5694
5709
|
setRefreshTenantId(tenantId ) {
|
|
5710
|
+
console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead');
|
|
5695
5711
|
this.refreshTenantId = tenantId;
|
|
5696
5712
|
}
|
|
5697
5713
|
|
|
5714
|
+
setRefreshDomainName(domainName ) {
|
|
5715
|
+
this.refreshDomainName = domainName;
|
|
5716
|
+
}
|
|
5717
|
+
|
|
5698
5718
|
setIsMobile(isMobile ) {
|
|
5699
5719
|
this.isMobile = isMobile;
|
|
5700
5720
|
}
|
|
@@ -5719,6 +5739,7 @@ global.wazoClientId = global.wazoClientId || {};
|
|
|
5719
5739
|
global.wazoClientToken = global.wazoClientToken || {};
|
|
5720
5740
|
global.wazoRefreshToken = global.wazoRefreshToken || {};
|
|
5721
5741
|
global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
|
|
5742
|
+
global.wazoRefreshDomainName = global.wazoRefreshDomainName || {};
|
|
5722
5743
|
global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
|
|
5723
5744
|
global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
|
|
5724
5745
|
global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
|
|
@@ -5743,9 +5764,14 @@ const setRefreshToken = (newRefreshToken , forServer = null) =>
|
|
|
5743
5764
|
};
|
|
5744
5765
|
|
|
5745
5766
|
const setRefreshTenantId = (refreshTenantId , forServer = null) => {
|
|
5767
|
+
console.warn('Use of `setRefreshTenantId` is deprecated, please use `setRefreshDomainName` instead');
|
|
5746
5768
|
global.wazoRefreshTenantId[forServer] = refreshTenantId;
|
|
5747
5769
|
};
|
|
5748
5770
|
|
|
5771
|
+
const setRefreshDomainName = (refreshDomainName , forServer = null) => {
|
|
5772
|
+
global.wazoRefreshDomainName[forServer] = refreshDomainName;
|
|
5773
|
+
};
|
|
5774
|
+
|
|
5749
5775
|
const setOnRefreshToken = (onRefreshToken , forServer = null) => {
|
|
5750
5776
|
global.wazoOnRefreshToken[forServer] = onRefreshToken;
|
|
5751
5777
|
};
|
|
@@ -5764,6 +5790,7 @@ const setFetchOptions = (fetchOptions , forServer = null) => {
|
|
|
5764
5790
|
|
|
5765
5791
|
const fillClient = (apiClient ) => {
|
|
5766
5792
|
const { server, token, clientId } = apiClient.client;
|
|
5793
|
+
const tenantId = global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId;
|
|
5767
5794
|
|
|
5768
5795
|
// try with null server when dealing with non-related server info
|
|
5769
5796
|
apiClient.setToken(global.wazoClientToken[server] || global.wazoClientToken[null] || token);
|
|
@@ -5772,8 +5799,12 @@ const fillClient = (apiClient ) => {
|
|
|
5772
5799
|
|
|
5773
5800
|
apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
|
|
5774
5801
|
|
|
5775
|
-
|
|
5776
|
-
|
|
5802
|
+
if (tenantId) {
|
|
5803
|
+
apiClient.setRefreshTenantId(tenantId);
|
|
5804
|
+
}
|
|
5805
|
+
|
|
5806
|
+
apiClient.setRefreshDomainName(
|
|
5807
|
+
global.wazoRefreshDomainName[server] || global.wazoRefreshDomainName[null] || apiClient.refreshDomainName,
|
|
5777
5808
|
);
|
|
5778
5809
|
|
|
5779
5810
|
apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
|
|
@@ -5815,6 +5846,7 @@ var getApiClient = (forServer = null) => {
|
|
|
5815
5846
|
class InvalidSubscription extends Error {}
|
|
5816
5847
|
class InvalidAuthorization extends Error {}
|
|
5817
5848
|
class NoTenantIdError extends Error {}
|
|
5849
|
+
class NoDomainNameError extends Error {}
|
|
5818
5850
|
|
|
5819
5851
|
const logger$9 = IssueReporter$1.loggerFor('simple-auth');
|
|
5820
5852
|
|
|
@@ -5878,9 +5910,24 @@ class Auth {
|
|
|
5878
5910
|
setFetchOptions(options);
|
|
5879
5911
|
}
|
|
5880
5912
|
|
|
5881
|
-
async logIn(username , password , backend ,
|
|
5882
|
-
|
|
5883
|
-
|
|
5913
|
+
async logIn(username , password , backend , extra ) {
|
|
5914
|
+
let tenantId = null;
|
|
5915
|
+
let domainName = null;
|
|
5916
|
+
if (typeof extra === 'string') {
|
|
5917
|
+
tenantId = extra;
|
|
5918
|
+
}
|
|
5919
|
+
if (extra && typeof extra === 'object') {
|
|
5920
|
+
domainName = extra.domainName;
|
|
5921
|
+
}
|
|
5922
|
+
|
|
5923
|
+
if (backend && backend !== this.BACKEND_WAZO && !tenantId && !domainName) {
|
|
5924
|
+
if (!tenantId) {
|
|
5925
|
+
throw new NoTenantIdError('No tenant id');
|
|
5926
|
+
}
|
|
5927
|
+
|
|
5928
|
+
if (!domainName) {
|
|
5929
|
+
throw new NoDomainNameError('No domain name');
|
|
5930
|
+
}
|
|
5884
5931
|
}
|
|
5885
5932
|
|
|
5886
5933
|
this.authenticated = false;
|
|
@@ -5890,6 +5937,7 @@ class Auth {
|
|
|
5890
5937
|
password,
|
|
5891
5938
|
backend,
|
|
5892
5939
|
tenantId,
|
|
5940
|
+
domainName,
|
|
5893
5941
|
expiration: this.expiration,
|
|
5894
5942
|
mobile: this.mobile,
|
|
5895
5943
|
});
|
|
@@ -5898,7 +5946,13 @@ class Auth {
|
|
|
5898
5946
|
getApiClient().setRefreshBackend(backend);
|
|
5899
5947
|
}
|
|
5900
5948
|
|
|
5901
|
-
|
|
5949
|
+
if (tenantId) {
|
|
5950
|
+
getApiClient().setRefreshTenantId(tenantId);
|
|
5951
|
+
}
|
|
5952
|
+
|
|
5953
|
+
if (domainName) {
|
|
5954
|
+
getApiClient().setRefreshDomainName(domainName);
|
|
5955
|
+
}
|
|
5902
5956
|
|
|
5903
5957
|
return this._onAuthenticated(rawSession);
|
|
5904
5958
|
}
|
|
@@ -5997,11 +6051,18 @@ class Auth {
|
|
|
5997
6051
|
}
|
|
5998
6052
|
|
|
5999
6053
|
setRefreshTenantId(refreshTenantId ) {
|
|
6054
|
+
console.warn('Use of `setRefreshTenantId` is deprecated, use `setRefreshDomainName` instead.');
|
|
6000
6055
|
setRefreshTenantId(refreshTenantId);
|
|
6001
6056
|
|
|
6002
6057
|
getApiClient().setRefreshTenantId(refreshTenantId);
|
|
6003
6058
|
}
|
|
6004
6059
|
|
|
6060
|
+
setRefreshDomainName(domainName ) {
|
|
6061
|
+
setRefreshDomainName(domainName);
|
|
6062
|
+
|
|
6063
|
+
getApiClient().setRefreshDomainName(domainName);
|
|
6064
|
+
}
|
|
6065
|
+
|
|
6005
6066
|
forceRefreshToken() {
|
|
6006
6067
|
getApiClient().forceRefreshToken();
|
|
6007
6068
|
}
|
|
@@ -13473,6 +13534,7 @@ class Softphone {
|
|
|
13473
13534
|
wrapUpDuration,
|
|
13474
13535
|
enableAgent = true,
|
|
13475
13536
|
tenantId,
|
|
13537
|
+
domainName,
|
|
13476
13538
|
debug = false,
|
|
13477
13539
|
} = {}) {
|
|
13478
13540
|
this.url = url || 'https://softphone.wazo.io';
|
|
@@ -13497,8 +13559,12 @@ class Softphone {
|
|
|
13497
13559
|
config.port = port;
|
|
13498
13560
|
}
|
|
13499
13561
|
if (tenantId) {
|
|
13562
|
+
console.warn('Use of `tenantId` is deprecated when calling `Softphone.init()`, use `domainName` instead');
|
|
13500
13563
|
config.tenantId = tenantId;
|
|
13501
13564
|
}
|
|
13565
|
+
if (domainName) {
|
|
13566
|
+
config.domainName = domainName;
|
|
13567
|
+
}
|
|
13502
13568
|
if (wrapUpDuration) {
|
|
13503
13569
|
config.wrapUpDuration = wrapUpDuration;
|
|
13504
13570
|
}
|
|
@@ -13819,6 +13885,7 @@ const Wazo = {
|
|
|
13819
13885
|
CanceledCallError,
|
|
13820
13886
|
SFUNotAvailableError,
|
|
13821
13887
|
NoTenantIdError,
|
|
13888
|
+
NoDomainNameError,
|
|
13822
13889
|
};
|
|
13823
13890
|
|
|
13824
13891
|
if (window) {
|