@colijnit/ioneconnector 2.1.16 → 3.1.1
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 -4
- package/build/connector.js +6 -10
- package/build/connector.js.map +1 -1
- package/build/connector.unit.test.js +1 -1
- package/build/connector.unit.test.js.map +1 -1
- package/build/enum/backend-service-name.enum.d.ts +2 -1
- package/build/enum/backend-service-name.enum.js +1 -0
- package/build/enum/backend-service-name.enum.js.map +1 -1
- package/build/enum/health-service-method.enum.d.ts +3 -0
- package/build/enum/health-service-method.enum.js +8 -0
- package/build/enum/health-service-method.enum.js.map +1 -0
- package/build/enum/login-service-method.enum.d.ts +2 -0
- package/build/enum/login-service-method.enum.js +2 -0
- package/build/enum/login-service-method.enum.js.map +1 -1
- package/build/interface/login-storage-data.interface.d.ts +9 -0
- package/build/interface/login-storage-data.interface.js +3 -0
- package/build/interface/login-storage-data.interface.js.map +1 -0
- package/build/model/data-service-response-data.d.ts +1 -0
- package/build/model/data-service-response-data.js +3 -0
- package/build/model/data-service-response-data.js.map +1 -1
- package/build/model/local-storage-root-object.d.ts +6 -0
- package/build/model/local-storage-root-object.js +7 -0
- package/build/model/local-storage-root-object.js.map +1 -0
- package/build/model/login-request.d.ts +2 -0
- package/build/model/login-request.js.map +1 -1
- package/build/model/login-response.d.ts +2 -0
- package/build/model/login-response.js.map +1 -1
- package/build/model/login-service-request-data.d.ts +2 -0
- package/build/model/options.d.ts +5 -5
- package/build/model/options.js +1 -2
- package/build/model/options.js.map +1 -1
- package/build/model/session-storage-root-object.d.ts +4 -0
- package/build/model/session-storage-root-object.js +10 -0
- package/build/model/session-storage-root-object.js.map +1 -0
- package/build/model/session.d.ts +0 -9
- package/build/model/session.js +0 -15
- package/build/model/session.js.map +1 -1
- package/build/model/token-response.bo.d.ts +5 -0
- package/build/model/token-response.bo.js +8 -0
- package/build/model/token-response.bo.js.map +1 -0
- package/build/provider/ajax.service.d.ts +3 -3
- package/build/provider/ajax.service.js +49 -33
- package/build/provider/ajax.service.js.map +1 -1
- package/build/provider/base-backend-connection.service.d.ts +19 -8
- package/build/provider/base-backend-connection.service.js +62 -25
- package/build/provider/base-backend-connection.service.js.map +1 -1
- package/build/service/health.service.d.ts +10 -0
- package/build/service/health.service.js +35 -0
- package/build/service/health.service.js.map +1 -0
- package/build/service/jwt-token.service.d.ts +14 -0
- package/build/service/jwt-token.service.js +42 -0
- package/build/service/jwt-token.service.js.map +1 -0
- package/build/service/local-storage.service.d.ts +17 -0
- package/build/service/local-storage.service.js +51 -0
- package/build/service/local-storage.service.js.map +1 -0
- package/build/service/login.service.d.ts +8 -6
- package/build/service/login.service.js +89 -45
- package/build/service/login.service.js.map +1 -1
- package/build/service/session-storage.service.d.ts +12 -0
- package/build/service/session-storage.service.js +31 -0
- package/build/service/session-storage.service.js.map +1 -0
- package/build/tests/int/connector.int.test.js +0 -1
- package/build/tests/int/connector.int.test.js.map +1 -1
- package/package.json +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ajax.service.js","sourceRoot":"","sources":["../../src/provider/ajax.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AAGrE,uFAA+E;AAC/E,iCAA0B;AAC1B,kDAA4C;AAC5C,6FAAiF;AAEjF,2DAAgD;AAOhD,MAAa,WAAY,SAAQ,8DAA4B;
|
|
1
|
+
{"version":3,"file":"ajax.service.js","sourceRoot":"","sources":["../../src/provider/ajax.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,37 @@
|
|
|
1
|
-
import { BackendServiceName } from
|
|
2
|
-
import { Session } from
|
|
3
|
-
import { LoginService } from
|
|
1
|
+
import { BackendServiceName } from '../enum/backend-service-name.enum';
|
|
2
|
+
import { Session } from '../model/session';
|
|
3
|
+
import { LoginService } from '../service/login.service';
|
|
4
4
|
import { Subject } from 'rxjs';
|
|
5
|
-
import { Options } from
|
|
5
|
+
import { Options } from '../model/options';
|
|
6
6
|
import { ServerResponseData } from '../model/server-response-data';
|
|
7
|
+
import { LocalStorageService } from '../service/local-storage.service';
|
|
8
|
+
import { JwtTokenService } from '../service/jwt-token.service';
|
|
9
|
+
import { SessionStorageService } from '../service/session-storage.service';
|
|
7
10
|
export declare abstract class BaseBackendConnectionService {
|
|
8
11
|
readonly showLoader: Subject<boolean>;
|
|
9
12
|
readonly connectionAborted: Subject<void>;
|
|
10
13
|
readonly connectionResetInactivity: Subject<void>;
|
|
11
14
|
session: Session;
|
|
15
|
+
dataSessionId: string;
|
|
16
|
+
sessionId: string;
|
|
17
|
+
windowSessionId: string;
|
|
18
|
+
module: string;
|
|
12
19
|
options: Options;
|
|
20
|
+
localStorageService: LocalStorageService;
|
|
21
|
+
sessionStorageService: SessionStorageService;
|
|
22
|
+
jwtService: JwtTokenService;
|
|
23
|
+
version: number;
|
|
13
24
|
protected callId: string;
|
|
14
25
|
protected url: string;
|
|
15
26
|
protected schema: string;
|
|
16
27
|
protected loginService: LoginService;
|
|
28
|
+
protected usePublicToken: boolean;
|
|
17
29
|
private _datasessionService;
|
|
18
30
|
constructor(options: Options);
|
|
19
31
|
abstract call(method: string, data: any, showLoader: boolean, service: BackendServiceName, ownMessage?: {}): Promise<any>;
|
|
20
32
|
commit(): Promise<boolean>;
|
|
21
33
|
closeDataSession(): Promise<ServerResponseData>;
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
private
|
|
25
|
-
private _generateUniqueId;
|
|
34
|
+
createNewSession(): void;
|
|
35
|
+
generateUniqueId(): string;
|
|
36
|
+
private _checkSession;
|
|
26
37
|
}
|
|
@@ -5,23 +5,52 @@ const session_1 = require("../model/session");
|
|
|
5
5
|
const login_service_1 = require("../service/login.service");
|
|
6
6
|
const rxjs_1 = require("rxjs");
|
|
7
7
|
const datasession_service_1 = require("../service/datasession.service");
|
|
8
|
+
const local_storage_service_1 = require("../service/local-storage.service");
|
|
9
|
+
const jwt_token_service_1 = require("../service/jwt-token.service");
|
|
10
|
+
const session_storage_service_1 = require("../service/session-storage.service");
|
|
8
11
|
class BaseBackendConnectionService {
|
|
9
12
|
constructor(options) {
|
|
10
13
|
this.showLoader = new rxjs_1.Subject();
|
|
11
14
|
this.connectionAborted = new rxjs_1.Subject();
|
|
12
15
|
this.connectionResetInactivity = new rxjs_1.Subject();
|
|
13
16
|
this.session = new session_1.Session();
|
|
17
|
+
this.windowSessionId = "1";
|
|
18
|
+
this.module = 'webselector';
|
|
14
19
|
this.callId = "1";
|
|
20
|
+
this.usePublicToken = true;
|
|
15
21
|
this.options = options;
|
|
16
|
-
this.
|
|
17
|
-
|
|
18
|
-
|
|
22
|
+
if (this.options.schema === "") {
|
|
23
|
+
console.error("Schema is not provided");
|
|
24
|
+
}
|
|
25
|
+
if (this.options.version === "") {
|
|
26
|
+
console.error("Version is not provided");
|
|
19
27
|
}
|
|
20
28
|
else {
|
|
21
|
-
this.
|
|
29
|
+
this.version = parseInt(this.options.version);
|
|
30
|
+
}
|
|
31
|
+
if (options && ((options.username && options.password) || !options.jwtEnabled)) {
|
|
32
|
+
this.usePublicToken = false;
|
|
33
|
+
}
|
|
34
|
+
this.schema = options.schema;
|
|
35
|
+
this.url = options.url;
|
|
36
|
+
if (options.sessionId) {
|
|
37
|
+
this.sessionId = options.sessionId;
|
|
22
38
|
}
|
|
39
|
+
if (options.dataSessionId) {
|
|
40
|
+
this.dataSessionId = options.dataSessionId;
|
|
41
|
+
}
|
|
42
|
+
if (options.windowSessionId) {
|
|
43
|
+
this.windowSessionId = options.windowSessionId;
|
|
44
|
+
}
|
|
45
|
+
if (options.module) {
|
|
46
|
+
this.module = options.module;
|
|
47
|
+
}
|
|
48
|
+
this.localStorageService = new local_storage_service_1.LocalStorageService();
|
|
49
|
+
this.sessionStorageService = new session_storage_service_1.SessionStorageService();
|
|
23
50
|
this.loginService = new login_service_1.LoginService(this);
|
|
51
|
+
this.jwtService = new jwt_token_service_1.JwtTokenService(this.sessionStorageService, this.loginService);
|
|
24
52
|
this._datasessionService = new datasession_service_1.DatasessionService(this);
|
|
53
|
+
this._checkSession();
|
|
25
54
|
}
|
|
26
55
|
async commit() {
|
|
27
56
|
return this._datasessionService.commit();
|
|
@@ -29,30 +58,23 @@ class BaseBackendConnectionService {
|
|
|
29
58
|
closeDataSession() {
|
|
30
59
|
return this.loginService.logout();
|
|
31
60
|
}
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
}
|
|
37
|
-
async waitForLogin() {
|
|
38
|
-
if (this.session && this.session.created) {
|
|
39
|
-
return true;
|
|
61
|
+
createNewSession() {
|
|
62
|
+
this.session = new session_1.Session();
|
|
63
|
+
if (this.usePublicToken) {
|
|
64
|
+
this.session.publicToken = this.localStorageService.publicToken;
|
|
40
65
|
}
|
|
41
|
-
|
|
42
|
-
|
|
66
|
+
else {
|
|
67
|
+
if (!this.dataSessionId) {
|
|
68
|
+
this.dataSessionId = `${this.module}_${this.generateUniqueId()}`;
|
|
69
|
+
}
|
|
70
|
+
this.session.dataSessionId = this.dataSessionId;
|
|
71
|
+
this.session.id = this.sessionId ? this.sessionId : this.generateUniqueId();
|
|
72
|
+
this.session.windowsId = this.windowSessionId;
|
|
73
|
+
this.localStorageService.setDataSessionId(this.session.dataSessionId);
|
|
74
|
+
this.localStorageService.setSessionId(this.session.id);
|
|
43
75
|
}
|
|
44
|
-
this.session.loggingIn = true;
|
|
45
|
-
await this.loginService.loginAndCreateDataSession();
|
|
46
|
-
this.session.loggingIn = false;
|
|
47
|
-
}
|
|
48
|
-
_createNewSession() {
|
|
49
|
-
const session = new session_1.Session();
|
|
50
|
-
session.dataSessionId = 'webselector_' + this._generateUniqueId();
|
|
51
|
-
session.id = this._generateUniqueId();
|
|
52
|
-
session.windowsId = "1";
|
|
53
|
-
return session;
|
|
54
76
|
}
|
|
55
|
-
|
|
77
|
+
generateUniqueId() {
|
|
56
78
|
function s4() {
|
|
57
79
|
return Math.floor((1 + Math.random()) * 0x10000)
|
|
58
80
|
.toString(16)
|
|
@@ -60,6 +82,21 @@ class BaseBackendConnectionService {
|
|
|
60
82
|
}
|
|
61
83
|
return s4() + s4() + s4();
|
|
62
84
|
}
|
|
85
|
+
_checkSession() {
|
|
86
|
+
if (this.usePublicToken && this.localStorageService.publicToken) {
|
|
87
|
+
this.createNewSession();
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
if (this.sessionId && this.dataSessionId) {
|
|
91
|
+
this.createNewSession();
|
|
92
|
+
}
|
|
93
|
+
else if (this.localStorageService.sessionId && this.localStorageService.dataSessionId) {
|
|
94
|
+
this.sessionId = this.localStorageService.sessionId;
|
|
95
|
+
this.dataSessionId = this.localStorageService.dataSessionId;
|
|
96
|
+
this.createNewSession();
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
63
100
|
}
|
|
64
101
|
exports.BaseBackendConnectionService = BaseBackendConnectionService;
|
|
65
102
|
//# 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":";;;AACA,8CAAyC;AACzC,4DAAsD;AACtD,+
|
|
1
|
+
{"version":3,"file":"base-backend-connection.service.js","sourceRoot":"","sources":["../../src/provider/base-backend-connection.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { BaseBackendConnectionService } from '../provider/base-backend-connection.service';
|
|
2
|
+
export declare class HealthService {
|
|
3
|
+
private static HEARTBEAT_INTERVAL_MS;
|
|
4
|
+
protected heartbeatTimer: any;
|
|
5
|
+
protected backendConnection: BaseBackendConnectionService;
|
|
6
|
+
constructor(backendConnection: BaseBackendConnectionService);
|
|
7
|
+
startHeartBeat(): void;
|
|
8
|
+
stopHeartBeat(): void;
|
|
9
|
+
private _call;
|
|
10
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.HealthService = void 0;
|
|
4
|
+
const backend_service_name_enum_1 = require("../enum/backend-service-name.enum");
|
|
5
|
+
const health_service_method_enum_1 = require("../enum/health-service-method.enum");
|
|
6
|
+
class HealthService {
|
|
7
|
+
constructor(backendConnection) {
|
|
8
|
+
this.backendConnection = backendConnection;
|
|
9
|
+
}
|
|
10
|
+
startHeartBeat() {
|
|
11
|
+
if (!this.heartbeatTimer) {
|
|
12
|
+
this.heartbeatTimer = setInterval(() => {
|
|
13
|
+
this._call(health_service_method_enum_1.HealthServiceMethod.GetHeartBeat, {}, false);
|
|
14
|
+
}, HealthService.HEARTBEAT_INTERVAL_MS);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
stopHeartBeat() {
|
|
18
|
+
if (this.heartbeatTimer) {
|
|
19
|
+
clearInterval(this.heartbeatTimer);
|
|
20
|
+
this.heartbeatTimer = null;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
_call(method, data, showLoader) {
|
|
24
|
+
if (data === undefined) {
|
|
25
|
+
data = {};
|
|
26
|
+
}
|
|
27
|
+
if (showLoader === undefined) {
|
|
28
|
+
showLoader = true;
|
|
29
|
+
}
|
|
30
|
+
return this.backendConnection.call(method, data, showLoader, backend_service_name_enum_1.BackendServiceName.HealthService);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
exports.HealthService = HealthService;
|
|
34
|
+
HealthService.HEARTBEAT_INTERVAL_MS = 59000;
|
|
35
|
+
//# sourceMappingURL=health.service.js.map
|
|
@@ -0,0 +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;YACtB,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,KAAK,CAAC,gDAAmB,CAAC,YAAY,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YAC5D,CAAC,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;SAC3C;IACL,CAAC;IAEM,aAAa;QAChB,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;SAC9B;IACL,CAAC;IAEO,KAAK,CAAC,MAA2B,EAAE,IAAS,EAAE,UAAmB;QACrE,IAAI,IAAI,KAAK,SAAS,EAAE;YACpB,IAAI,GAAG,EAAE,CAAC;SACb;QACD,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,UAAU,GAAG,IAAI,CAAC;SACrB;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,8CAAkB,CAAC,aAAa,CAAC,CAAC;IACnG,CAAC;;AAjCL,sCAkCC;AAjCkB,mCAAqB,GAAW,KAAK,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Subject } from 'rxjs';
|
|
2
|
+
export declare class JwtTokenService {
|
|
3
|
+
jwt: string;
|
|
4
|
+
retrievingToken: boolean;
|
|
5
|
+
tokenRetrieved: Subject<boolean>;
|
|
6
|
+
private _tokenExpiredTime;
|
|
7
|
+
private _sessionStorageService;
|
|
8
|
+
private _loginService;
|
|
9
|
+
constructor(sessionStorageService: any, loginService: any);
|
|
10
|
+
getAccessToken(refresh?: boolean): Promise<void>;
|
|
11
|
+
setExpirationTime(jwt: string): void;
|
|
12
|
+
private _tokenExpired;
|
|
13
|
+
private _refreshToken;
|
|
14
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.JwtTokenService = void 0;
|
|
4
|
+
const rxjs_1 = require("rxjs");
|
|
5
|
+
const jwt_decode_1 = require("jwt-decode");
|
|
6
|
+
class JwtTokenService {
|
|
7
|
+
constructor(sessionStorageService, loginService) {
|
|
8
|
+
this.retrievingToken = false;
|
|
9
|
+
this.tokenRetrieved = new rxjs_1.Subject();
|
|
10
|
+
this._sessionStorageService = sessionStorageService;
|
|
11
|
+
this._loginService = loginService;
|
|
12
|
+
}
|
|
13
|
+
async getAccessToken(refresh = true) {
|
|
14
|
+
if (refresh && this._tokenExpired()) {
|
|
15
|
+
await this._refreshToken();
|
|
16
|
+
}
|
|
17
|
+
this.jwt = this._sessionStorageService.getLoginData().accessToken;
|
|
18
|
+
}
|
|
19
|
+
setExpirationTime(jwt) {
|
|
20
|
+
const decoded = (0, jwt_decode_1.default)(jwt);
|
|
21
|
+
this._tokenExpiredTime = decoded.exp;
|
|
22
|
+
}
|
|
23
|
+
_tokenExpired() {
|
|
24
|
+
if (this._sessionStorageService.getLoginData().accessToken && this._tokenExpiredTime) {
|
|
25
|
+
return ((1000 * this._tokenExpiredTime) - (new Date()).getTime()) < 120000;
|
|
26
|
+
}
|
|
27
|
+
return false;
|
|
28
|
+
}
|
|
29
|
+
async _refreshToken() {
|
|
30
|
+
this.retrievingToken = true;
|
|
31
|
+
const tokenResponse = await this._loginService.refreshAccessToken(this._sessionStorageService.getLoginData().refreshToken);
|
|
32
|
+
const loginData = this._sessionStorageService.getLoginData();
|
|
33
|
+
loginData.accessToken = tokenResponse.accessToken;
|
|
34
|
+
loginData.refreshToken = tokenResponse.refreshToken;
|
|
35
|
+
this.setExpirationTime(tokenResponse.accessToken);
|
|
36
|
+
this._sessionStorageService.setLoginData(loginData);
|
|
37
|
+
this.retrievingToken = false;
|
|
38
|
+
this.tokenRetrieved.next(true);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
exports.JwtTokenService = JwtTokenService;
|
|
42
|
+
//# sourceMappingURL=jwt-token.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../src/service/jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,+BAA6B;AAI7B,2CAAoC;AAGpC,MAAa,eAAe;IASxB,YAAY,qBAAqB,EAAE,YAAY;QAPxC,oBAAe,GAAY,KAAK,CAAC;QACjC,mBAAc,GAAqB,IAAI,cAAO,EAAW,CAAC;QAO7D,IAAI,CAAC,sBAAsB,GAAG,qBAAqB,CAAC;QACpD,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,UAAmB,IAAI;QAC/C,IAAI,OAAO,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;YACjC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;SAC9B;QACD,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,WAAW,CAAC;IACtE,CAAC;IAEM,iBAAiB,CAAC,GAAW;QAChC,MAAM,OAAO,GAAQ,IAAA,oBAAU,EAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC;IACzC,CAAC;IAEO,aAAa;QACjB,IAAI,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,WAAW,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAClF,OAAO,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC;SAC9E;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,aAAa;QACvB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,MAAM,aAAa,GAAkB,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,CAAC;QAC1I,MAAM,SAAS,GAAqB,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC;QAC/E,SAAS,CAAC,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAClD,SAAS,CAAC,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;QACpD,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;CACJ;AA5CD,0CA4CC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { LocalStorageRootObject } from '../model/local-storage-root-object';
|
|
2
|
+
export declare class LocalStorageService {
|
|
3
|
+
readonly storage: Storage;
|
|
4
|
+
setSessionId(id: string): void;
|
|
5
|
+
get sessionId(): string;
|
|
6
|
+
setDataSessionId(id: string): void;
|
|
7
|
+
get dataSessionId(): string;
|
|
8
|
+
setPublicToken(token: string): void;
|
|
9
|
+
get publicToken(): string;
|
|
10
|
+
setKeycloakState(keycloakState: string): void;
|
|
11
|
+
get keycloakState(): string;
|
|
12
|
+
protected storageObj: LocalStorageRootObject;
|
|
13
|
+
protected appRoot: string;
|
|
14
|
+
constructor();
|
|
15
|
+
save(): void;
|
|
16
|
+
protected _initLocalStorageObj(): void;
|
|
17
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LocalStorageService = void 0;
|
|
4
|
+
const CircularJSON = require("circular-json");
|
|
5
|
+
const local_storage_root_object_1 = require("../model/local-storage-root-object");
|
|
6
|
+
class LocalStorageService {
|
|
7
|
+
setSessionId(id) {
|
|
8
|
+
this.storageObj.sessionId = id;
|
|
9
|
+
this.save();
|
|
10
|
+
}
|
|
11
|
+
get sessionId() {
|
|
12
|
+
return this.storageObj.sessionId;
|
|
13
|
+
}
|
|
14
|
+
setDataSessionId(id) {
|
|
15
|
+
this.storageObj.dataSessionId = id;
|
|
16
|
+
this.save();
|
|
17
|
+
}
|
|
18
|
+
get dataSessionId() {
|
|
19
|
+
return this.storageObj.dataSessionId;
|
|
20
|
+
}
|
|
21
|
+
setPublicToken(token) {
|
|
22
|
+
this.storageObj.token = token;
|
|
23
|
+
this.save();
|
|
24
|
+
}
|
|
25
|
+
get publicToken() {
|
|
26
|
+
return this.storageObj.token;
|
|
27
|
+
}
|
|
28
|
+
setKeycloakState(keycloakState) {
|
|
29
|
+
this.storageObj.keycloakState = keycloakState;
|
|
30
|
+
this.save();
|
|
31
|
+
}
|
|
32
|
+
get keycloakState() {
|
|
33
|
+
return this.storageObj.keycloakState;
|
|
34
|
+
}
|
|
35
|
+
constructor() {
|
|
36
|
+
this.storage = localStorage;
|
|
37
|
+
this.storageObj = new local_storage_root_object_1.LocalStorageRootObject();
|
|
38
|
+
this.appRoot = "/";
|
|
39
|
+
this._initLocalStorageObj();
|
|
40
|
+
}
|
|
41
|
+
save() {
|
|
42
|
+
this.storage.setItem(this.appRoot, CircularJSON.stringify(this.storageObj));
|
|
43
|
+
}
|
|
44
|
+
_initLocalStorageObj() {
|
|
45
|
+
this.appRoot = window.location.pathname;
|
|
46
|
+
this.storageObj = CircularJSON.parse(this.storage.getItem(this.appRoot)) || this.storageObj;
|
|
47
|
+
this.save();
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
exports.LocalStorageService = LocalStorageService;
|
|
51
|
+
//# sourceMappingURL=local-storage.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"local-storage.service.js","sourceRoot":"","sources":["../../src/service/local-storage.service.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,kFAA0E;AAE1E,MAAa,mBAAmB;IAIrB,YAAY,CAAC,EAAU;QAC1B,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;IACrC,CAAC;IAEM,gBAAgB,CAAC,EAAU;QAC9B,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;IACzC,CAAC;IAEM,cAAc,CAAC,KAAa;QAC/B,IAAI,CAAC,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;IACjC,CAAC;IAEM,gBAAgB,CAAC,aAAqB;QACzC,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,aAAa,CAAC;QAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;IACzC,CAAC;IAKD;QAzCgB,YAAO,GAAY,YAAY,CAAC;QAsCtC,eAAU,GAA2B,IAAI,kDAAsB,EAAE,CAAC;QAClE,YAAO,GAAW,GAAG,CAAC;QAG5B,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAChC,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAChF,CAAC;IAES,oBAAoB;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC;QAC5F,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;CAEJ;AAzDD,kDAyDC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { BaseBackendConnectionService } from
|
|
2
|
-
import { ServerResponseData } from
|
|
3
|
-
import { LoginResponse } from
|
|
1
|
+
import { BaseBackendConnectionService } from '../provider/base-backend-connection.service';
|
|
2
|
+
import { ServerResponseData } from '../model/server-response-data';
|
|
3
|
+
import { LoginResponse } from '../model/login-response';
|
|
4
4
|
import { LoginRequest } from '../model/login-request';
|
|
5
|
+
import { TokenResponse } from '../model/token-response.bo';
|
|
5
6
|
export declare class LoginService {
|
|
6
7
|
private static HEARTBEAT_INTERVAL_MS;
|
|
7
8
|
protected heartbeatTimer: any;
|
|
@@ -9,18 +10,18 @@ export declare class LoginService {
|
|
|
9
10
|
protected windowsSessionId: number;
|
|
10
11
|
protected loginRequest: LoginRequest;
|
|
11
12
|
private _encryptionService;
|
|
13
|
+
private _healthService;
|
|
12
14
|
private _useEncryption;
|
|
13
15
|
private _publicService;
|
|
14
16
|
private _datasessionService;
|
|
15
17
|
private _boFactory;
|
|
16
|
-
private _creatingDataSession;
|
|
17
|
-
private _dataSessionCreated;
|
|
18
18
|
constructor(backendConnection: BaseBackendConnectionService);
|
|
19
19
|
getPublicKey(): Promise<string>;
|
|
20
20
|
loginAndCreateDataSession(): Promise<boolean>;
|
|
21
|
-
waitForLoginToFinish(): Promise<boolean>;
|
|
22
21
|
logout(): Promise<ServerResponseData>;
|
|
23
22
|
login(request?: LoginRequest, encrypt?: boolean): Promise<LoginResponse>;
|
|
23
|
+
loginByKeycloakCode(code: string, uri: string): Promise<LoginResponse>;
|
|
24
|
+
refreshAccessToken(refreshToken: string): Promise<TokenResponse>;
|
|
24
25
|
confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<ServerResponseData>;
|
|
25
26
|
resetGoogleAuth(upId: number, userName: string): Promise<ServerResponseData>;
|
|
26
27
|
changePassword(password: string, securityCode: string, upId: number): Promise<ServerResponseData>;
|
|
@@ -31,5 +32,6 @@ export declare class LoginService {
|
|
|
31
32
|
private _stopHeartBeat;
|
|
32
33
|
private _checkEncryption;
|
|
33
34
|
private _callLogin;
|
|
35
|
+
private _loginUserByLoginCode;
|
|
34
36
|
private _call;
|
|
35
37
|
}
|
|
@@ -8,29 +8,24 @@ const datasession_service_1 = require("./datasession.service");
|
|
|
8
8
|
const public_service_1 = require("./public.service");
|
|
9
9
|
const business_object_factory_1 = require("./business-object-factory");
|
|
10
10
|
const login_response_1 = require("../model/login-response");
|
|
11
|
-
const rxjs_1 = require("rxjs");
|
|
12
11
|
const login_request_1 = require("../model/login-request");
|
|
12
|
+
const login_status_enum_1 = require("../enum/login-status.enum");
|
|
13
|
+
const token_response_bo_1 = require("../model/token-response.bo");
|
|
14
|
+
const health_service_1 = require("./health.service");
|
|
13
15
|
class LoginService {
|
|
14
16
|
constructor(backendConnection) {
|
|
15
17
|
this.windowsSessionId = 1;
|
|
16
18
|
this._useEncryption = false;
|
|
17
19
|
this._boFactory = new business_object_factory_1.BusinessObjectFactory();
|
|
18
|
-
this._creatingDataSession = false;
|
|
19
|
-
this._dataSessionCreated = new rxjs_1.Subject();
|
|
20
20
|
this.backendConnection = backendConnection;
|
|
21
21
|
this.loginRequest = new login_request_1.LoginRequest();
|
|
22
|
-
|
|
23
|
-
console.error("Schema is not provided");
|
|
24
|
-
}
|
|
25
|
-
if (this.backendConnection.options.version === "") {
|
|
26
|
-
console.error("Version is not provided");
|
|
27
|
-
}
|
|
22
|
+
this._healthService = new health_service_1.HealthService(backendConnection);
|
|
28
23
|
if (this.backendConnection.options.username || this.backendConnection.options.password) {
|
|
29
24
|
this.loginRequest.userName = this.backendConnection.options.username;
|
|
30
25
|
this.loginRequest.userPassword = this.backendConnection.options.password;
|
|
31
26
|
}
|
|
32
27
|
this.loginRequest.upId = parseInt(this.backendConnection.options.schema, 10);
|
|
33
|
-
this.loginRequest.clientVersion = this.backendConnection.
|
|
28
|
+
this.loginRequest.clientVersion = this.backendConnection.version.toString();
|
|
34
29
|
this.loginRequest.clientLanguage = this.backendConnection.options.languageCode;
|
|
35
30
|
this._useEncryption = this.backendConnection.options.useLoginEncryption;
|
|
36
31
|
this._encryptionService = new encrypt_service_1.EncryptService();
|
|
@@ -41,49 +36,55 @@ class LoginService {
|
|
|
41
36
|
return this._publicService.getPublicKey();
|
|
42
37
|
}
|
|
43
38
|
async loginAndCreateDataSession() {
|
|
44
|
-
if (this.
|
|
45
|
-
|
|
46
|
-
setTimeout(() => {
|
|
47
|
-
resolve(this.loginAndCreateDataSession());
|
|
48
|
-
}, 500);
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
if (this.backendConnection.session.created) {
|
|
39
|
+
if (this.backendConnection.sessionId) {
|
|
40
|
+
this.backendConnection.createNewSession();
|
|
52
41
|
return true;
|
|
53
42
|
}
|
|
54
|
-
this.
|
|
55
|
-
await this.login();
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
43
|
+
this.backendConnection.createNewSession();
|
|
44
|
+
const response = await this.login();
|
|
45
|
+
if (response && response.loginStatus === login_status_enum_1.LoginStatus.SUCCESS) {
|
|
46
|
+
const datasessionCreated = await this._datasessionService.createDataSession(this.backendConnection.session.dataSessionId);
|
|
47
|
+
if (datasessionCreated === true) {
|
|
48
|
+
try {
|
|
49
|
+
if (this.backendConnection.version < 252) {
|
|
50
|
+
this._startHeartBeat();
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
this._healthService.startHeartBeat();
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
catch (e) {
|
|
57
|
+
}
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
this.backendConnection.localStorageService.setDataSessionId(undefined);
|
|
62
|
+
this.backendConnection.localStorageService.setSessionId(undefined);
|
|
63
|
+
this.logout();
|
|
64
|
+
throw new Error("Openening data session failed for session '"
|
|
65
|
+
+ "'. Logging out user.");
|
|
66
|
+
}
|
|
65
67
|
}
|
|
66
68
|
else {
|
|
67
|
-
this.
|
|
68
|
-
|
|
69
|
-
+ "'. Logging out user.");
|
|
69
|
+
this.backendConnection.localStorageService.setDataSessionId(undefined);
|
|
70
|
+
this.backendConnection.localStorageService.setSessionId(undefined);
|
|
70
71
|
}
|
|
71
72
|
}
|
|
72
|
-
async waitForLoginToFinish() {
|
|
73
|
-
return new Promise((resolve) => {
|
|
74
|
-
this._dataSessionCreated.subscribe(() => {
|
|
75
|
-
resolve(true);
|
|
76
|
-
});
|
|
77
|
-
this.backendConnection.session.dataSessionCreated.subscribe(() => {
|
|
78
|
-
resolve(true);
|
|
79
|
-
});
|
|
80
|
-
});
|
|
81
|
-
}
|
|
82
73
|
logout() {
|
|
83
|
-
if (
|
|
84
|
-
this.backendConnection.
|
|
74
|
+
if (this.backendConnection.localStorageService.sessionId) {
|
|
75
|
+
this.backendConnection.localStorageService.setDataSessionId(undefined);
|
|
76
|
+
this.backendConnection.localStorageService.setSessionId(undefined);
|
|
85
77
|
return this._call(login_service_method_enum_1.LoginServiceMethod.LogoutUser, {}, false).then((userData) => {
|
|
86
|
-
|
|
78
|
+
try {
|
|
79
|
+
if (this.backendConnection.version < 252) {
|
|
80
|
+
this._stopHeartBeat();
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
this._healthService.stopHeartBeat();
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
catch (e) {
|
|
87
|
+
}
|
|
87
88
|
return userData;
|
|
88
89
|
});
|
|
89
90
|
}
|
|
@@ -99,6 +100,34 @@ class LoginService {
|
|
|
99
100
|
this._callLogin()
|
|
100
101
|
.then((result) => {
|
|
101
102
|
const loginResponse = this._boFactory.makeWithRawBackendData(login_response_1.LoginResponse, result);
|
|
103
|
+
if (loginResponse && loginResponse.loginStatus === login_status_enum_1.LoginStatus.SUCCESS) {
|
|
104
|
+
const loginData = {
|
|
105
|
+
accessToken: loginResponse.accessToken,
|
|
106
|
+
refreshToken: loginResponse.refreshToken
|
|
107
|
+
};
|
|
108
|
+
this.backendConnection.sessionStorageService.setLoginData(loginData);
|
|
109
|
+
this.backendConnection.jwtService.setExpirationTime(loginResponse.accessToken);
|
|
110
|
+
}
|
|
111
|
+
resolve(loginResponse);
|
|
112
|
+
})
|
|
113
|
+
.catch((e) => {
|
|
114
|
+
return reject(e);
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
async loginByKeycloakCode(code, uri) {
|
|
119
|
+
return new Promise((resolve, reject) => {
|
|
120
|
+
this._loginUserByLoginCode(code, uri)
|
|
121
|
+
.then((result) => {
|
|
122
|
+
const loginResponse = this._boFactory.makeWithRawBackendData(login_response_1.LoginResponse, result);
|
|
123
|
+
if (loginResponse && loginResponse.loginStatus === login_status_enum_1.LoginStatus.SUCCESS) {
|
|
124
|
+
const loginData = {
|
|
125
|
+
accessToken: loginResponse.accessToken,
|
|
126
|
+
refreshToken: loginResponse.refreshToken
|
|
127
|
+
};
|
|
128
|
+
this.backendConnection.sessionStorageService.setLoginData(loginData);
|
|
129
|
+
this.backendConnection.jwtService.setExpirationTime(loginResponse.accessToken);
|
|
130
|
+
}
|
|
102
131
|
resolve(loginResponse);
|
|
103
132
|
})
|
|
104
133
|
.catch((e) => {
|
|
@@ -106,6 +135,14 @@ class LoginService {
|
|
|
106
135
|
});
|
|
107
136
|
});
|
|
108
137
|
}
|
|
138
|
+
async refreshAccessToken(refreshToken) {
|
|
139
|
+
const inputParams = {
|
|
140
|
+
sessionId: this.backendConnection.sessionId,
|
|
141
|
+
refreshToken: refreshToken,
|
|
142
|
+
};
|
|
143
|
+
const rawResponse = await this._call(login_service_method_enum_1.LoginServiceMethod.RefreshAccessToken, inputParams, false);
|
|
144
|
+
return this._boFactory.makeWithRawBackendData(token_response_bo_1.TokenResponse, rawResponse);
|
|
145
|
+
}
|
|
109
146
|
async confirmCode(upId, userName, confirmationCode, clientDeviceFingerprint, clientDeviceDescription, rememberClientDeviceForMFA) {
|
|
110
147
|
const inputParams = {
|
|
111
148
|
upId: upId,
|
|
@@ -187,6 +224,13 @@ class LoginService {
|
|
|
187
224
|
return this._call(login_service_method_enum_1.LoginServiceMethod.Login, this.loginRequest, true);
|
|
188
225
|
});
|
|
189
226
|
}
|
|
227
|
+
_loginUserByLoginCode(code, uri) {
|
|
228
|
+
this.loginRequest.userName = undefined;
|
|
229
|
+
this.loginRequest.userPassword = undefined;
|
|
230
|
+
this.loginRequest.loginCode = code;
|
|
231
|
+
this.loginRequest.redirectUri = uri;
|
|
232
|
+
return this._call(login_service_method_enum_1.LoginServiceMethod.LoginWithCode, this.loginRequest, true);
|
|
233
|
+
}
|
|
190
234
|
_call(method, data, showLoader) {
|
|
191
235
|
if (data === undefined) {
|
|
192
236
|
data = {};
|