@colijnit/ioneconnector 256.1.1 → 256.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/connector.d.ts +2 -2
- package/build/connector.js +3 -4
- package/build/connector.js.map +1 -1
- package/build/enum/login-service-method.enum.d.ts +1 -0
- package/build/enum/login-service-method.enum.js +1 -0
- package/build/enum/login-service-method.enum.js.map +1 -1
- package/build/interface/login-storage-data.interface.d.ts +1 -0
- package/build/model/login-request.d.ts +1 -0
- package/build/model/login-request.js.map +1 -1
- package/build/model/options.d.ts +3 -0
- package/build/model/options.js.map +1 -1
- package/build/provider/ajax.service.d.ts +7 -4
- package/build/provider/ajax.service.js +62 -19
- package/build/provider/ajax.service.js.map +1 -1
- package/build/provider/base-backend-connection.service.d.ts +6 -2
- package/build/provider/base-backend-connection.service.js +33 -10
- package/build/provider/base-backend-connection.service.js.map +1 -1
- package/build/service/local-storage.service.d.ts +5 -0
- package/build/service/local-storage.service.js +73 -32
- package/build/service/local-storage.service.js.map +1 -1
- package/build/service/login.service.d.ts +8 -2
- package/build/service/login.service.js +79 -74
- package/build/service/login.service.js.map +1 -1
- package/build/service/session-storage.service.d.ts +5 -0
- package/build/service/session-storage.service.js +74 -29
- package/build/service/session-storage.service.js.map +1 -1
- package/package.json +1 -1
package/build/connector.d.ts
CHANGED
|
@@ -12,11 +12,11 @@ export declare class Connector {
|
|
|
12
12
|
readonly connectionAborted: Subject<void>;
|
|
13
13
|
readonly connectionResetInactivity: Subject<void>;
|
|
14
14
|
constructor(options?: Options);
|
|
15
|
-
connect(): Promise<LoginResponse>;
|
|
15
|
+
connect(url?: string, schema?: string, version?: string): Promise<LoginResponse>;
|
|
16
16
|
hasSession(): boolean;
|
|
17
17
|
isPublicSession(): boolean;
|
|
18
18
|
logIn(request: LoginRequest, encrypt?: boolean): Promise<LoginResponse>;
|
|
19
|
-
confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<
|
|
19
|
+
confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<LoginResponse>;
|
|
20
20
|
resetGoogleAuth(upId: number, userName: string): Promise<ServerResponseData>;
|
|
21
21
|
changePassword(password: string, securityCode: string, upId: number): Promise<ServerResponseData>;
|
|
22
22
|
changePasswordAndActivateUser(password: string, securityCode: string, upId: number, reCaptchaResponse?: string): Promise<ServerResponseData>;
|
package/build/connector.js
CHANGED
|
@@ -10,8 +10,7 @@ class Connector {
|
|
|
10
10
|
this.connectionAborted = new rxjs_1.Subject();
|
|
11
11
|
this.connectionResetInactivity = new rxjs_1.Subject();
|
|
12
12
|
this._applicationClose = () => {
|
|
13
|
-
this.connection.
|
|
14
|
-
this.subs.forEach(s => s.unsubscribe());
|
|
13
|
+
this.connection.clearStorageAndLogout();
|
|
15
14
|
window.removeEventListener('beforeunload', this._applicationClose);
|
|
16
15
|
return null;
|
|
17
16
|
};
|
|
@@ -21,8 +20,8 @@ class Connector {
|
|
|
21
20
|
window.addEventListener('beforeunload', this._applicationClose);
|
|
22
21
|
}
|
|
23
22
|
}
|
|
24
|
-
async connect() {
|
|
25
|
-
return this.connection.connect();
|
|
23
|
+
async connect(url, schema, version) {
|
|
24
|
+
return this.connection.connect(url, schema, version);
|
|
26
25
|
}
|
|
27
26
|
hasSession() {
|
|
28
27
|
return this.connection.hasSession();
|
package/build/connector.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../src/connector.ts"],"names":[],"mappings":";;;AACA,+BAA2C;AAC3C,0DAAoD;AAQpD,MAAa,SAAS;IAWlB,YAAY,OAAiB;QATZ,SAAI,GAAmB,EAAE,CAAC;QAK3B,eAAU,GAAqB,IAAI,cAAO,EAAW,CAAC;QACtD,sBAAiB,GAAkB,IAAI,cAAO,EAAQ,CAAC;QACvD,8BAAyB,GAAkB,IAAI,cAAO,EAAQ,CAAC;QAqFvE,sBAAiB,GAAG,GAAG,EAAE;YAC7B,IAAI,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../src/connector.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.LoginServiceMethod = void 0;
|
|
|
4
4
|
var LoginServiceMethod;
|
|
5
5
|
(function (LoginServiceMethod) {
|
|
6
6
|
LoginServiceMethod["Login"] = "login";
|
|
7
|
+
LoginServiceMethod["LoginToExternalSource"] = "loginToExternalSource";
|
|
7
8
|
LoginServiceMethod["LoginWithCode"] = "loginWithCode";
|
|
8
9
|
LoginServiceMethod["ConfirmCode"] = "confirmCode";
|
|
9
10
|
LoginServiceMethod["ChangePassword"] = "changePassword";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-service-method.enum.js","sourceRoot":"","sources":["../../src/enum/login-service-method.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,
|
|
1
|
+
{"version":3,"file":"login-service-method.enum.js","sourceRoot":"","sources":["../../src/enum/login-service-method.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,kBAwBX;AAxBD,WAAY,kBAAkB;IAC1B,qCAAe,CAAA;IACf,qEAA+C,CAAA;IAC/C,qDAA+B,CAAA;IAC/B,iDAA2B,CAAA;IAC3B,uDAAiC,CAAA;IACjC,qFAA+D,CAAA;IAC/D,6CAAuB,CAAA;IACvB,+DAAyC,CAAA;IACzC,6DAAuC,CAAA;IACvC,mDAA6B,CAAA;IAC7B,uDAAiC,CAAA;IACjC,2DAAqC,CAAA;IACrC,2CAAqB,CAAA;IACrB,2DAAqC,CAAA;IACrC,mDAA6B,CAAA;IAC7B,6EAAuD,CAAA;IACvD,iEAA2C,CAAA;IAC3C,qDAA+B,CAAA;IAC/B,+CAAyB,CAAA;IACzB,+DAAyC,CAAA;IACzC,yDAAmC,CAAA;IACnC,2FAAqE,CAAA;IACrE,+DAAyC,CAAA;AAC7C,CAAC,EAxBW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAwB7B"}
|
|
@@ -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;CAmBxB;AAnBD,oCAmBC"}
|
package/build/model/options.d.ts
CHANGED
|
@@ -18,6 +18,9 @@ export declare class Options {
|
|
|
18
18
|
useLoginEncryption?: boolean;
|
|
19
19
|
languageCode?: LanguageCode;
|
|
20
20
|
timeoutInMs?: number;
|
|
21
|
+
keycloakClientId?: string;
|
|
22
|
+
externalSourceId?: number;
|
|
23
|
+
priceListCode?: string;
|
|
21
24
|
jwtEnabled?: boolean;
|
|
22
25
|
jwtRefreshToken?: boolean;
|
|
23
26
|
logoutWhenRefresh?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/model/options.ts"],"names":[],"mappings":";;;AAEA,MAAa,OAAO;IAApB;QAaW,cAAS,GAAa,IAAI,CAAC;QAC3B,eAAU,GAAa,KAAK,CAAC;QAC7B,kBAAa,GAAa,KAAK,CAAC;QAChC,UAAK,GAAa,KAAK,CAAC;QACxB,uBAAkB,GAAa,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/model/options.ts"],"names":[],"mappings":";;;AAEA,MAAa,OAAO;IAApB;QAaW,cAAS,GAAa,IAAI,CAAC;QAC3B,eAAU,GAAa,KAAK,CAAC;QAC7B,kBAAa,GAAa,KAAK,CAAC;QAChC,UAAK,GAAa,KAAK,CAAC;QACxB,uBAAkB,GAAa,KAAK,CAAC;QASrC,eAAU,GAAa,KAAK,CAAC;QAC7B,oBAAe,GAAa,IAAI,CAAC;QACjC,sBAAiB,GAAa,IAAI,CAAC;IAG9C,CAAC;CAAA;AA/BD,0BA+BC"}
|
|
@@ -9,21 +9,24 @@ export declare class AjaxService extends BaseBackendConnectionService {
|
|
|
9
9
|
private _showLoaderRequests;
|
|
10
10
|
private _timeout;
|
|
11
11
|
constructor(options: Options);
|
|
12
|
-
|
|
12
|
+
checkAndPrepareKeycloak(): Promise<LoginResponse>;
|
|
13
|
+
connect(url?: string, schema?: string, version?: string): Promise<LoginResponse>;
|
|
13
14
|
hasSession(): boolean;
|
|
14
15
|
isPublicSession(): boolean;
|
|
15
|
-
call(method: string, data?: DataServiceData | PublicServiceRequestData, showLoader?: boolean, service?: string, endPoint?: string, isPublicService?: boolean, ownMessage?: {}): Promise<ServerResponseData>;
|
|
16
|
+
call(method: string, data?: DataServiceData | PublicServiceRequestData, showLoader?: boolean, service?: string, endPoint?: string, isPublicService?: boolean, ownMessage?: {}, url?: string): Promise<ServerResponseData>;
|
|
16
17
|
callBeacon(method: string, data?: DataServiceData | PublicServiceRequestData, service?: string, endPoint?: string): Promise<void>;
|
|
17
18
|
login(request: LoginRequest, encrypt: boolean): Promise<LoginResponse>;
|
|
18
|
-
confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<
|
|
19
|
+
confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<LoginResponse>;
|
|
19
20
|
resetGoogleAuth(upId: number, userName: string): Promise<ServerResponseData>;
|
|
20
21
|
changePassword(password: string, securityCode: string, upId: number): Promise<ServerResponseData>;
|
|
21
22
|
changePasswordAndActivateUser(password: string, securityCode: string, upId: number, reCaptchaResponse?: string): Promise<ServerResponseData>;
|
|
22
23
|
sendResetPasswordOrInviteMessage(upId: number, userName: string, reCaptchaResponse: string): Promise<ServerResponseData>;
|
|
23
24
|
getUserNameBySecurityCode(securityCode: string, upId: number): Promise<ServerResponseData>;
|
|
24
25
|
getPublicKey(): Promise<string>;
|
|
26
|
+
clearStorageAndLogout(): void;
|
|
25
27
|
close(): Promise<ServerResponseData>;
|
|
26
|
-
protected _doCall(method: string, data?: DataServiceData | PublicServiceRequestData, showLoader?: boolean, service?: string, endPoint?: string, isPublicService?: boolean, ownMessage?: {}): Promise<ServerResponseData>;
|
|
28
|
+
protected _doCall(method: string, data?: DataServiceData | PublicServiceRequestData, showLoader?: boolean, service?: string, endPoint?: string, isPublicService?: boolean, ownMessage?: {}, url?: string): Promise<ServerResponseData>;
|
|
29
|
+
private _nativeLogin;
|
|
27
30
|
private _methodNeedsAccessToken;
|
|
28
31
|
private _waitForAccessToken;
|
|
29
32
|
private setShowLoaderRequests;
|
|
@@ -17,10 +17,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
17
17
|
this._timeout = options.timeoutInMs;
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
-
async
|
|
21
|
-
if (this.options && this.options.getAccessTokenFunction !== undefined) {
|
|
22
|
-
return this.localStorageService.loginResponse;
|
|
23
|
-
}
|
|
20
|
+
async checkAndPrepareKeycloak() {
|
|
24
21
|
await this.loginService.getKeycloakParams();
|
|
25
22
|
await this.loginService.getCompanies();
|
|
26
23
|
const keycloakCode = this._getParameter("code");
|
|
@@ -30,26 +27,54 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
30
27
|
url = url.replace('#', '?');
|
|
31
28
|
const uri = url.split("?")[0];
|
|
32
29
|
window.history.replaceState(null, "", uri);
|
|
30
|
+
this.usePublicToken = false;
|
|
33
31
|
return this.loginService.loginByKeycloakCode(keycloakCode, keycloakState, uri);
|
|
34
32
|
}
|
|
35
33
|
else {
|
|
36
34
|
if (this.loginService.keycloakParams && this.loginService.keycloakParams.isIdentityServerEnabled) {
|
|
37
35
|
this._redirectToIdentityServerRealm();
|
|
38
36
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
async connect(url, schema, version) {
|
|
40
|
+
const keycloakLoginData = this.sessionStorageService.getKeycloakLoginData();
|
|
41
|
+
if (keycloakLoginData) {
|
|
42
|
+
const userNameFromKeycloak = keycloakLoginData.userName;
|
|
43
|
+
const userObject = this.localStorageService.getUserObject(userNameFromKeycloak);
|
|
44
|
+
if (userObject && userObject.loginResponse) {
|
|
45
|
+
this.session.dataSessionId = userObject.dataSessionId;
|
|
46
|
+
this.session.id = userObject.sessionId;
|
|
47
|
+
this.usePublicToken = false;
|
|
48
|
+
return userObject.loginResponse;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
if (this.usePublicToken) {
|
|
52
|
+
if (this.localStorageService.publicToken) {
|
|
44
53
|
return null;
|
|
45
54
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
55
|
+
await this.createPublicSession();
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
let response;
|
|
60
|
+
if (this.localStorageService.sessionId) {
|
|
61
|
+
if (!this.localStorageService.loginResponse) {
|
|
62
|
+
response = await this.userInfoService.getActiveUserInfo();
|
|
63
|
+
if (response && response.upId && response.loginStatus === 'SUCCESS') {
|
|
64
|
+
this.localStorageService.setLoginResponse(response);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
return this._nativeLogin(url, schema, version);
|
|
68
|
+
}
|
|
49
69
|
}
|
|
50
|
-
|
|
70
|
+
return this.localStorageService.loginResponse;
|
|
71
|
+
}
|
|
72
|
+
response = await this.checkAndPrepareKeycloak();
|
|
73
|
+
if (response) {
|
|
51
74
|
return response;
|
|
52
75
|
}
|
|
76
|
+
response = await this._nativeLogin(url, schema, version);
|
|
77
|
+
return response;
|
|
53
78
|
}
|
|
54
79
|
}
|
|
55
80
|
hasSession() {
|
|
@@ -58,7 +83,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
58
83
|
isPublicSession() {
|
|
59
84
|
return this.usePublicToken;
|
|
60
85
|
}
|
|
61
|
-
async call(method, data = {}, showLoader = true, service = undefined, endPoint = end_point_enum_1.EndPoint.AjaxService, isPublicService = false, ownMessage) {
|
|
86
|
+
async call(method, data = {}, showLoader = true, service = undefined, endPoint = end_point_enum_1.EndPoint.AjaxService, isPublicService = false, ownMessage, url) {
|
|
62
87
|
if (!service) {
|
|
63
88
|
if (!this.usePublicToken) {
|
|
64
89
|
service = backend_service_name_enum_1.BackendServiceName.LoginService;
|
|
@@ -70,10 +95,10 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
70
95
|
if (this.usePublicToken || (service === backend_service_name_enum_1.BackendServiceName.PublicService ||
|
|
71
96
|
service === backend_service_name_enum_1.BackendServiceName.LoginService ||
|
|
72
97
|
service === backend_service_name_enum_1.BackendServiceName.DatasessionService)) {
|
|
73
|
-
return this._doCall(method, data, showLoader, service, endPoint, isPublicService, ownMessage);
|
|
98
|
+
return this._doCall(method, data, showLoader, service, endPoint, isPublicService, ownMessage, url);
|
|
74
99
|
}
|
|
75
100
|
else {
|
|
76
|
-
return this._doCall(method, data, showLoader, service, endPoint, isPublicService, ownMessage);
|
|
101
|
+
return this._doCall(method, data, showLoader, service, endPoint, isPublicService, ownMessage, url);
|
|
77
102
|
}
|
|
78
103
|
}
|
|
79
104
|
async callBeacon(method, data = {}, service = undefined, endPoint = end_point_enum_1.EndPoint.AjaxService) {
|
|
@@ -125,6 +150,16 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
125
150
|
async getPublicKey() {
|
|
126
151
|
return this.loginService.getPublicKey();
|
|
127
152
|
}
|
|
153
|
+
clearStorageAndLogout() {
|
|
154
|
+
if (this.usePublicToken) {
|
|
155
|
+
this.localStorageService.clear();
|
|
156
|
+
this.localStorageService.setPublicToken(undefined);
|
|
157
|
+
this.callBeacon(datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession, {}, backend_service_name_enum_1.BackendServiceName.PublicService);
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
this.loginService.clearAllStorage();
|
|
161
|
+
}
|
|
162
|
+
}
|
|
128
163
|
close() {
|
|
129
164
|
if (this.usePublicToken) {
|
|
130
165
|
this.localStorageService.clear();
|
|
@@ -135,7 +170,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
135
170
|
return this.closeDataSession();
|
|
136
171
|
}
|
|
137
172
|
}
|
|
138
|
-
_doCall(method, data = {}, showLoader = true, service = undefined, endPoint = end_point_enum_1.EndPoint.AjaxService, isPublicService = false, ownMessage) {
|
|
173
|
+
_doCall(method, data = {}, showLoader = true, service = undefined, endPoint = end_point_enum_1.EndPoint.AjaxService, isPublicService = false, ownMessage, url) {
|
|
139
174
|
if (!service) {
|
|
140
175
|
if (!this.usePublicToken) {
|
|
141
176
|
service = backend_service_name_enum_1.BackendServiceName.LoginService;
|
|
@@ -148,7 +183,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
148
183
|
this.setShowLoaderRequests(this._showLoaderRequests + 1);
|
|
149
184
|
}
|
|
150
185
|
return new Promise(async (resolve, reject) => {
|
|
151
|
-
const
|
|
186
|
+
const readableUrl = url_utils_1.UrlUtils.createReadableUrl(method, data, url ? url : this.url, endPoint);
|
|
152
187
|
let message;
|
|
153
188
|
if (ownMessage) {
|
|
154
189
|
message = JSON.stringify(ownMessage);
|
|
@@ -185,7 +220,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
185
220
|
}
|
|
186
221
|
(0, axios_1.default)({
|
|
187
222
|
method: 'post',
|
|
188
|
-
url:
|
|
223
|
+
url: readableUrl,
|
|
189
224
|
data: message,
|
|
190
225
|
withCredentials: authorize,
|
|
191
226
|
timeout: this._timeout,
|
|
@@ -216,6 +251,14 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
216
251
|
return new Promise((resolve) => { return resolve(response); });
|
|
217
252
|
});
|
|
218
253
|
}
|
|
254
|
+
_nativeLogin(url, schema, version) {
|
|
255
|
+
if (this.externalSourceId) {
|
|
256
|
+
return this.loginService.loginToExternalSource(this.externalSourceId, url, schema, version);
|
|
257
|
+
}
|
|
258
|
+
else {
|
|
259
|
+
return this.loginService.loginAndCreateDataSession();
|
|
260
|
+
}
|
|
261
|
+
}
|
|
219
262
|
_methodNeedsAccessToken(method) {
|
|
220
263
|
return this.methodWithoutAccessToken.indexOf(method) < 0;
|
|
221
264
|
}
|
|
@@ -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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"}
|
|
@@ -10,6 +10,7 @@ import { SessionStorageService } from '../service/session-storage.service';
|
|
|
10
10
|
import { DataServiceData } from '../model/data-service-data';
|
|
11
11
|
import { PublicServiceRequestData } from '../model/public-service-request-data';
|
|
12
12
|
import { TokenResponse } from '../model/token-response.bo';
|
|
13
|
+
import { UserInfoService } from "../service/user-info.service";
|
|
13
14
|
export declare abstract class BaseBackendConnectionService {
|
|
14
15
|
readonly showLoader: Subject<boolean>;
|
|
15
16
|
readonly connectionAborted: Subject<void>;
|
|
@@ -26,20 +27,23 @@ export declare abstract class BaseBackendConnectionService {
|
|
|
26
27
|
version: number;
|
|
27
28
|
usePublicToken: boolean;
|
|
28
29
|
schema: string;
|
|
30
|
+
externalSourceId: number;
|
|
29
31
|
protected methodWithoutAccessToken: string[];
|
|
30
32
|
protected callId: string;
|
|
31
33
|
protected url: string;
|
|
32
34
|
protected loginService: LoginService;
|
|
35
|
+
protected userInfoService: UserInfoService;
|
|
33
36
|
private _datasessionService;
|
|
34
|
-
private _userInfoService;
|
|
35
37
|
constructor(options: Options);
|
|
36
|
-
abstract call(method: string, data: any, showLoader: boolean, service: BackendServiceName, endPoint?: string, isPublicService?: boolean, ownMessage?: {}): Promise<any>;
|
|
38
|
+
abstract call(method: string, data: any, showLoader: boolean, service: BackendServiceName, endPoint?: string, isPublicService?: boolean, ownMessage?: {}, url?: string): Promise<any>;
|
|
37
39
|
commit(): Promise<boolean>;
|
|
38
40
|
closeDataSession(): Promise<ServerResponseData>;
|
|
41
|
+
storeSessions(): void;
|
|
39
42
|
setSchemaUserNameAndVersion(schema: string, userName: string, version: string): void;
|
|
40
43
|
createNewSession(forKeycloak?: boolean): void;
|
|
41
44
|
createPublicSession(): Promise<TokenResponse>;
|
|
42
45
|
generateUniqueId(): string;
|
|
43
46
|
protected abstract _doCall(method: string, data: DataServiceData | PublicServiceRequestData, showLoader: boolean, service: string, endPoint: string, isPublicService: boolean, ownMessage?: {}): any;
|
|
44
47
|
private _checkSession;
|
|
48
|
+
private _closeTheSession;
|
|
45
49
|
}
|
|
@@ -46,6 +46,7 @@ class BaseBackendConnectionService {
|
|
|
46
46
|
}
|
|
47
47
|
this.schema = options.schema;
|
|
48
48
|
this.url = options.url;
|
|
49
|
+
this.externalSourceId = options.externalSourceId;
|
|
49
50
|
this.localStorageService = new local_storage_service_1.LocalStorageService(this.url, this.schema, options.username);
|
|
50
51
|
if ((options && (options.username)) || options.getAccessTokenFunction !== undefined || this.localStorageService.sessionId) {
|
|
51
52
|
this.usePublicToken = false;
|
|
@@ -65,24 +66,36 @@ class BaseBackendConnectionService {
|
|
|
65
66
|
this.sessionStorageService = new session_storage_service_1.SessionStorageService(this.url, this.schema, options.username);
|
|
66
67
|
this.loginService = new login_service_1.LoginService(this);
|
|
67
68
|
this._datasessionService = new datasession_service_1.DatasessionService(this);
|
|
68
|
-
this.
|
|
69
|
+
this.userInfoService = new user_info_service_1.UserInfoService(this);
|
|
69
70
|
if (options.getAccessTokenFunction !== undefined) {
|
|
70
71
|
this.jwtService = new external_jwt_token_service_1.ExternalJwtTokenService(this.sessionStorageService, this.loginService, options.getAccessTokenFunction);
|
|
71
|
-
if (!this.localStorageService.loginResponse) {
|
|
72
|
-
this._userInfoService.getActiveUserInfo()
|
|
73
|
-
.then(response => this.localStorageService.setLoginResponse(response));
|
|
74
|
-
}
|
|
75
72
|
}
|
|
76
73
|
else {
|
|
77
74
|
this.jwtService = new internal_jwt_token_service_1.InternalJwtTokenService(this.sessionStorageService, this.loginService);
|
|
78
75
|
}
|
|
79
|
-
|
|
76
|
+
let forKeycloak = false;
|
|
77
|
+
const keycloakLoginData = this.sessionStorageService.getKeycloakLoginData();
|
|
78
|
+
if (keycloakLoginData) {
|
|
79
|
+
const userNameFromKeycloak = keycloakLoginData.userName;
|
|
80
|
+
const userObject = this.localStorageService.getUserObject(userNameFromKeycloak);
|
|
81
|
+
if (userObject && userObject.loginResponse) {
|
|
82
|
+
this.dataSessionId = userObject.dataSessionId;
|
|
83
|
+
this.sessionId = userObject.sessionId;
|
|
84
|
+
this.usePublicToken = false;
|
|
85
|
+
forKeycloak = true;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
this._checkSession(forKeycloak);
|
|
80
89
|
}
|
|
81
90
|
async commit() {
|
|
82
91
|
return this._datasessionService.commit();
|
|
83
92
|
}
|
|
84
93
|
closeDataSession() {
|
|
85
|
-
return this.
|
|
94
|
+
return this._closeTheSession();
|
|
95
|
+
}
|
|
96
|
+
storeSessions() {
|
|
97
|
+
this.localStorageService.setDataSessionId(this.session.dataSessionId);
|
|
98
|
+
this.localStorageService.setSessionId(this.session.id);
|
|
86
99
|
}
|
|
87
100
|
setSchemaUserNameAndVersion(schema, userName, version) {
|
|
88
101
|
this.schema = schema;
|
|
@@ -128,7 +141,10 @@ class BaseBackendConnectionService {
|
|
|
128
141
|
const data = {
|
|
129
142
|
upId: this.schema
|
|
130
143
|
};
|
|
131
|
-
const token = await this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.CreatePublicSession, data, false, backend_service_name_enum_1.BackendServiceName.PublicService, end_point_enum_1.EndPoint.PublicService, true)
|
|
144
|
+
const token = await this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.CreatePublicSession, data, false, backend_service_name_enum_1.BackendServiceName.PublicService, end_point_enum_1.EndPoint.PublicService, true)
|
|
145
|
+
.catch(() => {
|
|
146
|
+
return null;
|
|
147
|
+
});
|
|
132
148
|
if (token) {
|
|
133
149
|
this.jwtService.setLoginDataByPublicToken(token);
|
|
134
150
|
this.createNewSession();
|
|
@@ -147,13 +163,13 @@ class BaseBackendConnectionService {
|
|
|
147
163
|
}
|
|
148
164
|
return s4() + s4() + s4();
|
|
149
165
|
}
|
|
150
|
-
_checkSession() {
|
|
166
|
+
_checkSession(forKeycloak = false) {
|
|
151
167
|
if (this.usePublicToken && this.localStorageService.publicToken) {
|
|
152
168
|
this.createNewSession();
|
|
153
169
|
}
|
|
154
170
|
else {
|
|
155
171
|
if (this.sessionId && this.dataSessionId) {
|
|
156
|
-
this.createNewSession();
|
|
172
|
+
this.createNewSession(forKeycloak);
|
|
157
173
|
}
|
|
158
174
|
else if (this.localStorageService.sessionId && this.localStorageService.dataSessionId) {
|
|
159
175
|
this.sessionId = this.localStorageService.sessionId;
|
|
@@ -162,6 +178,13 @@ class BaseBackendConnectionService {
|
|
|
162
178
|
}
|
|
163
179
|
}
|
|
164
180
|
}
|
|
181
|
+
_closeTheSession() {
|
|
182
|
+
return new Promise((resolve) => {
|
|
183
|
+
setTimeout(() => {
|
|
184
|
+
resolve(this.loginService.logout());
|
|
185
|
+
}, 1000);
|
|
186
|
+
});
|
|
187
|
+
}
|
|
165
188
|
}
|
|
166
189
|
exports.BaseBackendConnectionService = BaseBackendConnectionService;
|
|
167
190
|
//# sourceMappingURL=base-backend-connection.service.js.map
|
|
@@ -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;AAGlE,4EAAqE;AAErE,gFAAyE;AAEzE,6FAAiF;AACjF,2DAAgD;AAEhD,kEAAyD;AACzD,oEAA6D;AAC7D,sFAA8E;AAC9E,sFAA8E;AAC9E,mFAAuE;AACvE,iFAAqE;
|
|
1
|
+
{"version":3,"file":"base-backend-connection.service.js","sourceRoot":"","sources":["../../src/provider/base-backend-connection.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { LocalStorageRootObject } from '../model/local-storage-root-object';
|
|
2
2
|
import { IoneLocalStorageRootObject } from '../model/ione-local-storage-root-object';
|
|
3
|
+
import { LocalStorageUserObject } from '../model/local-storage-user-object';
|
|
3
4
|
import { LoginResponse } from '../model/login-response';
|
|
4
5
|
export declare class LocalStorageService {
|
|
5
6
|
readonly storage: Storage;
|
|
@@ -15,7 +16,9 @@ export declare class LocalStorageService {
|
|
|
15
16
|
protected appRoot: string;
|
|
16
17
|
protected iOneRoot: string;
|
|
17
18
|
constructor(url: string, schema: string, username: string);
|
|
19
|
+
getUserObject(userName: string): LocalStorageUserObject;
|
|
18
20
|
clear(): void;
|
|
21
|
+
clearAll(): void;
|
|
19
22
|
setLoginResponse(loginResponse: LoginResponse): void;
|
|
20
23
|
setSessionId(id: string): void;
|
|
21
24
|
setDataSessionId(id: string): void;
|
|
@@ -23,5 +26,7 @@ export declare class LocalStorageService {
|
|
|
23
26
|
setKeycloakState(keycloakState: string): void;
|
|
24
27
|
save(): void;
|
|
25
28
|
initLocalStorageObj(): void;
|
|
29
|
+
private _createSchemaAndUserObject;
|
|
30
|
+
private _createUserIfNotExistsOnSchema;
|
|
26
31
|
private _getUserObject;
|
|
27
32
|
}
|
|
@@ -45,20 +45,33 @@ class LocalStorageService {
|
|
|
45
45
|
this.username = username;
|
|
46
46
|
this.initLocalStorageObj();
|
|
47
47
|
}
|
|
48
|
+
getUserObject(userName) {
|
|
49
|
+
const userObj = this._getUserObject(userName);
|
|
50
|
+
if (userObj) {
|
|
51
|
+
return userObj;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
48
54
|
clear() {
|
|
55
|
+
if (!this.storageObj || !this.storageObj.schemas) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
49
58
|
if (this.username) {
|
|
50
59
|
const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
|
|
51
|
-
if (schemaObj) {
|
|
60
|
+
if (schemaObj && schemaObj.users) {
|
|
52
61
|
const idx = schemaObj.users.findIndex(u => u.username === this.username);
|
|
53
|
-
|
|
62
|
+
if (idx > -1) {
|
|
63
|
+
schemaObj.users.splice(idx, 1);
|
|
64
|
+
}
|
|
54
65
|
}
|
|
55
66
|
}
|
|
56
67
|
else {
|
|
57
68
|
const idx = this.storageObj.schemas.findIndex(s => s.schema === this.schema);
|
|
58
|
-
|
|
69
|
+
if (idx > -1) {
|
|
70
|
+
this.storageObj.schemas.splice(idx, 1);
|
|
71
|
+
}
|
|
59
72
|
}
|
|
60
73
|
const idx = this.storageObj.schemas.findIndex(s => s.schema === this.schema);
|
|
61
|
-
if (this.storageObj.schemas[idx].users.length === 0) {
|
|
74
|
+
if (idx > -1 && this.storageObj.schemas[idx].users.length === 0) {
|
|
62
75
|
this.storageObj.schemas.splice(idx, 1);
|
|
63
76
|
}
|
|
64
77
|
if (this.storageObj.schemas.length === 0) {
|
|
@@ -66,8 +79,27 @@ class LocalStorageService {
|
|
|
66
79
|
}
|
|
67
80
|
this.save();
|
|
68
81
|
}
|
|
82
|
+
clearAll() {
|
|
83
|
+
this.storage.clear();
|
|
84
|
+
}
|
|
69
85
|
setLoginResponse(loginResponse) {
|
|
70
|
-
|
|
86
|
+
if (!loginResponse || (!loginResponse.upId && !loginResponse.userName)) {
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
this.schema = loginResponse.upId.toString();
|
|
90
|
+
this.username = loginResponse.userName;
|
|
91
|
+
let userObj = this._getUserObject();
|
|
92
|
+
if (!userObj) {
|
|
93
|
+
if (!this.storageObj.schemas || (this.storageObj.schemas.find(s => s.schema === this.schema) === undefined)) {
|
|
94
|
+
this._createSchemaAndUserObject(this.schema, this.username);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
if (this.username) {
|
|
98
|
+
this._createUserIfNotExistsOnSchema(this.schema, this.username);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
userObj = this._getUserObject();
|
|
102
|
+
}
|
|
71
103
|
if (userObj) {
|
|
72
104
|
userObj.loginResponse = loginResponse;
|
|
73
105
|
this.save();
|
|
@@ -103,44 +135,53 @@ class LocalStorageService {
|
|
|
103
135
|
this.storage.setItem(this.iOneRoot, CircularJSON.stringify(this.iOneStorageObj));
|
|
104
136
|
}
|
|
105
137
|
initLocalStorageObj() {
|
|
106
|
-
if (!this.schema || !this.username) {
|
|
107
|
-
return;
|
|
108
|
-
}
|
|
109
138
|
const existingObj = CircularJSON.parse(this.storage.getItem(this.appRoot));
|
|
110
139
|
this.storageObj = existingObj || this.storageObj;
|
|
111
140
|
this.iOneStorageObj = CircularJSON.parse(this.storage.getItem(this.iOneRoot)) || this.iOneStorageObj;
|
|
112
|
-
if (!this.storageObj.schemas || (this.storageObj.schemas.find(s => s.schema === this.schema) === undefined)) {
|
|
113
|
-
|
|
114
|
-
schemaObj.schema = this.schema;
|
|
115
|
-
if (this.username) {
|
|
116
|
-
const userObj = new local_storage_user_object_1.LocalStorageUserObject();
|
|
117
|
-
userObj.username = this.username;
|
|
118
|
-
schemaObj.users.push(userObj);
|
|
119
|
-
}
|
|
120
|
-
if (!this.storageObj.schemas) {
|
|
121
|
-
this.storageObj.schemas = [];
|
|
122
|
-
}
|
|
123
|
-
this.storageObj.schemas.push(schemaObj);
|
|
141
|
+
if (this.schema && !this.storageObj.schemas || (this.storageObj.schemas.find(s => s.schema === this.schema) === undefined)) {
|
|
142
|
+
this._createSchemaAndUserObject(this.schema, this.username);
|
|
124
143
|
}
|
|
125
144
|
else {
|
|
126
145
|
if (this.username) {
|
|
127
|
-
|
|
128
|
-
if (!schemaObj.users || (schemaObj.users.find(u => u.username === this.username) === undefined)) {
|
|
129
|
-
const userObj = new local_storage_user_object_1.LocalStorageUserObject();
|
|
130
|
-
userObj.username = this.username;
|
|
131
|
-
if (!schemaObj.users) {
|
|
132
|
-
schemaObj.users = [];
|
|
133
|
-
}
|
|
134
|
-
schemaObj.users.push(userObj);
|
|
135
|
-
}
|
|
146
|
+
this._createUserIfNotExistsOnSchema(this.schema, this.username);
|
|
136
147
|
}
|
|
137
148
|
}
|
|
138
149
|
this.save();
|
|
139
150
|
}
|
|
140
|
-
|
|
151
|
+
_createSchemaAndUserObject(schema, userName) {
|
|
152
|
+
const schemaObj = new local_storage_schema_object_1.LocalStorageSchemaObject();
|
|
153
|
+
schemaObj.schema = schema;
|
|
154
|
+
if (userName) {
|
|
155
|
+
const userObj = new local_storage_user_object_1.LocalStorageUserObject();
|
|
156
|
+
userObj.username = userName;
|
|
157
|
+
schemaObj.users.push(userObj);
|
|
158
|
+
}
|
|
159
|
+
if (!this.storageObj.schemas) {
|
|
160
|
+
this.storageObj.schemas = [];
|
|
161
|
+
}
|
|
162
|
+
this.storageObj.schemas.push(schemaObj);
|
|
163
|
+
}
|
|
164
|
+
_createUserIfNotExistsOnSchema(schema, userName) {
|
|
165
|
+
const schemaObj = this.storageObj.schemas.find(s => s.schema === schema);
|
|
166
|
+
if (!schemaObj.users || (schemaObj.users.find(u => u.username === userName) === undefined)) {
|
|
167
|
+
const userObj = new local_storage_user_object_1.LocalStorageUserObject();
|
|
168
|
+
userObj.username = userName;
|
|
169
|
+
if (!schemaObj.users) {
|
|
170
|
+
schemaObj.users = [];
|
|
171
|
+
}
|
|
172
|
+
schemaObj.users.push(userObj);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
_getUserObject(userName) {
|
|
176
|
+
if (!this.storageObj || !this.storageObj.schemas) {
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
if (userName === undefined) {
|
|
180
|
+
userName = this.username;
|
|
181
|
+
}
|
|
141
182
|
const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
|
|
142
|
-
if (
|
|
143
|
-
return schemaObj.users.find(u => u.username ===
|
|
183
|
+
if (schemaObj && schemaObj.users && userName) {
|
|
184
|
+
return schemaObj.users.find(u => u.username === userName);
|
|
144
185
|
}
|
|
145
186
|
}
|
|
146
187
|
}
|
|
@@ -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,4FAAmF;AACnF,kFAA0E;AAG1E,MAAa,mBAAmB;IAI5B,IAAW,aAAa;QACpB,MAAM,OAAO,GAA2B,IAAI,CAAC,cAAc,EAAE,CAAC;QAC9D,IAAI,OAAO,EAAE;YACT,OAAO,OAAO,CAAC,aAAa,CAAC;SAChC;IACL,CAAC;IAED,IAAW,SAAS;QAChB,MAAM,OAAO,GAA2B,IAAI,CAAC,cAAc,EAAE,CAAC;QAC9D,IAAI,OAAO,EAAE;YACT,OAAO,OAAO,CAAC,SAAS,CAAC;SAC5B;IACL,CAAC;IAED,IAAW,aAAa;QACpB,MAAM,OAAO,GAA2B,IAAI,CAAC,cAAc,EAAE,CAAC;QAC9D,IAAI,OAAO,EAAE;YACT,OAAO,OAAO,CAAC,aAAa,CAAC;SAChC;IACL,CAAC;IAED,IAAW,WAAW;QAClB,MAAM,SAAS,GAA6B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC;QACxG,IAAI,SAAS,EAAE;YACX,OAAO,SAAS,CAAC,KAAK,CAAC;SAC1B;IACL,CAAC;IAED,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;IAC7C,CAAC;IAUD,YAAY,GAAW,EAAE,MAAc,EAAE,QAAgB;QA1CzC,YAAO,GAAY,YAAY,CAAC;QAqCtC,eAAU,GAA2B,IAAI,kDAAsB,EAAE,CAAC;QAClE,mBAAc,GAA+B,IAAI,2DAA0B,EAAE,CAAC;QAC9E,YAAO,GAAW,GAAG,CAAC;QACtB,aAAQ,GAAW,uBAAuB,CAAC;QAGjD,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC/B,CAAC;IAEM,KAAK;QACR,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,MAAM,SAAS,GAA6B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC;YACxG,IAAI,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"local-storage.service.js","sourceRoot":"","sources":["../../src/service/local-storage.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,20 +26,26 @@ export declare class LoginService {
|
|
|
26
26
|
getKeycloakParams(): Promise<void>;
|
|
27
27
|
getCompanies(): Promise<void>;
|
|
28
28
|
loginAndCreateDataSession(request?: LoginRequest, encrypt?: boolean): Promise<LoginResponse>;
|
|
29
|
+
clearStorage(): void;
|
|
30
|
+
clearAllStorage(): void;
|
|
29
31
|
logout(): Promise<ServerResponseData>;
|
|
30
|
-
login(request?: LoginRequest, encrypt?: boolean): Promise<LoginResponse>;
|
|
32
|
+
login(request?: LoginRequest, encrypt?: boolean, createDataSession?: boolean): Promise<LoginResponse>;
|
|
31
33
|
loginByKeycloakCode(code: string, state: string, uri: string): Promise<LoginResponse>;
|
|
34
|
+
loginToExternalSource(externalSourceId: number, url?: string, schema?: string, version?: string): Promise<LoginResponse>;
|
|
32
35
|
refreshAccessToken(refreshToken: string): Promise<TokenResponse>;
|
|
33
|
-
confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<
|
|
36
|
+
confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<LoginResponse>;
|
|
34
37
|
resetGoogleAuth(upId: number, userName: string): Promise<ServerResponseData>;
|
|
35
38
|
changePassword(password: string, securityCode: string, upId: number): Promise<ServerResponseData>;
|
|
36
39
|
changePasswordAndActivateUser(password: string, securityCode: string, upId: number, reCaptchaResponse?: string): Promise<ServerResponseData>;
|
|
37
40
|
sendResetPasswordOrInviteMessage(upId: number, userName: string, reCaptchaResponse: string): Promise<ServerResponseData>;
|
|
38
41
|
getUserNameBySecurityCode(securityCode: string, upId: number): Promise<ServerResponseData>;
|
|
42
|
+
private _setJwtLoginDataByLoginResponse;
|
|
43
|
+
private _handleAndReturnLoginResponse;
|
|
39
44
|
private _startHeartBeat;
|
|
40
45
|
private _stopHeartBeat;
|
|
41
46
|
private _checkEncryption;
|
|
42
47
|
private _callLogin;
|
|
48
|
+
private _callLoginToExternalSource;
|
|
43
49
|
private _loginUserByLoginCode;
|
|
44
50
|
private _call;
|
|
45
51
|
}
|
|
@@ -75,43 +75,26 @@ class LoginService {
|
|
|
75
75
|
}
|
|
76
76
|
this.backendConnection.usePublicToken = false;
|
|
77
77
|
this.backendConnection.createNewSession();
|
|
78
|
-
const response = await this.login(request, encrypt);
|
|
79
|
-
if (response &&
|
|
80
|
-
|
|
81
|
-
const datasessionCreated = await this._datasessionService.createDataSession(this.backendConnection.session.dataSessionId);
|
|
82
|
-
if (datasessionCreated === true) {
|
|
83
|
-
try {
|
|
84
|
-
if (this.backendConnection.version < 252) {
|
|
85
|
-
this._startHeartBeat();
|
|
86
|
-
}
|
|
87
|
-
else {
|
|
88
|
-
this._healthService.startHeartBeat();
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
catch (e) {
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
else {
|
|
95
|
-
this.backendConnection.localStorageService.setDataSessionId(undefined);
|
|
96
|
-
this.backendConnection.localStorageService.setSessionId(undefined);
|
|
97
|
-
this.logout();
|
|
98
|
-
throw new Error('Openening data session failed for session \''
|
|
99
|
-
+ '\'. Logging out user.');
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
else {
|
|
103
|
-
this.backendConnection.localStorageService.setDataSessionId(undefined);
|
|
104
|
-
this.backendConnection.localStorageService.setSessionId(undefined);
|
|
78
|
+
const response = await this.login(request, encrypt, true);
|
|
79
|
+
if (response && request) {
|
|
80
|
+
response.password = request.userPassword;
|
|
105
81
|
}
|
|
106
82
|
return response;
|
|
107
83
|
}
|
|
84
|
+
clearStorage() {
|
|
85
|
+
this.backendConnection.localStorageService.clear();
|
|
86
|
+
this.backendConnection.sessionStorageService.clear();
|
|
87
|
+
}
|
|
88
|
+
clearAllStorage() {
|
|
89
|
+
this.backendConnection.localStorageService.clearAll();
|
|
90
|
+
this.backendConnection.sessionStorageService.clearAll();
|
|
91
|
+
}
|
|
108
92
|
logout() {
|
|
109
93
|
let shouldLogout = false;
|
|
110
94
|
if (this.backendConnection.localStorageService.sessionId) {
|
|
111
95
|
shouldLogout = true;
|
|
112
96
|
}
|
|
113
|
-
this.
|
|
114
|
-
this.backendConnection.sessionStorageService.clear();
|
|
97
|
+
this.clearStorage();
|
|
115
98
|
if (shouldLogout) {
|
|
116
99
|
return this._call(login_service_method_enum_1.LoginServiceMethod.LogoutUser, {}, false).then((userData) => {
|
|
117
100
|
try {
|
|
@@ -128,7 +111,7 @@ class LoginService {
|
|
|
128
111
|
});
|
|
129
112
|
}
|
|
130
113
|
}
|
|
131
|
-
login(request, encrypt) {
|
|
114
|
+
login(request, encrypt, createDataSession) {
|
|
132
115
|
if (request) {
|
|
133
116
|
this.loginRequest = request;
|
|
134
117
|
}
|
|
@@ -137,18 +120,7 @@ class LoginService {
|
|
|
137
120
|
}
|
|
138
121
|
return new Promise((resolve, reject) => {
|
|
139
122
|
this._callLogin()
|
|
140
|
-
.then((result) =>
|
|
141
|
-
const loginResponse = this._boFactory.makeWithRawBackendData(login_response_1.LoginResponse, result);
|
|
142
|
-
if (loginResponse && loginResponse.loginStatus === login_status_enum_1.LoginStatus.SUCCESS) {
|
|
143
|
-
const loginData = {
|
|
144
|
-
accessToken: loginResponse.accessToken,
|
|
145
|
-
refreshToken: loginResponse.refreshToken
|
|
146
|
-
};
|
|
147
|
-
this.backendConnection.sessionStorageService.setLoginData(loginData);
|
|
148
|
-
this.backendConnection.jwtService.setExpirationTime(loginResponse.accessToken);
|
|
149
|
-
}
|
|
150
|
-
resolve(loginResponse);
|
|
151
|
-
})
|
|
123
|
+
.then((result) => resolve(this._handleAndReturnLoginResponse(result, createDataSession)))
|
|
152
124
|
.catch((e) => {
|
|
153
125
|
return reject(e);
|
|
154
126
|
});
|
|
@@ -166,40 +138,25 @@ class LoginService {
|
|
|
166
138
|
loginRequest.clientLanguage = backendLanguageCode ? backendLanguageCode : backend_language_code_enum_1.BackendLanguageCode.Dutch;
|
|
167
139
|
this.backendConnection.createNewSession(true);
|
|
168
140
|
this._loginUserByLoginCode(loginRequest)
|
|
169
|
-
.then(async (result) =>
|
|
170
|
-
const loginResponse = this._boFactory.makeWithRawBackendData(login_response_1.LoginResponse, result);
|
|
171
|
-
if (loginResponse && loginResponse.loginStatus === login_status_enum_1.LoginStatus.SUCCESS) {
|
|
172
|
-
this.backendConnection.localStorageService.setLoginResponse(loginResponse);
|
|
173
|
-
const datasessionCreated = await this._datasessionService.createDataSession(this.backendConnection.session.dataSessionId);
|
|
174
|
-
if (datasessionCreated === true) {
|
|
175
|
-
try {
|
|
176
|
-
if (this.backendConnection.version < 252) {
|
|
177
|
-
this._startHeartBeat();
|
|
178
|
-
}
|
|
179
|
-
else {
|
|
180
|
-
this._healthService.startHeartBeat();
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
|
-
catch (e) {
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
const loginData = {
|
|
187
|
-
userName: loginRequest.userName,
|
|
188
|
-
upId: loginRequest.upId,
|
|
189
|
-
dateFormat: loginResponse.userParametersValues.formatDate,
|
|
190
|
-
accessToken: loginResponse.accessToken,
|
|
191
|
-
refreshToken: loginResponse.refreshToken
|
|
192
|
-
};
|
|
193
|
-
this.backendConnection.sessionStorageService.setLoginData(loginData);
|
|
194
|
-
this.backendConnection.jwtService.setExpirationTime(loginResponse.accessToken);
|
|
195
|
-
}
|
|
196
|
-
resolve(loginResponse);
|
|
197
|
-
})
|
|
141
|
+
.then(async (result) => await resolve(this._handleAndReturnLoginResponse(result, true, true)))
|
|
198
142
|
.catch((e) => {
|
|
199
143
|
return reject(e);
|
|
200
144
|
});
|
|
201
145
|
});
|
|
202
146
|
}
|
|
147
|
+
async loginToExternalSource(externalSourceId, url, schema, version) {
|
|
148
|
+
if (this.backendConnection.sessionId) {
|
|
149
|
+
this.backendConnection.createNewSession();
|
|
150
|
+
return this.backendConnection.localStorageService.loginResponse;
|
|
151
|
+
}
|
|
152
|
+
this.loginRequest.userName = undefined;
|
|
153
|
+
this.loginRequest.userPassword = undefined;
|
|
154
|
+
this.loginRequest.upId = schema ? parseInt(schema) : parseInt(this.backendConnection.schema);
|
|
155
|
+
this.loginRequest.clientVersion = version ? version : this.backendConnection.version.toString();
|
|
156
|
+
this.backendConnection.createNewSession();
|
|
157
|
+
const result = await this._callLoginToExternalSource(externalSourceId, url);
|
|
158
|
+
return this._handleAndReturnLoginResponse(result, true);
|
|
159
|
+
}
|
|
203
160
|
async refreshAccessToken(refreshToken) {
|
|
204
161
|
let rawResponse;
|
|
205
162
|
if (this.backendConnection.usePublicToken) {
|
|
@@ -223,7 +180,8 @@ class LoginService {
|
|
|
223
180
|
clientDeviceDescription: clientDeviceDescription,
|
|
224
181
|
rememberClientDeviceForMFA: rememberClientDeviceForMFA
|
|
225
182
|
};
|
|
226
|
-
|
|
183
|
+
const response = await this._call(login_service_method_enum_1.LoginServiceMethod.ConfirmCode, inputParams, false);
|
|
184
|
+
return await this._handleAndReturnLoginResponse(response, true);
|
|
227
185
|
}
|
|
228
186
|
async resetGoogleAuth(upId, userName) {
|
|
229
187
|
const inputParams = {
|
|
@@ -264,6 +222,49 @@ class LoginService {
|
|
|
264
222
|
};
|
|
265
223
|
return this._call(login_service_method_enum_1.LoginServiceMethod.GetUserNameBySecurityCode, inputParams, true);
|
|
266
224
|
}
|
|
225
|
+
_setJwtLoginDataByLoginResponse(loginResponse, keycloak = false) {
|
|
226
|
+
const loginData = {
|
|
227
|
+
upId: loginResponse.upId,
|
|
228
|
+
userName: loginResponse.userName,
|
|
229
|
+
dateFormat: loginResponse.userParametersValues.formatDate,
|
|
230
|
+
accessToken: loginResponse.accessToken,
|
|
231
|
+
refreshToken: loginResponse.refreshToken,
|
|
232
|
+
keycloak: keycloak
|
|
233
|
+
};
|
|
234
|
+
this.backendConnection.sessionStorageService.setLoginData(loginData);
|
|
235
|
+
this.backendConnection.jwtService.setExpirationTime(loginResponse.accessToken);
|
|
236
|
+
}
|
|
237
|
+
async _handleAndReturnLoginResponse(response, createDataSession = false, keycloak = false) {
|
|
238
|
+
const loginResponse = this._boFactory.makeWithRawBackendData(login_response_1.LoginResponse, response);
|
|
239
|
+
if (loginResponse && loginResponse.loginStatus === login_status_enum_1.LoginStatus.SUCCESS) {
|
|
240
|
+
this.backendConnection.localStorageService.setLoginResponse(loginResponse);
|
|
241
|
+
this._setJwtLoginDataByLoginResponse(loginResponse, keycloak);
|
|
242
|
+
if (createDataSession) {
|
|
243
|
+
const datasessionCreated = await this._datasessionService.createDataSession(this.backendConnection.session.dataSessionId);
|
|
244
|
+
if (datasessionCreated === true) {
|
|
245
|
+
this.backendConnection.storeSessions();
|
|
246
|
+
try {
|
|
247
|
+
if (this.backendConnection.version < 252) {
|
|
248
|
+
this._startHeartBeat();
|
|
249
|
+
}
|
|
250
|
+
else {
|
|
251
|
+
this._healthService.startHeartBeat();
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
catch (e) {
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
else {
|
|
258
|
+
this.backendConnection.localStorageService.setDataSessionId(undefined);
|
|
259
|
+
this.backendConnection.localStorageService.setSessionId(undefined);
|
|
260
|
+
this.logout();
|
|
261
|
+
throw new Error('Openening data session failed for session \''
|
|
262
|
+
+ '\'. Logging out user.');
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
return loginResponse;
|
|
267
|
+
}
|
|
267
268
|
_startHeartBeat() {
|
|
268
269
|
if (!this.heartbeatTimer) {
|
|
269
270
|
this.heartbeatTimer = setInterval(() => {
|
|
@@ -295,17 +296,21 @@ class LoginService {
|
|
|
295
296
|
return this._call(login_service_method_enum_1.LoginServiceMethod.Login, this.loginRequest, true);
|
|
296
297
|
});
|
|
297
298
|
}
|
|
299
|
+
_callLoginToExternalSource(externalSourceId, url) {
|
|
300
|
+
this.loginRequest.externalSourceId = externalSourceId;
|
|
301
|
+
return this._call(login_service_method_enum_1.LoginServiceMethod.LoginToExternalSource, this.loginRequest, true, url);
|
|
302
|
+
}
|
|
298
303
|
_loginUserByLoginCode(loginRequest) {
|
|
299
304
|
return this._call(login_service_method_enum_1.LoginServiceMethod.LoginWithCode, loginRequest, true);
|
|
300
305
|
}
|
|
301
|
-
_call(method, data, showLoader) {
|
|
306
|
+
_call(method, data, showLoader, url) {
|
|
302
307
|
if (data === undefined) {
|
|
303
308
|
data = {};
|
|
304
309
|
}
|
|
305
310
|
if (showLoader === undefined) {
|
|
306
311
|
showLoader = true;
|
|
307
312
|
}
|
|
308
|
-
return this.backendConnection.call(method, data, showLoader, backend_service_name_enum_1.BackendServiceName.LoginService);
|
|
313
|
+
return this.backendConnection.call(method, data, showLoader, backend_service_name_enum_1.BackendServiceName.LoginService, undefined, false, undefined, url);
|
|
309
314
|
}
|
|
310
315
|
}
|
|
311
316
|
exports.LoginService = LoginService;
|
|
@@ -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":";;;AAAA,iFAAqE;AACrE,iFAAqE;AAErE,uDAAiD;AACjD,+DAAyD;AACzD,qDAA+C;AAE/C,uEAAgE;AAEhE,4DAAsD;AACtD,0DAAoD;AAEpD,iEAAsD;AACtD,kEAAyD;AACzD,qDAA+C;AAE/C,4EAAmE;AACnE,oDAA4C;AAC5C,mFAAuE;AACvE,mEAAwD;AAExD,MAAa,YAAY;IAyBvB,YAAY,iBAA+C;QAjBjD,qBAAgB,GAAW,CAAC,CAAC;QAK/B,mBAAc,GAAY,KAAK,CAAC;QAGhC,eAAU,GAA0B,IAAI,+CAAqB,EAAE,CAAC;QAChE,eAAU,GAAc,EAAE,CAAC;QAClB,qCAAgC,GAA2C,IAAI,GAAG,CAAoC;YACrI,CAAC,iCAAY,CAAC,KAAK,EAAE,gDAAmB,CAAC,KAAK,CAAC;YAC/C,CAAC,iCAAY,CAAC,OAAO,EAAE,gDAAmB,CAAC,OAAO,CAAC;YACnD,CAAC,iCAAY,CAAC,MAAM,EAAE,gDAAmB,CAAC,MAAM,CAAC;YACjD,CAAC,iCAAY,CAAC,MAAM,EAAE,gDAAmB,CAAC,MAAM,CAAC;SAClD,CAAC,CAAC;QAGD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,EAAE,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,8BAAa,CAAC,iBAAiB,CAAC,CAAC;QAC3D,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE;YACtF,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC;YAErE,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC;SAC1E;QACD,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC5E,IAAI,CAAC,YAAY,CAAC,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC;QAE/E,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,kBAAkB,CAAC;QACxE,IAAI,CAAC,kBAAkB,GAAG,IAAI,gCAAc,EAAE,CAAC;QAC/C,IAAI,CAAC,cAAc,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACzF,IAAI,CAAC,mBAAmB,GAAG,IAAI,wCAAkB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC5E,CAAC;IAEM,KAAK,CAAC,YAAY;QACvB,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,iBAAiB;QAC5B,MAAM,QAAQ,GAAuB,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE;aACnF,KAAK,CAAC,GAAG,EAAE;YACV,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC;QACL,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,2CAAkB,EAAE,QAAQ,CAAuB,CAAC;SAClH;IACH,CAAC;IAEM,KAAK,CAAC,YAAY;QACvB,MAAM,QAAQ,GAAQ,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE;aAC3D,KAAK,CAAC,GAAG,EAAE;YACV,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC;QACL,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,kCAAkC,CAAC,oBAAO,EAAE,QAAQ,CAAc,CAAC;YACrG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;SACrF;IACH,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,OAAsB,EAAE,OAAiB;QAC9E,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE;YAEhD,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,aAAa,CAAC;SACjE;QACD,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;SACtH;QACD,IAAI,CAAC,iBAAiB,CAAC,cAAc,GAAG,KAAK,CAAC;QAC9C,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAkB,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACzE,IAAI,QAAQ,IAAI,OAAO,EAAE;YACvB,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC;SAC1C;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,YAAY;QACjB,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;QACnD,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;IACvD,CAAC;IAEM,eAAe;QACpB,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;QACtD,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC;IAC1D,CAAC;IAEM,MAAM;QACX,IAAI,YAAY,GAAY,KAAK,CAAC;QAClC,IAAI,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,SAAS,EAAE;YACxD,YAAY,GAAG,IAAI,CAAC;SACrB;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,YAAY,EAAE;YAChB,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,UAAU,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAC5E,IAAI;oBACF,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,GAAG,GAAG,EAAE;wBACxC,IAAI,CAAC,cAAc,EAAE,CAAC;qBACvB;yBAAM;wBACL,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;qBACrC;iBACF;gBAAC,OAAO,CAAC,EAAE;iBACX;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAEM,KAAK,CAAC,OAAsB,EAAE,OAAiB,EAAE,iBAA2B;QACjF,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;SAC7B;QACD,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;SAC/B;QACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,MAAgB,EAAE,EAAE;YACzD,IAAI,CAAC,UAAU,EAAE;iBACd,IAAI,CAAC,CAAC,MAAsB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;iBACxG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,IAAY,EAAE,KAAa,EAAE,GAAW;QACvE,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACnE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,MAAgB,EAAE,EAAE;YACzD,MAAM,YAAY,GAAiB,IAAI,4BAAY,EAAE,CAAC;YACtD,MAAM,mBAAmB,GAAwB,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YACxI,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YACtC,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC;YAC9B,YAAY,CAAC,WAAW,GAAG,GAAG,CAAC;YAC/B,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACvE,YAAY,CAAC,cAAc,GAAG,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,gDAAmB,CAAC,KAAK,CAAC;YACpG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAC9C,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC;iBACrC,IAAI,CAAC,KAAK,EAAE,MAAsB,EAAE,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;iBAC7G,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,gBAAwB,EAAE,GAAY,EAAE,MAAe,EAAE,OAAgB;QAC1G,IAAI,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE;YAEpC,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,aAAa,CAAC;SACjE;QAED,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,SAAS,CAAC;QACvC,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,SAAS,CAAC;QAC3C,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC7F,IAAI,CAAC,YAAY,CAAC,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAChG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;QAC1C,MAAM,MAAM,GAAmB,MAAM,IAAI,CAAC,0BAA0B,CAAC,gBAAgB,EAAE,GAAG,CAAmB,CAAC;QAC9G,OAAO,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC1D,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,YAAoB;QAClD,IAAI,WAAW,CAAC;QAChB,IAAI,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE;YACzC,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,CAAC;SAClE;aAAM;YACL,MAAM,WAAW,GAA4B;gBAC3C,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE;gBAC5C,YAAY,EAAE,YAAY;aAC3B,CAAC;YACF,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,kBAAkB,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;SAC3F;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,iCAAa,EAAE,WAAW,CAAkB,CAAC;IAC7F,CAAC;IAEM,KAAK,CAAC,WAAW,CACtB,IAAY,EACZ,QAAgB,EAChB,gBAAwB,EACxB,uBAA+B,EAC/B,uBAA+B,EAC/B,0BAAmC;QAEnC,MAAM,WAAW,GAA4B;YAC3C,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,QAAQ;YAClB,gBAAgB,EAAE,gBAAgB;YAClC,uBAAuB,EAAE,uBAAuB;YAChD,uBAAuB,EAAE,uBAAuB;YAChD,0BAA0B,EAAE,0BAA0B;SACvD,CAAC;QACF,MAAM,QAAQ,GAAmB,MAAM,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAmB,CAAC;QACxH,OAAO,MAAM,IAAI,CAAC,6BAA6B,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,IAAY,EAAE,QAAgB;QACzD,MAAM,WAAW,GAA4B;YAC3C,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,QAAQ;SACnB,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,eAAe,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC5E,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,YAAoB,EAAE,IAAY;QAC9E,MAAM,WAAW,GAA4B;YAC3C,YAAY,EAAE,YAAY;YAC1B,QAAQ,EAAE,QAAQ;YAClB,IAAI,EAAE,IAAI;SACX,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,cAAc,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC3E,CAAC;IAEM,KAAK,CAAC,6BAA6B,CAAC,QAAgB,EAAE,YAAoB,EAAE,IAAY,EAAE,iBAA0B;QACzH,MAAM,WAAW,GAA4B;YAC3C,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,iBAAiB;SAC5B,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,6BAA6B,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC1F,CAAC;IAEM,KAAK,CAAC,gCAAgC,CAAC,IAAY,EAAE,QAAgB,EAAE,iBAAyB;QACrG,MAAM,WAAW,GAA4B;YAC3C,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,iBAAiB;SAC5B,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,gCAAgC,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC7F,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,YAAoB,EAAE,IAAY;QACvE,MAAM,WAAW,GAA4B;YAC3C,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,IAAI;SACX,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,yBAAyB,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IACrF,CAAC;IAEO,+BAA+B,CAAC,aAA4B,EAAE,WAAoB,KAAK;QAC7F,MAAM,SAAS,GAAqB;YAClC,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,UAAU,EAAE,aAAa,CAAC,oBAAoB,CAAC,UAAU;YACzD,WAAW,EAAE,aAAa,CAAC,WAAW;YACtC,YAAY,EAAE,aAAa,CAAC,YAAY;YACxC,QAAQ,EAAE,QAAQ;SACnB,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,iBAAiB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IACjF,CAAC;IAEO,KAAK,CAAC,6BAA6B,CAAC,QAAwB,EAAE,oBAA6B,KAAK,EAAE,WAAoB,KAAK;QACjI,MAAM,aAAa,GAAiC,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,8BAAa,EAAE,QAAQ,CAAC,CAAC;QACpH,IAAI,aAAa,IAAI,aAAa,CAAC,WAAW,KAAK,+BAAW,CAAC,OAAO,EAAE;YACtE,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAC3E,IAAI,CAAC,+BAA+B,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;YAC9D,IAAI,iBAAiB,EAAE;gBACrB,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBAC1H,IAAI,kBAAkB,KAAK,IAAI,EAAE;oBAC/B,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC;oBACvC,IAAI;wBACF,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,GAAG,GAAG,EAAE;4BACxC,IAAI,CAAC,eAAe,EAAE,CAAC;yBACxB;6BAAM;4BACL,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;yBACtC;qBACF;oBAAC,OAAO,CAAC,EAAE;qBAEX;iBACF;qBAAM;oBACL,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;oBACvE,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBACnE,IAAI,CAAC,MAAM,EAAE,CAAC;oBACd,MAAM,IAAI,KAAK,CAAC,8CAA8C;0BAC1D,uBAAuB,CAAC,CAAC;iBAC9B;aACF;SACF;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAEO,eAAe;QACrB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;gBACrC,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,YAAY,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YACzD,CAAC,EAAE,YAAY,CAAC,qBAAqB,CAAC,CAAC;SACxC;IACH,CAAC;IAEO,cAAc;QACpB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;SAC5B;IACH,CAAC;IAEO,gBAAgB;QACtB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;gBACxB,OAAO,EAAE,CAAC;aACX;iBAAM;gBACL,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC3C,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;oBAChG,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,UAAU;QAChB,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACvC,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,0BAA0B,CAAC,gBAAwB,EAAE,GAAY;QACvE,IAAI,CAAC,YAAY,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACtD,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,qBAAqB,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5F,CAAC;IAEO,qBAAqB,CAAC,YAA0B;QACtD,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,aAAa,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;IAEO,KAAK,CAAC,MAA0B,EAAE,IAAS,EAAE,UAAmB,EAAE,GAAY;QACpF,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,IAAI,GAAG,EAAE,CAAC;SACX;QACD,IAAI,UAAU,KAAK,SAAS,EAAE;YAC5B,UAAU,GAAG,IAAI,CAAC;SACnB;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,8CAAkB,CAAC,YAAY,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAG,GAAG,CAAC,CAAC;IACnI,CAAC;;AArVH,oCAsVC;AArVgB,kCAAqB,GAAW,KAAK,CAAC"}
|
|
@@ -8,11 +8,16 @@ export declare class SessionStorageService {
|
|
|
8
8
|
protected appRoot: string;
|
|
9
9
|
constructor(url: string, schema: string, username: string);
|
|
10
10
|
clear(): void;
|
|
11
|
+
clearAll(): void;
|
|
11
12
|
getLoginData(): LoginStorageData;
|
|
13
|
+
getKeycloakLoginData(): LoginStorageData;
|
|
12
14
|
setLoginData(data: LoginStorageData): void;
|
|
13
15
|
setBusy(busy: boolean): void;
|
|
14
16
|
getBusy(): boolean;
|
|
15
17
|
save(): void;
|
|
16
18
|
initSessionStorageObj(): void;
|
|
19
|
+
private _createSchemaAndUserObject;
|
|
20
|
+
private _createUserIfNotExistsOnSchema;
|
|
17
21
|
private _getUserObject;
|
|
22
|
+
private _getKeycloakUserObject;
|
|
18
23
|
}
|
|
@@ -21,19 +21,26 @@ class SessionStorageService {
|
|
|
21
21
|
this.initSessionStorageObj();
|
|
22
22
|
}
|
|
23
23
|
clear() {
|
|
24
|
+
if (!this.storageObj || !this.storageObj.schemas) {
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
24
27
|
if (this.username) {
|
|
25
28
|
const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
|
|
26
|
-
if (schemaObj) {
|
|
29
|
+
if (schemaObj && schemaObj.users) {
|
|
27
30
|
const idx = schemaObj.users.findIndex(u => u.username === this.username);
|
|
28
|
-
|
|
31
|
+
if (idx > -1) {
|
|
32
|
+
schemaObj.users.splice(idx, 1);
|
|
33
|
+
}
|
|
29
34
|
}
|
|
30
35
|
}
|
|
31
36
|
else {
|
|
32
37
|
const idx = this.storageObj.schemas.findIndex(s => s.schema === this.schema);
|
|
33
|
-
|
|
38
|
+
if (idx > -1) {
|
|
39
|
+
this.storageObj.schemas.splice(idx, 1);
|
|
40
|
+
}
|
|
34
41
|
}
|
|
35
42
|
const idx = this.storageObj.schemas.findIndex(s => s.schema === this.schema);
|
|
36
|
-
if (this.storageObj.schemas[idx].users.length === 0) {
|
|
43
|
+
if (idx > -1 && this.storageObj.schemas[idx].users.length === 0) {
|
|
37
44
|
this.storageObj.schemas.splice(idx, 1);
|
|
38
45
|
}
|
|
39
46
|
if (this.storageObj.schemas.length === 0) {
|
|
@@ -41,16 +48,41 @@ class SessionStorageService {
|
|
|
41
48
|
}
|
|
42
49
|
this.save();
|
|
43
50
|
}
|
|
51
|
+
clearAll() {
|
|
52
|
+
this.storage.clear();
|
|
53
|
+
}
|
|
44
54
|
getLoginData() {
|
|
45
55
|
const userObj = this._getUserObject();
|
|
46
56
|
if (userObj) {
|
|
47
57
|
return userObj.loginData;
|
|
48
58
|
}
|
|
49
59
|
}
|
|
60
|
+
getKeycloakLoginData() {
|
|
61
|
+
const userObj = this._getKeycloakUserObject();
|
|
62
|
+
if (userObj) {
|
|
63
|
+
return userObj.loginData;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
50
66
|
setLoginData(data) {
|
|
67
|
+
if (!data || (!data.upId && !data.userName)) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
this.schema = data.upId.toString();
|
|
71
|
+
this.username = data.userName;
|
|
51
72
|
const currentLoginData = this.getLoginData();
|
|
52
73
|
const newLoginData = Object.assign(currentLoginData ? currentLoginData : {}, data);
|
|
53
|
-
|
|
74
|
+
let userObj = this._getUserObject();
|
|
75
|
+
if (!userObj) {
|
|
76
|
+
if (!this.storageObj.schemas || (this.storageObj.schemas.find(s => s.schema === this.schema) === undefined)) {
|
|
77
|
+
this._createSchemaAndUserObject(this.schema, this.username);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
if (this.username) {
|
|
81
|
+
this._createUserIfNotExistsOnSchema(this.schema, this.username);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
userObj = this._getUserObject();
|
|
85
|
+
}
|
|
54
86
|
if (userObj) {
|
|
55
87
|
userObj.loginData = newLoginData;
|
|
56
88
|
this.save();
|
|
@@ -73,46 +105,59 @@ class SessionStorageService {
|
|
|
73
105
|
this.storage.setItem(this.appRoot, CircularJSON.stringify(this.storageObj));
|
|
74
106
|
}
|
|
75
107
|
initSessionStorageObj() {
|
|
76
|
-
if (!this.schema || !this.username) {
|
|
77
|
-
return;
|
|
78
|
-
}
|
|
79
108
|
const existingObj = CircularJSON.parse(this.storage.getItem(this.appRoot));
|
|
80
109
|
this.storageObj = existingObj || this.storageObj;
|
|
81
|
-
if (!this.storageObj.schemas || (this.storageObj.schemas.find(s => s.schema === this.schema) === undefined)) {
|
|
82
|
-
|
|
83
|
-
schemaObj.schema = this.schema;
|
|
84
|
-
if (this.username) {
|
|
85
|
-
const userObj = new session_storage_user_object_1.SessionStorageUserObject();
|
|
86
|
-
userObj.username = this.username;
|
|
87
|
-
schemaObj.users.push(userObj);
|
|
88
|
-
}
|
|
89
|
-
if (!this.storageObj.schemas) {
|
|
90
|
-
this.storageObj.schemas = [];
|
|
91
|
-
}
|
|
92
|
-
this.storageObj.schemas.push(schemaObj);
|
|
110
|
+
if (this.schema && !this.storageObj.schemas || (this.storageObj.schemas.find(s => s.schema === this.schema) === undefined)) {
|
|
111
|
+
this._createSchemaAndUserObject(this.schema, this.username);
|
|
93
112
|
}
|
|
94
113
|
else {
|
|
95
114
|
if (this.username) {
|
|
96
|
-
|
|
97
|
-
if (!schemaObj.users || (schemaObj.users.find(u => u.username === this.username) === undefined)) {
|
|
98
|
-
const userObj = new session_storage_user_object_1.SessionStorageUserObject();
|
|
99
|
-
userObj.username = this.username;
|
|
100
|
-
if (!schemaObj.users) {
|
|
101
|
-
schemaObj.users = [];
|
|
102
|
-
}
|
|
103
|
-
schemaObj.users.push(userObj);
|
|
104
|
-
}
|
|
115
|
+
this._createUserIfNotExistsOnSchema(this.schema, this.username);
|
|
105
116
|
}
|
|
106
117
|
}
|
|
107
118
|
this.save();
|
|
108
119
|
}
|
|
120
|
+
_createSchemaAndUserObject(schema, userName) {
|
|
121
|
+
const schemaObj = new session_storage_schema_object_1.SessionStorageSchemaObject();
|
|
122
|
+
schemaObj.schema = schema;
|
|
123
|
+
if (userName) {
|
|
124
|
+
const userObj = new session_storage_user_object_1.SessionStorageUserObject();
|
|
125
|
+
userObj.username = userName;
|
|
126
|
+
schemaObj.users.push(userObj);
|
|
127
|
+
}
|
|
128
|
+
if (!this.storageObj.schemas) {
|
|
129
|
+
this.storageObj.schemas = [];
|
|
130
|
+
}
|
|
131
|
+
this.storageObj.schemas.push(schemaObj);
|
|
132
|
+
}
|
|
133
|
+
_createUserIfNotExistsOnSchema(schema, userName) {
|
|
134
|
+
const schemaObj = this.storageObj.schemas.find(s => s.schema === schema);
|
|
135
|
+
if (!schemaObj.users || (schemaObj.users.find(u => u.username === userName) === undefined)) {
|
|
136
|
+
const userObj = new session_storage_user_object_1.SessionStorageUserObject();
|
|
137
|
+
userObj.username = userName;
|
|
138
|
+
if (!schemaObj.users) {
|
|
139
|
+
schemaObj.users = [];
|
|
140
|
+
}
|
|
141
|
+
schemaObj.users.push(userObj);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
109
144
|
_getUserObject() {
|
|
145
|
+
if (!this.storageObj || !this.storageObj.schemas) {
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
110
148
|
const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
|
|
111
149
|
if (schemaObj && this.username) {
|
|
112
150
|
return schemaObj.users.find(u => u.username === this.username);
|
|
113
151
|
}
|
|
114
152
|
return null;
|
|
115
153
|
}
|
|
154
|
+
_getKeycloakUserObject() {
|
|
155
|
+
if (!this.storageObj || !this.storageObj.schemas) {
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
158
|
+
const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
|
|
159
|
+
return schemaObj.users.find(u => u.loginData && u.loginData.keycloak);
|
|
160
|
+
}
|
|
116
161
|
}
|
|
117
162
|
exports.SessionStorageService = SessionStorageService;
|
|
118
163
|
//# sourceMappingURL=session-storage.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-storage.service.js","sourceRoot":"","sources":["../../src/service/session-storage.service.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,sFAA8E;AAE9E,0FAAkF;AAClF,sFAA8E;
|
|
1
|
+
{"version":3,"file":"session-storage.service.js","sourceRoot":"","sources":["../../src/service/session-storage.service.ts"],"names":[],"mappings":"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"}
|