@colijnit/ioneconnector 262.1.1 → 262.1.3
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/build/enum/public-service-method.enum.d.ts +2 -1
- package/build/enum/public-service-method.enum.js +1 -0
- package/build/enum/public-service-method.enum.js.map +1 -1
- package/build/interface/authorized-axios-request-config.interface.d.ts +5 -0
- package/build/interface/authorized-axios-request-config.interface.js +3 -0
- package/build/interface/authorized-axios-request-config.interface.js.map +1 -0
- package/build/model/local-storage-user-object.d.ts +1 -0
- package/build/model/local-storage-user-object.js.map +1 -1
- package/build/model/login-request.d.ts +1 -0
- package/build/model/login-request.js.map +1 -1
- package/build/provider/ajax.service.d.ts +7 -1
- package/build/provider/ajax.service.js +115 -61
- package/build/provider/ajax.service.js.map +1 -1
- package/build/provider/base-backend-connection.service.js +3 -4
- package/build/provider/base-backend-connection.service.js.map +1 -1
- package/build/service/external-jwt-token.service.d.ts +2 -1
- package/build/service/external-jwt-token.service.js +4 -0
- package/build/service/external-jwt-token.service.js.map +1 -1
- package/build/service/health.service.js +3 -1
- package/build/service/health.service.js.map +1 -1
- package/build/service/internal-jwt-token.service.d.ts +5 -2
- package/build/service/internal-jwt-token.service.js +31 -14
- package/build/service/internal-jwt-token.service.js.map +1 -1
- package/build/service/jwt-token.service.d.ts +6 -3
- package/build/service/jwt-token.service.js +19 -6
- package/build/service/jwt-token.service.js.map +1 -1
- package/build/service/local-storage.service.d.ts +2 -0
- package/build/service/local-storage.service.js +13 -0
- package/build/service/local-storage.service.js.map +1 -1
- package/build/service/login.service.js +33 -42
- package/build/service/login.service.js.map +1 -1
- package/build/service/public.service.js +4 -7
- package/build/service/public.service.js.map +1 -1
- package/build/service/storage.service.d.ts +2 -0
- package/build/service/storage.service.js +6 -0
- package/build/service/storage.service.js.map +1 -1
- package/build/service/user-info.service.js +1 -0
- package/build/service/user-info.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,5 +6,6 @@ var PublicServiceMethod;
|
|
|
6
6
|
PublicServiceMethod["GetPublicKey"] = "getPublicKey";
|
|
7
7
|
PublicServiceMethod["GetKeycloakParams"] = "getKeycloakParams";
|
|
8
8
|
PublicServiceMethod["Companies"] = "companies";
|
|
9
|
+
PublicServiceMethod["GetPublicParams"] = "getPublicParams";
|
|
9
10
|
})(PublicServiceMethod || (exports.PublicServiceMethod = PublicServiceMethod = {}));
|
|
10
11
|
//# sourceMappingURL=public-service-method.enum.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-service-method.enum.js","sourceRoot":"","sources":["../../src/enum/public-service-method.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,
|
|
1
|
+
{"version":3,"file":"public-service-method.enum.js","sourceRoot":"","sources":["../../src/enum/public-service-method.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,mBAKX;AALD,WAAY,mBAAmB;IAC3B,oDAA6B,CAAA;IAC7B,8DAAuC,CAAA;IACvC,8CAAuB,CAAA;IACvB,0DAAmC,CAAA;AACvC,CAAC,EALW,mBAAmB,mCAAnB,mBAAmB,QAK9B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authorized-axios-request-config.interface.js","sourceRoot":"","sources":["../../src/interface/authorized-axios-request-config.interface.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-storage-user-object.js","sourceRoot":"","sources":["../../src/model/local-storage-user-object.ts"],"names":[],"mappings":";;;AAGA,MAAa,sBAAsB;IAAnC;QAIS,cAAS,GAAqB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"local-storage-user-object.js","sourceRoot":"","sources":["../../src/model/local-storage-user-object.ts"],"names":[],"mappings":";;;AAGA,MAAa,sBAAsB;IAAnC;QAIS,cAAS,GAAqB,EAAE,CAAC;IAK1C,CAAC;CAAA;AATD,wDASC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-request.js","sourceRoot":"","sources":["../../src/model/login-request.ts"],"names":[],"mappings":";;;AAGA,MAAa,YAAY;
|
|
1
|
+
{"version":3,"file":"login-request.js","sourceRoot":"","sources":["../../src/model/login-request.ts"],"names":[],"mappings":";;;AAGA,MAAa,YAAY;CAoBxB;AApBD,oCAoBC"}
|
|
@@ -8,9 +8,10 @@ import { LoginResponse } from '../model/login-response';
|
|
|
8
8
|
export declare class AjaxService extends BaseBackendConnectionService {
|
|
9
9
|
private _showLoaderRequests;
|
|
10
10
|
private _timeout;
|
|
11
|
+
private _axiosInstance;
|
|
11
12
|
constructor(options: Options);
|
|
12
13
|
checkAndPrepareKeycloak(): Promise<LoginResponse>;
|
|
13
|
-
connect(url?: string, schema?: string, version?: string): Promise<LoginResponse>;
|
|
14
|
+
connect(url?: string, schema?: string, version?: string, reConnect?: boolean): Promise<LoginResponse>;
|
|
14
15
|
hasSession(): boolean;
|
|
15
16
|
getSessionId(): string;
|
|
16
17
|
getDataSessionId(): string;
|
|
@@ -28,7 +29,12 @@ export declare class AjaxService extends BaseBackendConnectionService {
|
|
|
28
29
|
clearStorageAndLogout(): void;
|
|
29
30
|
close(): Promise<ServerResponseData>;
|
|
30
31
|
protected _doCall(method: string, data?: DataServiceData | PublicServiceRequestData, showLoader?: boolean, service?: string, endPoint?: string, isPublicService?: boolean, ownMessage?: {}, url?: string): Promise<ServerResponseData>;
|
|
32
|
+
private _registerInterceptors;
|
|
33
|
+
private _reLoginAndRenewToken;
|
|
31
34
|
private _nativeLogin;
|
|
35
|
+
private _tryNativeLoginWithRequest;
|
|
36
|
+
private _getLoginResponseFromActiveUserOrNativeLogin;
|
|
37
|
+
private _storeSuccessfulLoginResponse;
|
|
32
38
|
private _methodNeedsAccessToken;
|
|
33
39
|
private _waitForAccessToken;
|
|
34
40
|
private setShowLoaderRequests;
|
|
@@ -7,8 +7,9 @@ const axios_1 = require("axios");
|
|
|
7
7
|
const url_utils_1 = require("../utils/url-utils");
|
|
8
8
|
const datasession_service_method_enum_1 = require("../enum/datasession-service-method.enum");
|
|
9
9
|
const end_point_enum_1 = require("../enum/end-point.enum");
|
|
10
|
+
const login_request_1 = require("../model/login-request");
|
|
10
11
|
const login_response_1 = require("../model/login-response");
|
|
11
|
-
const
|
|
12
|
+
const SUCCESS_LOGIN_STATUS = 'SUCCESS';
|
|
12
13
|
class AjaxService extends base_backend_connection_service_1.BaseBackendConnectionService {
|
|
13
14
|
constructor(options) {
|
|
14
15
|
super(options);
|
|
@@ -17,17 +18,19 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
17
18
|
if (options && options.timeoutInMs) {
|
|
18
19
|
this._timeout = options.timeoutInMs;
|
|
19
20
|
}
|
|
21
|
+
this._axiosInstance = axios_1.default.create();
|
|
22
|
+
this._registerInterceptors();
|
|
20
23
|
}
|
|
21
24
|
async checkAndPrepareKeycloak() {
|
|
22
25
|
await this.loginService.getKeycloakParams();
|
|
23
26
|
await this.loginService.getCompanies();
|
|
24
|
-
const keycloakCode = this._getParameter(
|
|
25
|
-
const keycloakState = this._getParameter(
|
|
27
|
+
const keycloakCode = this._getParameter('code');
|
|
28
|
+
const keycloakState = this._getParameter('state');
|
|
26
29
|
if (keycloakCode && keycloakState) {
|
|
27
30
|
let url = window.location.href;
|
|
28
31
|
url = url.replace('#', '?');
|
|
29
|
-
const uri = url.split(
|
|
30
|
-
window.history.replaceState(null,
|
|
32
|
+
const uri = url.split('?')[0];
|
|
33
|
+
window.history.replaceState(null, '', uri);
|
|
31
34
|
this.usePublicToken = false;
|
|
32
35
|
return this.loginService.loginByKeycloakCode(keycloakCode, keycloakState, uri);
|
|
33
36
|
}
|
|
@@ -37,7 +40,10 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
37
40
|
}
|
|
38
41
|
}
|
|
39
42
|
}
|
|
40
|
-
async connect(url, schema, version) {
|
|
43
|
+
async connect(url, schema, version, reConnect) {
|
|
44
|
+
if (reConnect === undefined || reConnect === null) {
|
|
45
|
+
reConnect = false;
|
|
46
|
+
}
|
|
41
47
|
const keycloakLoginData = this.storageService.getSessionKeycloakLoginData();
|
|
42
48
|
if (keycloakLoginData) {
|
|
43
49
|
const userNameFromKeycloak = keycloakLoginData.userName;
|
|
@@ -50,15 +56,15 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
50
56
|
}
|
|
51
57
|
}
|
|
52
58
|
if (this.usePublicToken) {
|
|
53
|
-
if (this.storageService.sessionPublicToken) {
|
|
59
|
+
if (this.storageService.sessionPublicToken && !reConnect) {
|
|
54
60
|
const publicLogin = new login_response_1.LoginResponse();
|
|
55
|
-
publicLogin.loginStatus =
|
|
61
|
+
publicLogin.loginStatus = SUCCESS_LOGIN_STATUS;
|
|
56
62
|
return publicLogin;
|
|
57
63
|
}
|
|
58
64
|
const tokenResponse = await this.createPublicSession();
|
|
59
65
|
if (tokenResponse) {
|
|
60
66
|
const publicLogin = new login_response_1.LoginResponse();
|
|
61
|
-
publicLogin.loginStatus =
|
|
67
|
+
publicLogin.loginStatus = SUCCESS_LOGIN_STATUS;
|
|
62
68
|
return publicLogin;
|
|
63
69
|
}
|
|
64
70
|
return null;
|
|
@@ -66,17 +72,11 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
66
72
|
else {
|
|
67
73
|
let response;
|
|
68
74
|
if (this.storageService.localSessionId) {
|
|
69
|
-
if (!this.storageService.localLoginResponse) {
|
|
70
|
-
response =
|
|
71
|
-
|
|
72
|
-
this.
|
|
73
|
-
|
|
74
|
-
else {
|
|
75
|
-
response = await this._nativeLogin(url, schema, version);
|
|
76
|
-
if (response && response.upId && response.loginStatus === 'SUCCESS') {
|
|
77
|
-
this.storageService.setLoginResponse(response);
|
|
78
|
-
}
|
|
79
|
-
}
|
|
75
|
+
if (!this.storageService.localLoginResponse || reConnect) {
|
|
76
|
+
response = reConnect
|
|
77
|
+
? await this._tryNativeLoginWithRequest(url, schema, version)
|
|
78
|
+
: await this._getLoginResponseFromActiveUserOrNativeLogin(url, schema, version);
|
|
79
|
+
this._storeSuccessfulLoginResponse(response);
|
|
80
80
|
return this.storageService.localLoginResponse;
|
|
81
81
|
}
|
|
82
82
|
try {
|
|
@@ -150,8 +150,8 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
150
150
|
method: method,
|
|
151
151
|
id: this.callId,
|
|
152
152
|
data: data,
|
|
153
|
-
dataSessionId: this.session ? this.session.dataSessionId :
|
|
154
|
-
sessionId: this.session ? this.session.id :
|
|
153
|
+
dataSessionId: this.session ? this.session.dataSessionId : '',
|
|
154
|
+
sessionId: this.session ? this.session.id : ''
|
|
155
155
|
});
|
|
156
156
|
navigator.sendBeacon(url_utils_1.UrlUtils.createReadableUrl(method, data, this.url, endPoint), messageToSend);
|
|
157
157
|
}
|
|
@@ -207,6 +207,9 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
207
207
|
}
|
|
208
208
|
}
|
|
209
209
|
_doCall(method, data = {}, showLoader = true, service = undefined, endPoint = end_point_enum_1.EndPoint.AjaxService, isPublicService = false, ownMessage, url) {
|
|
210
|
+
if (!navigator.onLine) {
|
|
211
|
+
return Promise.reject('No internet connection');
|
|
212
|
+
}
|
|
210
213
|
if (!service) {
|
|
211
214
|
if (!this.usePublicToken) {
|
|
212
215
|
service = backend_service_name_enum_1.BackendServiceName.LoginService;
|
|
@@ -223,9 +226,6 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
223
226
|
message = JSON.stringify(ownMessage);
|
|
224
227
|
}
|
|
225
228
|
else {
|
|
226
|
-
if (this._methodNeedsAccessToken(method) && service !== backend_service_name_enum_1.BackendServiceName.PublicService) {
|
|
227
|
-
await this._waitForAccessToken((data && service && service === backend_service_name_enum_1.BackendServiceName.LoginService) || method === datasession_service_method_enum_1.DatasessionServiceMethod.CreatePublicSession, this.usePublicToken);
|
|
228
|
-
}
|
|
229
229
|
if (this.usePublicToken && !isPublicService) {
|
|
230
230
|
message = JSON.stringify({
|
|
231
231
|
method: method,
|
|
@@ -239,26 +239,28 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
239
239
|
method: method,
|
|
240
240
|
id: this.callId,
|
|
241
241
|
data: data,
|
|
242
|
-
dataSessionId: this.session ? this.session.dataSessionId :
|
|
242
|
+
dataSessionId: this.session ? this.session.dataSessionId : '',
|
|
243
243
|
windowSessionId: this.session ? this.session.windowsId : 1,
|
|
244
|
-
sessionId: this.session ? this.session.id :
|
|
244
|
+
sessionId: this.session ? this.session.id : ''
|
|
245
245
|
});
|
|
246
246
|
}
|
|
247
247
|
}
|
|
248
248
|
let headers = {
|
|
249
|
-
|
|
249
|
+
'Content-Type': 'application/json; charset=utf-8'
|
|
250
250
|
};
|
|
251
|
-
const authorize =
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
251
|
+
const authorize = this._methodNeedsAccessToken(method) &&
|
|
252
|
+
service !== backend_service_name_enum_1.BackendServiceName.LoginService &&
|
|
253
|
+
service !== backend_service_name_enum_1.BackendServiceName.PublicService;
|
|
254
|
+
const needsToken = this._methodNeedsAccessToken(method) && this.usePublicToken;
|
|
255
|
+
this._axiosInstance({
|
|
256
256
|
method: 'post',
|
|
257
257
|
url: readableUrl,
|
|
258
258
|
data: message,
|
|
259
259
|
withCredentials: authorize,
|
|
260
260
|
timeout: this._timeout,
|
|
261
|
-
headers: headers
|
|
261
|
+
headers: headers,
|
|
262
|
+
authorize: authorize,
|
|
263
|
+
needsToken: needsToken
|
|
262
264
|
}).then(response => {
|
|
263
265
|
if (response.data) {
|
|
264
266
|
if (response.data.exception) {
|
|
@@ -272,7 +274,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
272
274
|
}
|
|
273
275
|
}).catch(error => {
|
|
274
276
|
this.setShowLoaderRequests(0, showLoader);
|
|
275
|
-
if (error.code ===
|
|
277
|
+
if (error.code === 'ECONNABORTED') {
|
|
276
278
|
if (this.connectionAborted && !this.connectionAborted.closed) {
|
|
277
279
|
this.connectionAborted.next();
|
|
278
280
|
}
|
|
@@ -287,6 +289,38 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
287
289
|
});
|
|
288
290
|
});
|
|
289
291
|
}
|
|
292
|
+
_registerInterceptors() {
|
|
293
|
+
this._axiosInstance.interceptors.request.use(async (config) => {
|
|
294
|
+
const authorize = config.authorize === true;
|
|
295
|
+
const needsPublicToken = config.needsToken === true;
|
|
296
|
+
if (!authorize && !needsPublicToken) {
|
|
297
|
+
return config;
|
|
298
|
+
}
|
|
299
|
+
if (this.jwtService.retrievingToken) {
|
|
300
|
+
await this._waitForAccessToken();
|
|
301
|
+
}
|
|
302
|
+
else {
|
|
303
|
+
const hasToken = await this.jwtService.getAccessToken(needsPublicToken);
|
|
304
|
+
if (!hasToken) {
|
|
305
|
+
await this._reLoginAndRenewToken();
|
|
306
|
+
}
|
|
307
|
+
if (needsPublicToken) {
|
|
308
|
+
this.session.publicToken = this.jwtService.jwt;
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
if (authorize) {
|
|
312
|
+
config.headers = {
|
|
313
|
+
...(config.headers || {}),
|
|
314
|
+
Authorization: `Bearer ${this.jwtService.jwt}`
|
|
315
|
+
};
|
|
316
|
+
}
|
|
317
|
+
return config;
|
|
318
|
+
});
|
|
319
|
+
}
|
|
320
|
+
async _reLoginAndRenewToken() {
|
|
321
|
+
this.jwtService.setBusy(true);
|
|
322
|
+
await this.connect(this.url ? this.url : undefined, this.schema ? this.schema : undefined, this.version ? this.version.toString() : undefined, true);
|
|
323
|
+
}
|
|
290
324
|
_nativeLogin(url, schema, version) {
|
|
291
325
|
if (this.externalSourceId) {
|
|
292
326
|
return this.loginService.loginToExternalSource(this.externalSourceId, url, schema, version);
|
|
@@ -295,26 +329,46 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
295
329
|
return this.loginService.loginAndCreateDataSession();
|
|
296
330
|
}
|
|
297
331
|
}
|
|
332
|
+
_tryNativeLoginWithRequest(url, schema, version) {
|
|
333
|
+
if (this.externalSourceId) {
|
|
334
|
+
return this.loginService.loginToExternalSource(this.externalSourceId, url, schema, version);
|
|
335
|
+
}
|
|
336
|
+
else {
|
|
337
|
+
const request = new login_request_1.LoginRequest();
|
|
338
|
+
request.userName = this.options.username;
|
|
339
|
+
request.pw = this.options.password;
|
|
340
|
+
request.upId = parseInt(this.options.schema, 10);
|
|
341
|
+
request.clientVersion = this.version.toString();
|
|
342
|
+
request.clientLanguage = this.options.languageCode;
|
|
343
|
+
return this.loginService.loginAndCreateDataSession(request);
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
async _getLoginResponseFromActiveUserOrNativeLogin(url, schema, version) {
|
|
347
|
+
const activeUserResponse = await this.userInfoService.getActiveUserInfo();
|
|
348
|
+
if (activeUserResponse && activeUserResponse.upId && activeUserResponse.loginStatus === SUCCESS_LOGIN_STATUS) {
|
|
349
|
+
return activeUserResponse;
|
|
350
|
+
}
|
|
351
|
+
return this._tryNativeLoginWithRequest(url, schema, version);
|
|
352
|
+
}
|
|
353
|
+
_storeSuccessfulLoginResponse(loginResponse) {
|
|
354
|
+
if (loginResponse && loginResponse.upId && loginResponse.loginStatus === SUCCESS_LOGIN_STATUS) {
|
|
355
|
+
this.storageService.setLoginResponse(loginResponse);
|
|
356
|
+
}
|
|
357
|
+
}
|
|
298
358
|
_methodNeedsAccessToken(method) {
|
|
299
359
|
return this.methodWithoutAccessToken.indexOf(method) < 0;
|
|
300
360
|
}
|
|
301
|
-
async _waitForAccessToken(
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
window.tokenRetrieved.subscribe(() => {
|
|
306
|
-
resolve(true);
|
|
307
|
-
});
|
|
308
|
-
}
|
|
309
|
-
else {
|
|
361
|
+
async _waitForAccessToken() {
|
|
362
|
+
return new Promise((resolve) => {
|
|
363
|
+
if (window.hasOwnProperty('tokenRetrieved')) {
|
|
364
|
+
window.tokenRetrieved.subscribe(() => {
|
|
310
365
|
resolve(true);
|
|
311
|
-
}
|
|
312
|
-
}
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
}
|
|
366
|
+
});
|
|
367
|
+
}
|
|
368
|
+
else {
|
|
369
|
+
resolve(true);
|
|
370
|
+
}
|
|
371
|
+
});
|
|
318
372
|
}
|
|
319
373
|
setShowLoaderRequests(amount, showLoader) {
|
|
320
374
|
if (!showLoader) {
|
|
@@ -343,38 +397,38 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
343
397
|
const query = {
|
|
344
398
|
state: state,
|
|
345
399
|
client_id: this.options.keycloakClientId ? this.options.keycloakClientId : this.loginService.company.clientId,
|
|
346
|
-
response_type:
|
|
347
|
-
response_mode:
|
|
400
|
+
response_type: 'code',
|
|
401
|
+
response_mode: 'fragment',
|
|
348
402
|
redirect_uri: redirectUrl
|
|
349
403
|
};
|
|
350
404
|
const queryUrl = new URLSearchParams(query).toString();
|
|
351
|
-
const fullUrl = this.loginService.keycloakParams.keycloakUrl +
|
|
405
|
+
const fullUrl = this.loginService.keycloakParams.keycloakUrl + '/realms/' + this.loginService.company.realmId + '/protocol/openid-connect/auth' + '?' + queryUrl;
|
|
352
406
|
window.location.href = fullUrl;
|
|
353
407
|
setTimeout(() => {
|
|
354
408
|
}, 500);
|
|
355
409
|
}
|
|
356
410
|
else {
|
|
357
|
-
console.error(
|
|
411
|
+
console.error('Identity server information is not defined for the selected company');
|
|
358
412
|
}
|
|
359
413
|
}
|
|
360
414
|
_getParameter(parameterName) {
|
|
361
415
|
let url = window.location.href;
|
|
362
416
|
url = url.replace('#', '?');
|
|
363
|
-
parameterName = parameterName.replace(/[\[\]]/g,
|
|
364
|
-
const regex = new RegExp(
|
|
417
|
+
parameterName = parameterName.replace(/[\[\]]/g, '\\$&');
|
|
418
|
+
const regex = new RegExp('[?&]' + parameterName + '(=([^&#]*)|&|#|$)');
|
|
365
419
|
const results = regex.exec(url);
|
|
366
420
|
if (!results) {
|
|
367
421
|
return null;
|
|
368
422
|
}
|
|
369
423
|
else if (!results[2]) {
|
|
370
|
-
return
|
|
424
|
+
return '';
|
|
371
425
|
}
|
|
372
|
-
return decodeURIComponent(results[2].replace(/\+/g,
|
|
426
|
+
return decodeURIComponent(results[2].replace(/\+/g, ' '));
|
|
373
427
|
}
|
|
374
428
|
_createGuid() {
|
|
375
|
-
return
|
|
429
|
+
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
|
|
376
430
|
const r = Math.random() * 16 | 0;
|
|
377
|
-
return (c ===
|
|
431
|
+
return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
|
|
378
432
|
});
|
|
379
433
|
}
|
|
380
434
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ajax.service.js","sourceRoot":"","sources":["../../src/provider/ajax.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ajax.service.js","sourceRoot":"","sources":["../../src/provider/ajax.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ const user_info_service_1 = require("../service/user-info.service");
|
|
|
13
13
|
const external_jwt_token_service_1 = require("../service/external-jwt-token.service");
|
|
14
14
|
const internal_jwt_token_service_1 = require("../service/internal-jwt-token.service");
|
|
15
15
|
const public_service_method_enum_1 = require("../enum/public-service-method.enum");
|
|
16
|
-
const login_service_method_enum_1 = require("../enum/login-service-method.enum");
|
|
17
16
|
const storage_service_1 = require("../service/storage.service");
|
|
18
17
|
class BaseBackendConnectionService {
|
|
19
18
|
constructor(options) {
|
|
@@ -28,9 +27,9 @@ class BaseBackendConnectionService {
|
|
|
28
27
|
public_service_method_enum_1.PublicServiceMethod.GetKeycloakParams,
|
|
29
28
|
public_service_method_enum_1.PublicServiceMethod.Companies,
|
|
30
29
|
public_service_method_enum_1.PublicServiceMethod.GetPublicKey,
|
|
30
|
+
public_service_method_enum_1.PublicServiceMethod.GetPublicParams,
|
|
31
31
|
datasession_service_method_enum_1.DatasessionServiceMethod.CreatePublicSession,
|
|
32
|
-
datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession
|
|
33
|
-
login_service_method_enum_1.LoginServiceMethod.RefreshAccessToken
|
|
32
|
+
datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession
|
|
34
33
|
];
|
|
35
34
|
this.callId = "1";
|
|
36
35
|
this.options = options;
|
|
@@ -142,7 +141,7 @@ class BaseBackendConnectionService {
|
|
|
142
141
|
if (token) {
|
|
143
142
|
this.setSchemaUserNameAndVersion(this.schema, 'public');
|
|
144
143
|
this.storageService.setSessionPublicToken(token);
|
|
145
|
-
this.jwtService.setLoginDataByPublicToken(token);
|
|
144
|
+
this.jwtService.setLoginDataByPublicToken(this.schema, this.options.username, token);
|
|
146
145
|
this.createNewSession();
|
|
147
146
|
const tokenResponse = new token_response_bo_1.TokenResponse();
|
|
148
147
|
tokenResponse.accessToken = token;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-backend-connection.service.js","sourceRoot":"","sources":["../../src/provider/base-backend-connection.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AACrE,8CAAyC;AACzC,4DAAsD;AACtD,+BAA6B;AAC7B,wEAAkE;AAKlE,6FAAiF;AACjF,2DAAgD;AAEhD,kEAAyD;AACzD,oEAA6D;AAC7D,sFAA8E;AAC9E,sFAA8E;AAC9E,mFAAuE;
|
|
1
|
+
{"version":3,"file":"base-backend-connection.service.js","sourceRoot":"","sources":["../../src/provider/base-backend-connection.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,6 @@ export declare class ExternalJwtTokenService extends JwtTokenService {
|
|
|
3
3
|
get jwt(): string;
|
|
4
4
|
get retrievingToken(): boolean;
|
|
5
5
|
getAccessTokenFunction: Function;
|
|
6
|
-
|
|
6
|
+
isTokenExpired(): boolean;
|
|
7
|
+
getAccessToken(refresh?: boolean): Promise<boolean>;
|
|
7
8
|
}
|
|
@@ -11,7 +11,11 @@ class ExternalJwtTokenService extends jwt_token_service_1.JwtTokenService {
|
|
|
11
11
|
get retrievingToken() {
|
|
12
12
|
return false;
|
|
13
13
|
}
|
|
14
|
+
isTokenExpired() {
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
14
17
|
async getAccessToken(refresh) {
|
|
18
|
+
return true;
|
|
15
19
|
}
|
|
16
20
|
}
|
|
17
21
|
exports.ExternalJwtTokenService = ExternalJwtTokenService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-jwt-token.service.js","sourceRoot":"","sources":["../../src/service/external-jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;AAEpD,MAAa,uBAAwB,SAAQ,mCAAe;IAExD,IAAW,GAAG;QACV,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACzC,CAAC;IACL,CAAC;IAED,IAAW,eAAe;QAEtB,OAAO,KAAK,CAAC;IACjB,CAAC;IAIM,KAAK,CAAC,cAAc,CAAC,OAAiB;
|
|
1
|
+
{"version":3,"file":"external-jwt-token.service.js","sourceRoot":"","sources":["../../src/service/external-jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;AAEpD,MAAa,uBAAwB,SAAQ,mCAAe;IAExD,IAAW,GAAG;QACV,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACzC,CAAC;IACL,CAAC;IAED,IAAW,eAAe;QAEtB,OAAO,KAAK,CAAC;IACjB,CAAC;IAIM,cAAc;QACjB,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,OAAiB;QACzC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAtBD,0DAsBC"}
|
|
@@ -10,7 +10,9 @@ class HealthService {
|
|
|
10
10
|
startHeartBeat() {
|
|
11
11
|
if (!this.heartbeatTimer) {
|
|
12
12
|
this.heartbeatTimer = setInterval(() => {
|
|
13
|
-
this._call(health_service_method_enum_1.HealthServiceMethod.GetHeartBeat, {}, false)
|
|
13
|
+
this._call(health_service_method_enum_1.HealthServiceMethod.GetHeartBeat, {}, false).catch((e) => {
|
|
14
|
+
console.error(e);
|
|
15
|
+
});
|
|
14
16
|
}, HealthService.HEARTBEAT_INTERVAL_MS);
|
|
15
17
|
}
|
|
16
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health.service.js","sourceRoot":"","sources":["../../src/service/health.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AAGrE,mFAAuE;AAEvE,MAAa,aAAa;IAMtB,YAAY,iBAA+C;QACvD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAEM,cAAc;QACjB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACvB,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,KAAK,CAAC,gDAAmB,CAAC,YAAY,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"health.service.js","sourceRoot":"","sources":["../../src/service/health.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AAGrE,mFAAuE;AAEvE,MAAa,aAAa;IAMtB,YAAY,iBAA+C;QACvD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAEM,cAAc;QACjB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACvB,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,KAAK,CAAC,gDAAmB,CAAC,YAAY,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;oBAChE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,CAAA;YACN,CAAC,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;QAC5C,CAAC;IACL,CAAC;IAEM,aAAa;QAChB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC/B,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,MAA2B,EAAE,IAAS,EAAE,UAAmB;QACrE,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,IAAI,GAAG,EAAE,CAAC;QACd,CAAC;QACD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3B,UAAU,GAAG,IAAI,CAAC;QACtB,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,8CAAkB,CAAC,aAAa,CAAC,CAAC;IACnG,CAAC;;AAnCL,sCAoCC;AAnCkB,mCAAqB,GAAW,KAAK,CAAC"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { JwtTokenService } from "./jwt-token.service";
|
|
2
|
+
import { LoginStorageData } from "../interface/login-storage-data.interface";
|
|
2
3
|
export declare class InternalJwtTokenService extends JwtTokenService {
|
|
3
4
|
get jwt(): string;
|
|
4
5
|
get retrievingToken(): boolean;
|
|
5
|
-
getAccessToken(refresh?: boolean): Promise<
|
|
6
|
-
|
|
6
|
+
getAccessToken(refresh?: boolean): Promise<boolean>;
|
|
7
|
+
isTokenExpired(data?: LoginStorageData): boolean;
|
|
8
|
+
setBusy(busy: boolean): void;
|
|
9
|
+
setExpirationTime(jwt: string, data?: LoginStorageData): void;
|
|
7
10
|
private _refreshToken;
|
|
8
11
|
}
|
|
@@ -11,30 +11,47 @@ class InternalJwtTokenService extends jwt_token_service_1.JwtTokenService {
|
|
|
11
11
|
get retrievingToken() {
|
|
12
12
|
return this.storageService.getSessionBusy();
|
|
13
13
|
}
|
|
14
|
-
async getAccessToken(refresh
|
|
15
|
-
if (
|
|
16
|
-
await this._refreshToken();
|
|
14
|
+
async getAccessToken(refresh) {
|
|
15
|
+
if (this.isTokenExpired()) {
|
|
16
|
+
return await this._refreshToken();
|
|
17
17
|
}
|
|
18
|
+
return true;
|
|
18
19
|
}
|
|
19
|
-
|
|
20
|
-
const loginData = this.storageService.getSessionLoginData();
|
|
20
|
+
isTokenExpired(data) {
|
|
21
|
+
const loginData = data ? data : this.storageService.getSessionLoginData();
|
|
21
22
|
if (loginData && loginData.accessToken && loginData.tokenExp) {
|
|
22
23
|
return ((1000 * loginData.tokenExp) - (new Date()).getTime()) < 60000;
|
|
23
24
|
}
|
|
24
25
|
return true;
|
|
25
26
|
}
|
|
27
|
+
setBusy(busy) {
|
|
28
|
+
if (!busy && window.hasOwnProperty('tokenRetrieved')) {
|
|
29
|
+
window.tokenRetrieved.next(true);
|
|
30
|
+
}
|
|
31
|
+
this.storageService.setSessionBusy(busy);
|
|
32
|
+
}
|
|
33
|
+
setExpirationTime(jwt, data) {
|
|
34
|
+
super.setExpirationTime(jwt, data);
|
|
35
|
+
this.setBusy(false);
|
|
36
|
+
}
|
|
26
37
|
async _refreshToken() {
|
|
27
|
-
this.
|
|
28
|
-
const tokenResponse = await this.loginService.refreshAccessToken(this.storageService.getSessionLoginData().refreshToken);
|
|
38
|
+
this.setBusy(true);
|
|
29
39
|
const loginData = this.storageService.getSessionLoginData();
|
|
30
|
-
loginData.
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
40
|
+
let refreshToken = loginData ? loginData.refreshToken : undefined;
|
|
41
|
+
if (refreshToken) {
|
|
42
|
+
const tokenResponse = await this.loginService.refreshAccessToken(refreshToken);
|
|
43
|
+
if (tokenResponse && tokenResponse.accessToken && tokenResponse.refreshToken) {
|
|
44
|
+
loginData.accessToken = tokenResponse.accessToken;
|
|
45
|
+
loginData.refreshToken = tokenResponse.refreshToken;
|
|
46
|
+
this.setExpirationTime(tokenResponse.accessToken);
|
|
47
|
+
this.storageService.setSessionLoginData(loginData);
|
|
48
|
+
return true;
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
37
53
|
}
|
|
54
|
+
return false;
|
|
38
55
|
}
|
|
39
56
|
}
|
|
40
57
|
exports.InternalJwtTokenService = InternalJwtTokenService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-jwt-token.service.js","sourceRoot":"","sources":["../../src/service/internal-jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;
|
|
1
|
+
{"version":3,"file":"internal-jwt-token.service.js","sourceRoot":"","sources":["../../src/service/internal-jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;AAKpD,MAAa,uBAAwB,SAAQ,mCAAe;IAExD,IAAW,GAAG;QACV,OAAO,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,WAAW,CAAC,CAAC;YACzG,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,WAAW,CAAC,CAAC;YACvD,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;IAC7C,CAAC;IAED,IAAW,eAAe;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAChD,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,OAAiB;QACzC,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;YACxB,OAAO,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,cAAc,CAAC,IAAuB;QACzC,MAAM,SAAS,GAAqB,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;QAC5F,IAAI,SAAS,IAAI,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC3D,OAAO,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC;QAC1E,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,OAAO,CAAC,IAAa;QACxB,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAEnD,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAEM,iBAAiB,CAAC,GAAW,EAAE,IAAuB;QACzD,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAEO,KAAK,CAAC,aAAa;QACvB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnB,MAAM,SAAS,GAAqB,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;QAC9E,IAAI,YAAY,GAAW,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1E,IAAI,YAAY,EAAE,CAAC;YACf,MAAM,aAAa,GAAkB,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;YAC9F,IAAI,aAAa,IAAI,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,YAAY,EAAE,CAAC;gBAC3E,SAAS,CAAC,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;gBAClD,SAAS,CAAC,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;gBACpD,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;gBAClD,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;gBACnD,OAAO,IAAI,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACJ,OAAO,KAAK,CAAC;YACjB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AA3DD,0DA2DC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { LoginService } from './login.service';
|
|
2
|
+
import { LoginStorageData } from '../interface/login-storage-data.interface';
|
|
2
3
|
import { StorageService } from './storage.service';
|
|
3
4
|
export declare abstract class JwtTokenService {
|
|
4
5
|
abstract get jwt(): string;
|
|
@@ -6,7 +7,9 @@ export declare abstract class JwtTokenService {
|
|
|
6
7
|
protected loginService: LoginService;
|
|
7
8
|
constructor(sessionStorageService: any, loginService: any);
|
|
8
9
|
abstract get retrievingToken(): boolean;
|
|
9
|
-
abstract
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
abstract isTokenExpired(): boolean;
|
|
11
|
+
abstract getAccessToken(refresh?: boolean): Promise<boolean>;
|
|
12
|
+
setBusy(busy: boolean): void;
|
|
13
|
+
setExpirationTime(jwt: string, data?: LoginStorageData): void;
|
|
14
|
+
setLoginDataByPublicToken(schema: string, username: string, token: string): void;
|
|
12
15
|
}
|
|
@@ -11,21 +11,34 @@ class JwtTokenService {
|
|
|
11
11
|
window.tokenRetrieved = new rxjs_1.Subject();
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
-
|
|
14
|
+
setBusy(busy) { }
|
|
15
|
+
;
|
|
16
|
+
setExpirationTime(jwt, data) {
|
|
15
17
|
try {
|
|
16
18
|
const decoded = (0, jwt_decode_1.default)(jwt);
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
if (!data) {
|
|
20
|
+
const loginData = this.storageService.getSessionLoginData();
|
|
21
|
+
loginData.tokenExp = decoded.exp;
|
|
22
|
+
this.storageService.setSessionLoginData(loginData);
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
data.tokenExp = decoded.exp;
|
|
26
|
+
}
|
|
20
27
|
}
|
|
21
28
|
catch (e) {
|
|
22
29
|
}
|
|
23
30
|
}
|
|
24
|
-
setLoginDataByPublicToken(token) {
|
|
31
|
+
setLoginDataByPublicToken(schema, username, token) {
|
|
25
32
|
const loginData = this.storageService.getSessionLoginData();
|
|
26
33
|
loginData.accessToken = token;
|
|
27
34
|
loginData.refreshToken = token;
|
|
28
|
-
this.setExpirationTime(token);
|
|
35
|
+
this.setExpirationTime(token, loginData);
|
|
36
|
+
if (!loginData.upId) {
|
|
37
|
+
loginData.upId = parseInt(schema);
|
|
38
|
+
}
|
|
39
|
+
if (!loginData.userName) {
|
|
40
|
+
loginData.userName = username;
|
|
41
|
+
}
|
|
29
42
|
this.storageService.setSessionLoginData(loginData);
|
|
30
43
|
}
|
|
31
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../src/service/jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,+BAA6B;AAG7B,2CAAoC;AAGpC,MAAsB,eAAe;IAMjC,YAAY,qBAAqB,EAAE,YAAY;QAC3C,IAAI,CAAC,cAAc,GAAG,qBAAqB,CAAC;QAC5C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAGjC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAE3C,MAAM,CAAC,cAAc,GAAG,IAAI,cAAO,EAAE,CAAC;QAC1C,CAAC;IACL,CAAC;
|
|
1
|
+
{"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../src/service/jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,+BAA6B;AAG7B,2CAAoC;AAGpC,MAAsB,eAAe;IAMjC,YAAY,qBAAqB,EAAE,YAAY;QAC3C,IAAI,CAAC,cAAc,GAAG,qBAAqB,CAAC;QAC5C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAGjC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAE3C,MAAM,CAAC,cAAc,GAAG,IAAI,cAAO,EAAE,CAAC;QAC1C,CAAC;IACL,CAAC;IAQM,OAAO,CAAC,IAAa,IAAS,CAAC;IAAA,CAAC;IAEhC,iBAAiB,CAAC,GAAW,EAAE,IAAuB;QACzD,IAAI,CAAC;YACD,MAAM,OAAO,GAAQ,IAAA,oBAAU,EAAC,GAAG,CAAC,CAAC;YACrC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,MAAM,SAAS,GAAqB,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;gBAC9E,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;gBACjC,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;YAChC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;QAEb,CAAC;IACL,CAAC;IAEM,yBAAyB,CAAC,MAAc,EAAE,QAAgB,EAAE,KAAa;QAC5E,MAAM,SAAS,GAAqB,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;QAC9E,SAAS,CAAC,WAAW,GAAG,KAAK,CAAC;QAC9B,SAAS,CAAC,YAAY,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YAClB,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YACtB,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC;CACJ;AArDD,0CAqDC"}
|
|
@@ -9,6 +9,7 @@ export declare class LocalStorageService {
|
|
|
9
9
|
get dataSessionId(): string;
|
|
10
10
|
get keycloakState(): string;
|
|
11
11
|
get publicToken(): string;
|
|
12
|
+
get publicTokenExp(): number;
|
|
12
13
|
schema: string;
|
|
13
14
|
username: string;
|
|
14
15
|
protected storageObj: LocalStorageRootObject;
|
|
@@ -22,6 +23,7 @@ export declare class LocalStorageService {
|
|
|
22
23
|
getKeycloakLoginData(): LoginStorageData;
|
|
23
24
|
setLoginData(data: LoginStorageData): void;
|
|
24
25
|
setPublicToken(token: string): void;
|
|
26
|
+
setPublicTokenExp(exp: number): void;
|
|
25
27
|
setLoginResponse(loginResponse: LoginResponse): void;
|
|
26
28
|
setSessionId(id: string): void;
|
|
27
29
|
setDataSessionId(id: string): void;
|
|
@@ -34,6 +34,12 @@ class LocalStorageService {
|
|
|
34
34
|
return userObj.token;
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
+
get publicTokenExp() {
|
|
38
|
+
const userObj = this._getUserObject();
|
|
39
|
+
if (userObj) {
|
|
40
|
+
return userObj.tokenExp;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
37
43
|
constructor(url, schema, username) {
|
|
38
44
|
this.storage = localStorage;
|
|
39
45
|
this.storageObj = new local_storage_root_object_1.LocalStorageRootObject();
|
|
@@ -114,6 +120,13 @@ class LocalStorageService {
|
|
|
114
120
|
this.save();
|
|
115
121
|
}
|
|
116
122
|
}
|
|
123
|
+
setPublicTokenExp(exp) {
|
|
124
|
+
const userObj = this._getUserObject();
|
|
125
|
+
if (userObj) {
|
|
126
|
+
userObj.tokenExp = exp;
|
|
127
|
+
this.save();
|
|
128
|
+
}
|
|
129
|
+
}
|
|
117
130
|
setLoginResponse(loginResponse) {
|
|
118
131
|
if (!loginResponse || (!loginResponse.upId && !loginResponse.userName)) {
|
|
119
132
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-storage.service.js","sourceRoot":"","sources":["../../src/service/local-storage.service.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,kFAA0E;AAC1E,sFAA8E;AAC9E,kFAA0E;AAI1E,MAAa,mBAAmB;IAI5B,IAAW,aAAa;QACpB,MAAM,OAAO,GAA2B,IAAI,CAAC,cAAc,EAAE,CAAC;QAC9D,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,OAAO,CAAC,aAAa,CAAC;QACjC,CAAC;IACL,CAAC;IAED,IAAW,SAAS;QAChB,MAAM,OAAO,GAA2B,IAAI,CAAC,cAAc,EAAE,CAAC;QAC9D,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,OAAO,CAAC,SAAS,CAAC;QAC7B,CAAC;IACL,CAAC;IAED,IAAW,aAAa;QACpB,MAAM,OAAO,GAA2B,IAAI,CAAC,cAAc,EAAE,CAAC;QAC9D,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,OAAO,CAAC,aAAa,CAAC;QACjC,CAAC;IACL,CAAC;IAED,IAAW,aAAa;QACpB,MAAM,SAAS,GAAqB,IAAI,CAAC,YAAY,EAAE,CAAC;QACxD,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IACpD,CAAC;IAED,IAAW,WAAW;QAClB,MAAM,OAAO,GAA2B,IAAI,CAAC,cAAc,EAAE,CAAC;QAC9D,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,OAAO,CAAC,KAAK,CAAC;QACzB,CAAC;IACL,CAAC;IASD,YAAY,GAAW,EAAE,MAAc,EAAE,QAAgB;
|
|
1
|
+
{"version":3,"file":"local-storage.service.js","sourceRoot":"","sources":["../../src/service/local-storage.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ class LoginService {
|
|
|
32
32
|
this._healthService = new health_service_1.HealthService(backendConnection);
|
|
33
33
|
if (this.backendConnection.options.username || this.backendConnection.options.password) {
|
|
34
34
|
this.loginRequest.userName = this.backendConnection.options.username;
|
|
35
|
-
this.loginRequest.
|
|
35
|
+
this.loginRequest.pw = this.backendConnection.options.password;
|
|
36
36
|
}
|
|
37
37
|
this.loginRequest.upId = parseInt(this.backendConnection.options.schema, 10);
|
|
38
38
|
this.loginRequest.clientVersion = this.backendConnection.version.toString();
|
|
@@ -74,7 +74,9 @@ class LoginService {
|
|
|
74
74
|
}
|
|
75
75
|
this.backendConnection.usePublicToken = false;
|
|
76
76
|
this.backendConnection.createNewSession();
|
|
77
|
-
const response = await this.login(request, encrypt, true)
|
|
77
|
+
const response = await this.login(request, encrypt, true).catch(() => {
|
|
78
|
+
return undefined;
|
|
79
|
+
});
|
|
78
80
|
if (response && request) {
|
|
79
81
|
response.password = request.userPassword;
|
|
80
82
|
}
|
|
@@ -108,38 +110,28 @@ class LoginService {
|
|
|
108
110
|
});
|
|
109
111
|
}
|
|
110
112
|
}
|
|
111
|
-
login(request, encrypt, createDataSession) {
|
|
113
|
+
async login(request, encrypt, createDataSession) {
|
|
112
114
|
if (request) {
|
|
113
115
|
this.loginRequest = request;
|
|
114
116
|
}
|
|
115
117
|
if (encrypt !== undefined) {
|
|
116
118
|
this._useEncryption = encrypt;
|
|
117
119
|
}
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
.then((result) => resolve(this._handleAndReturnLoginResponse(result, createDataSession)))
|
|
121
|
-
.catch((e) => {
|
|
122
|
-
return reject(e);
|
|
123
|
-
});
|
|
124
|
-
});
|
|
120
|
+
const result = await this._callLogin();
|
|
121
|
+
return this._handleAndReturnLoginResponse(result, createDataSession);
|
|
125
122
|
}
|
|
126
123
|
async loginByKeycloakCode(code, state, uri) {
|
|
127
124
|
this.backendConnection.storageService.setLocalKeycloakState(state);
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
.then(async (result) => await resolve(this._handleAndReturnLoginResponse(result, true, true)))
|
|
139
|
-
.catch((e) => {
|
|
140
|
-
return reject(e);
|
|
141
|
-
});
|
|
142
|
-
});
|
|
125
|
+
const loginRequest = new login_request_1.LoginRequest();
|
|
126
|
+
const backendLanguageCode = this._clientLanguageToBackendLanguage.get(this.backendConnection.options.languageCode);
|
|
127
|
+
loginRequest.upId = this.company.upId;
|
|
128
|
+
loginRequest.loginCode = code;
|
|
129
|
+
loginRequest.redirectUri = uri;
|
|
130
|
+
loginRequest.clientVersion = this.backendConnection.version.toString();
|
|
131
|
+
loginRequest.clientLanguage = backendLanguageCode ? backendLanguageCode : backend_language_code_enum_1.BackendLanguageCode.Dutch;
|
|
132
|
+
this.backendConnection.createNewSession(true);
|
|
133
|
+
const result = await this._loginUserByLoginCode(loginRequest);
|
|
134
|
+
return this._handleAndReturnLoginResponse(result, true, true);
|
|
143
135
|
}
|
|
144
136
|
async loginToExternalSource(externalSourceId, url, schema, version) {
|
|
145
137
|
if (this.backendConnection.sessionId) {
|
|
@@ -147,6 +139,7 @@ class LoginService {
|
|
|
147
139
|
return this.backendConnection.storageService.localLoginResponse;
|
|
148
140
|
}
|
|
149
141
|
this.loginRequest.userName = undefined;
|
|
142
|
+
this.loginRequest.pw = undefined;
|
|
150
143
|
this.loginRequest.userPassword = undefined;
|
|
151
144
|
this.loginRequest.upId = schema ? parseInt(schema) : parseInt(this.backendConnection.schema);
|
|
152
145
|
this.loginRequest.clientVersion = version ? version : this.backendConnection.version.toString();
|
|
@@ -272,7 +265,9 @@ class LoginService {
|
|
|
272
265
|
_startHeartBeat() {
|
|
273
266
|
if (!this.heartbeatTimer) {
|
|
274
267
|
this.heartbeatTimer = setInterval(() => {
|
|
275
|
-
this._call(login_service_method_enum_1.LoginServiceMethod.GetHeartBeat, {}, false)
|
|
268
|
+
this._call(login_service_method_enum_1.LoginServiceMethod.GetHeartBeat, {}, false).catch((e) => {
|
|
269
|
+
console.error(e);
|
|
270
|
+
});
|
|
276
271
|
}, LoginService.HEARTBEAT_INTERVAL_MS);
|
|
277
272
|
}
|
|
278
273
|
}
|
|
@@ -282,23 +277,19 @@ class LoginService {
|
|
|
282
277
|
this.heartbeatTimer = null;
|
|
283
278
|
}
|
|
284
279
|
}
|
|
285
|
-
_checkEncryption() {
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
resolve();
|
|
294
|
-
});
|
|
295
|
-
}
|
|
296
|
-
});
|
|
280
|
+
async _checkEncryption() {
|
|
281
|
+
if (!this._useEncryption) {
|
|
282
|
+
return;
|
|
283
|
+
}
|
|
284
|
+
else {
|
|
285
|
+
await this._publicService.getPublicKey();
|
|
286
|
+
this.loginRequest.userPassword = this._encryptionService.encRsa(this.loginRequest.pw);
|
|
287
|
+
}
|
|
297
288
|
}
|
|
298
|
-
_callLogin() {
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
289
|
+
async _callLogin() {
|
|
290
|
+
await this._checkEncryption();
|
|
291
|
+
this.loginRequest.pw = undefined;
|
|
292
|
+
return this._call(login_service_method_enum_1.LoginServiceMethod.Login, this.loginRequest, true);
|
|
302
293
|
}
|
|
303
294
|
_callLoginToExternalSource(externalSourceId, url) {
|
|
304
295
|
this.loginRequest.externalSourceId = externalSourceId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../src/service/login.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../src/service/login.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,13 +9,10 @@ class PublicService {
|
|
|
9
9
|
this.backendConnection = backendConnection;
|
|
10
10
|
this._encryptionService = encryptionService;
|
|
11
11
|
}
|
|
12
|
-
getPublicKey() {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
resolve(result);
|
|
17
|
-
});
|
|
18
|
-
});
|
|
12
|
+
async getPublicKey() {
|
|
13
|
+
const result = await this._call(public_service_method_enum_1.PublicServiceMethod.GetPublicKey, {}, false);
|
|
14
|
+
this._encryptionService.publicKey = result;
|
|
15
|
+
return result;
|
|
19
16
|
}
|
|
20
17
|
async getCompanies() {
|
|
21
18
|
return this._call(public_service_method_enum_1.PublicServiceMethod.Companies, {}, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public.service.js","sourceRoot":"","sources":["../../src/service/public.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AAGrE,mFAAuE;AAIvE,2DAAgD;AAEhD,MAAa,aAAa;IAMtB,YAAY,iBAA+C,EAAE,iBAAiC;QAC1F,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAChD,CAAC;IAEM,YAAY;
|
|
1
|
+
{"version":3,"file":"public.service.js","sourceRoot":"","sources":["../../src/service/public.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AAGrE,mFAAuE;AAIvE,2DAAgD;AAEhD,MAAa,aAAa;IAMtB,YAAY,iBAA+C,EAAE,iBAAiC;QAC1F,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAChD,CAAC;IAEM,KAAK,CAAC,YAAY;QACrB,MAAM,MAAM,GAAW,MAAM,IAAI,CAAC,KAAK,CAAC,gDAAmB,CAAC,YAAY,EAAE,EAAE,EAAE,KAAK,CAAW,CAAC;QAC/F,IAAI,CAAC,kBAAkB,CAAC,SAAS,GAAG,MAAM,CAAC;QAC3C,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,YAAY;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,gDAAmB,CAAC,SAAS,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;IAEM,qBAAqB;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,gDAAmB,CAAC,iBAAiB,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;IACxE,CAAC;IAEO,KAAK,CAAC,MAA2B,EAAE,IAAS,EAAE,UAAmB;QACrE,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,IAAI,GAAG,EAAE,CAAC;QACd,CAAC;QACD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3B,UAAU,GAAG,IAAI,CAAC;QACtB,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,8CAAkB,CAAC,aAAa,EAAE,yBAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAC/H,CAAC;CACJ;AAlCD,sCAkCC"}
|
|
@@ -15,10 +15,12 @@ export declare class StorageService {
|
|
|
15
15
|
clear(): void;
|
|
16
16
|
clearAll(): void;
|
|
17
17
|
get sessionPublicToken(): string;
|
|
18
|
+
get sessionPublicTokenExp(): number;
|
|
18
19
|
getSessionLoginData(): LoginStorageData;
|
|
19
20
|
getSessionKeycloakLoginData(): LoginStorageData;
|
|
20
21
|
setSessionLoginData(data: LoginStorageData): void;
|
|
21
22
|
setSessionPublicToken(token: string): void;
|
|
23
|
+
setSessionPublicTokenExp(exp: number): void;
|
|
22
24
|
setSessionBusy(busy: boolean): void;
|
|
23
25
|
getSessionBusy(): boolean;
|
|
24
26
|
get localLoginResponse(): LoginResponse;
|
|
@@ -32,6 +32,9 @@ class StorageService {
|
|
|
32
32
|
get sessionPublicToken() {
|
|
33
33
|
return this.localStorageService.publicToken;
|
|
34
34
|
}
|
|
35
|
+
get sessionPublicTokenExp() {
|
|
36
|
+
return this.localStorageService.publicTokenExp;
|
|
37
|
+
}
|
|
35
38
|
getSessionLoginData() {
|
|
36
39
|
return this.localStorageService.getLoginData();
|
|
37
40
|
}
|
|
@@ -44,6 +47,9 @@ class StorageService {
|
|
|
44
47
|
setSessionPublicToken(token) {
|
|
45
48
|
return this.localStorageService.setPublicToken(token);
|
|
46
49
|
}
|
|
50
|
+
setSessionPublicTokenExp(exp) {
|
|
51
|
+
return this.localStorageService.setPublicTokenExp(exp);
|
|
52
|
+
}
|
|
47
53
|
setSessionBusy(busy) {
|
|
48
54
|
return this.localStorageService.setBusy(busy);
|
|
49
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../src/service/storage.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../src/service/storage.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-info.service.js","sourceRoot":"","sources":["../../src/service/user-info.service.ts"],"names":[],"mappings":";;;AAEA,iFAAqE;AACrE,2DAAgD;AAChD,yFAA4E;AAC5E,4DAAsD;AACtD,uEAAgE;AAEhE,MAAa,eAAe;IAKxB,YAAY,iBAA+C;QAFnD,eAAU,GAA0B,IAAI,+CAAqB,EAAE,CAAC;QAGpE,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAChD,CAAC;IAEM,KAAK,CAAC,iBAAiB;QAC1B,MAAM,QAAQ,GAAQ,MAAM,IAAI,CAAC,KAAK,CAAC,qDAAqB,CAAC,iBAAiB,EAAE,EAAC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,EAAC,EAAE,KAAK,CAAC;aACjI,KAAK,CAAC,GAAG,EAAE;YACZ,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,IAAI,QAAQ,EAAE,CAAC;YACX,OAAuB,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,8BAAa,EAAE,QAAQ,CAAC,CAAC;QAC3F,CAAC;
|
|
1
|
+
{"version":3,"file":"user-info.service.js","sourceRoot":"","sources":["../../src/service/user-info.service.ts"],"names":[],"mappings":";;;AAEA,iFAAqE;AACrE,2DAAgD;AAChD,yFAA4E;AAC5E,4DAAsD;AACtD,uEAAgE;AAEhE,MAAa,eAAe;IAKxB,YAAY,iBAA+C;QAFnD,eAAU,GAA0B,IAAI,+CAAqB,EAAE,CAAC;QAGpE,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAChD,CAAC;IAEM,KAAK,CAAC,iBAAiB;QAC1B,MAAM,QAAQ,GAAQ,MAAM,IAAI,CAAC,KAAK,CAAC,qDAAqB,CAAC,iBAAiB,EAAE,EAAC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,EAAC,EAAE,KAAK,CAAC;aACjI,KAAK,CAAC,GAAG,EAAE;YACZ,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,IAAI,QAAQ,EAAE,CAAC;YACX,OAAuB,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,8BAAa,EAAE,QAAQ,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEO,KAAK,CAAC,MAA6B,EAAE,IAAS,EAAE,UAAmB;QACvE,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,IAAI,GAAG,EAAE,CAAC;QACd,CAAC;QACD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3B,UAAU,GAAG,IAAI,CAAC;QACtB,CAAC;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,8CAAkB,CAAC,eAAe,EAAE,yBAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAClI,CAAC;CACJ;AA7BD,0CA6BC"}
|