@colijnit/ioneconnector 259.1.4 → 260.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/enum/external-method.enum.d.ts +22 -0
- package/build/enum/external-method.enum.js +27 -0
- package/build/enum/external-method.enum.js.map +1 -0
- package/build/provider/ajax.service.js +19 -16
- package/build/provider/ajax.service.js.map +1 -1
- package/build/provider/base-backend-connection.service.d.ts +4 -4
- package/build/provider/base-backend-connection.service.js +30 -29
- package/build/provider/base-backend-connection.service.js.map +1 -1
- package/build/service/external-jwt-token.service.d.ts +1 -4
- package/build/service/external-jwt-token.service.js +2 -6
- package/build/service/external-jwt-token.service.js.map +1 -1
- package/build/service/internal-jwt-token.service.d.ts +0 -3
- package/build/service/internal-jwt-token.service.js +10 -13
- package/build/service/internal-jwt-token.service.js.map +1 -1
- package/build/service/jwt-token.service.d.ts +2 -2
- package/build/service/jwt-token.service.js +5 -5
- package/build/service/jwt-token.service.js.map +1 -1
- package/build/service/local-storage.service.js +15 -2
- package/build/service/local-storage.service.js.map +1 -1
- package/build/service/login.service.d.ts +0 -1
- package/build/service/login.service.js +10 -13
- package/build/service/login.service.js.map +1 -1
- package/build/service/storage.service.d.ts +35 -0
- package/build/service/storage.service.js +89 -0
- package/build/service/storage.service.js.map +1 -0
- package/package.json +2 -2
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
export declare enum ExternalMethod {
|
|
2
|
+
SetSchema = "setschema",
|
|
3
|
+
SetUserName = "setusername",
|
|
4
|
+
Clear = "clear",
|
|
5
|
+
ClearAll = "clearall",
|
|
6
|
+
SessionPublicToken = "sessionpublictoken",
|
|
7
|
+
GetSessionLoginData = "getsessionlogindata",
|
|
8
|
+
GetSessionKeycloakLoginData = "getsessionkeycloaklogindata",
|
|
9
|
+
SetSessionLoginData = "setsessionlogindata",
|
|
10
|
+
SetSessionPublicToken = "setsessionpublictoken",
|
|
11
|
+
SetSessionBusy = "setsessionbusy",
|
|
12
|
+
GetSessionBusy = "getsessionbusy",
|
|
13
|
+
LocalLoginResponse = "localloginresponse",
|
|
14
|
+
LocalSessionId = "localsessionid",
|
|
15
|
+
LocalDataSessionId = "localdatasessionid",
|
|
16
|
+
LocalKeycloakState = "localkeycloakstate",
|
|
17
|
+
GetLocalUserObject = "getlocaluserobject",
|
|
18
|
+
SetLocalLoginResponse = "setlocalloginresponse",
|
|
19
|
+
SetLocalSessionId = "setlocalsessionid",
|
|
20
|
+
SetLocalDataSessionId = "setlocaldatasessionid",
|
|
21
|
+
SetLocalKeycloakState = "setlocalkeycloakstate"
|
|
22
|
+
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ExternalMethod = void 0;
|
|
4
|
+
var ExternalMethod;
|
|
5
|
+
(function (ExternalMethod) {
|
|
6
|
+
ExternalMethod["SetSchema"] = "setschema";
|
|
7
|
+
ExternalMethod["SetUserName"] = "setusername";
|
|
8
|
+
ExternalMethod["Clear"] = "clear";
|
|
9
|
+
ExternalMethod["ClearAll"] = "clearall";
|
|
10
|
+
ExternalMethod["SessionPublicToken"] = "sessionpublictoken";
|
|
11
|
+
ExternalMethod["GetSessionLoginData"] = "getsessionlogindata";
|
|
12
|
+
ExternalMethod["GetSessionKeycloakLoginData"] = "getsessionkeycloaklogindata";
|
|
13
|
+
ExternalMethod["SetSessionLoginData"] = "setsessionlogindata";
|
|
14
|
+
ExternalMethod["SetSessionPublicToken"] = "setsessionpublictoken";
|
|
15
|
+
ExternalMethod["SetSessionBusy"] = "setsessionbusy";
|
|
16
|
+
ExternalMethod["GetSessionBusy"] = "getsessionbusy";
|
|
17
|
+
ExternalMethod["LocalLoginResponse"] = "localloginresponse";
|
|
18
|
+
ExternalMethod["LocalSessionId"] = "localsessionid";
|
|
19
|
+
ExternalMethod["LocalDataSessionId"] = "localdatasessionid";
|
|
20
|
+
ExternalMethod["LocalKeycloakState"] = "localkeycloakstate";
|
|
21
|
+
ExternalMethod["GetLocalUserObject"] = "getlocaluserobject";
|
|
22
|
+
ExternalMethod["SetLocalLoginResponse"] = "setlocalloginresponse";
|
|
23
|
+
ExternalMethod["SetLocalSessionId"] = "setlocalsessionid";
|
|
24
|
+
ExternalMethod["SetLocalDataSessionId"] = "setlocaldatasessionid";
|
|
25
|
+
ExternalMethod["SetLocalKeycloakState"] = "setlocalkeycloakstate";
|
|
26
|
+
})(ExternalMethod = exports.ExternalMethod || (exports.ExternalMethod = {}));
|
|
27
|
+
//# sourceMappingURL=external-method.enum.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"external-method.enum.js","sourceRoot":"","sources":["../../src/enum/external-method.enum.ts"],"names":[],"mappings":";;;AAGA,IAAY,cAqBX;AArBD,WAAY,cAAc;IACxB,yCAAuB,CAAA;IACvB,6CAA2B,CAAA;IAC3B,iCAAe,CAAA;IACf,uCAAqB,CAAA;IACrB,2DAAyC,CAAA;IACzC,6DAA2C,CAAA;IAC3C,6EAA2D,CAAA;IAC3D,6DAA2C,CAAA;IAC3C,iEAA+C,CAAA;IAC/C,mDAAiC,CAAA;IACjC,mDAAiC,CAAA;IACjC,2DAAyC,CAAA;IACzC,mDAAiC,CAAA;IACjC,2DAAyC,CAAA;IACzC,2DAAyC,CAAA;IACzC,2DAAyC,CAAA;IACzC,iEAA+C,CAAA;IAC/C,yDAAuC,CAAA;IACvC,iEAA+C,CAAA;IAC/C,iEAA+C,CAAA;AACjD,CAAC,EArBW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAqBzB"}
|
|
@@ -38,10 +38,10 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
async connect(url, schema, version) {
|
|
41
|
-
const keycloakLoginData = this.
|
|
41
|
+
const keycloakLoginData = this.storageService.getSessionKeycloakLoginData();
|
|
42
42
|
if (keycloakLoginData) {
|
|
43
43
|
const userNameFromKeycloak = keycloakLoginData.userName;
|
|
44
|
-
const userObject = this.
|
|
44
|
+
const userObject = this.storageService.getLocalUserObject(userNameFromKeycloak);
|
|
45
45
|
if (userObject && userObject.loginResponse) {
|
|
46
46
|
this.session.dataSessionId = userObject.dataSessionId;
|
|
47
47
|
this.session.id = userObject.sessionId;
|
|
@@ -50,7 +50,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
if (this.usePublicToken) {
|
|
53
|
-
if (this.
|
|
53
|
+
if (this.storageService.sessionPublicToken) {
|
|
54
54
|
return null;
|
|
55
55
|
}
|
|
56
56
|
await this.createPublicSession();
|
|
@@ -60,20 +60,20 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
60
60
|
}
|
|
61
61
|
else {
|
|
62
62
|
let response;
|
|
63
|
-
if (this.
|
|
64
|
-
if (!this.
|
|
63
|
+
if (this.storageService.localSessionId) {
|
|
64
|
+
if (!this.storageService.localLoginResponse) {
|
|
65
65
|
response = await this._nativeLogin(url, schema, version);
|
|
66
66
|
if (response && response.upId && response.loginStatus === 'SUCCESS') {
|
|
67
|
-
this.
|
|
67
|
+
this.storageService.setLocalLoginResponse(response);
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
else {
|
|
71
71
|
response = await this.userInfoService.getActiveUserInfo();
|
|
72
72
|
if (response && response.upId && response.loginStatus === 'SUCCESS') {
|
|
73
|
-
this.
|
|
73
|
+
this.storageService.setLocalLoginResponse(response);
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
|
-
return this.
|
|
76
|
+
return this.storageService.localLoginResponse;
|
|
77
77
|
}
|
|
78
78
|
response = await this.checkAndPrepareKeycloak();
|
|
79
79
|
if (response) {
|
|
@@ -84,7 +84,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
hasSession() {
|
|
87
|
-
return this.
|
|
87
|
+
return this.storageService.localSessionId !== undefined;
|
|
88
88
|
}
|
|
89
89
|
isPublicSession() {
|
|
90
90
|
return this.usePublicToken;
|
|
@@ -126,6 +126,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
126
126
|
let messageToSend = JSON.stringify({
|
|
127
127
|
service: service,
|
|
128
128
|
method: method,
|
|
129
|
+
id: this.callId,
|
|
129
130
|
data: data,
|
|
130
131
|
dataSessionId: this.session ? this.session.dataSessionId : "",
|
|
131
132
|
sessionId: this.session ? this.session.id : ""
|
|
@@ -162,18 +163,18 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
162
163
|
}
|
|
163
164
|
clearStorageAndLogout() {
|
|
164
165
|
if (this.usePublicToken) {
|
|
165
|
-
this.
|
|
166
|
-
this.
|
|
166
|
+
this.storageService.clear();
|
|
167
|
+
this.storageService.setSessionPublicToken(undefined);
|
|
167
168
|
this.callBeacon(datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession, {}, backend_service_name_enum_1.BackendServiceName.PublicService);
|
|
168
169
|
}
|
|
169
170
|
else {
|
|
170
|
-
this.
|
|
171
|
+
this.storageService.clear();
|
|
171
172
|
}
|
|
172
173
|
}
|
|
173
174
|
close() {
|
|
174
175
|
if (this.usePublicToken) {
|
|
175
|
-
this.
|
|
176
|
-
this.
|
|
176
|
+
this.storageService.clear();
|
|
177
|
+
this.storageService.setSessionPublicToken(undefined);
|
|
177
178
|
return this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession, {}, false, backend_service_name_enum_1.BackendServiceName.PublicService)
|
|
178
179
|
.catch(() => {
|
|
179
180
|
return null;
|
|
@@ -214,8 +215,10 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
214
215
|
message = JSON.stringify({
|
|
215
216
|
service: service,
|
|
216
217
|
method: method,
|
|
218
|
+
id: this.callId,
|
|
217
219
|
data: data,
|
|
218
220
|
dataSessionId: this.session ? this.session.dataSessionId : "",
|
|
221
|
+
windowSessionId: this.session ? this.session.windowsId : 1,
|
|
219
222
|
sessionId: this.session ? this.session.id : ""
|
|
220
223
|
});
|
|
221
224
|
}
|
|
@@ -309,10 +312,10 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
309
312
|
}
|
|
310
313
|
_redirectToIdentityServerRealm() {
|
|
311
314
|
if (this.loginService.company && this.loginService.company.realmId && (this.loginService.company.clientId || this.options.keycloakClientId)) {
|
|
312
|
-
let state = this.
|
|
315
|
+
let state = this.storageService.localKeycloakState;
|
|
313
316
|
if (!state) {
|
|
314
317
|
state = this._createGuid();
|
|
315
|
-
this.
|
|
318
|
+
this.storageService.setLocalKeycloakState(state);
|
|
316
319
|
}
|
|
317
320
|
const redirectUrl = window.location.href;
|
|
318
321
|
const query = {
|
|
@@ -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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"}
|
|
@@ -4,13 +4,12 @@ import { LoginService } from '../service/login.service';
|
|
|
4
4
|
import { Subject } from 'rxjs';
|
|
5
5
|
import { Options } from '../model/options';
|
|
6
6
|
import { ServerResponseData } from '../model/server-response-data';
|
|
7
|
-
import { LocalStorageService } from '../service/local-storage.service';
|
|
8
7
|
import { JwtTokenService } from '../service/jwt-token.service';
|
|
9
|
-
import { SessionStorageService } from '../service/session-storage.service';
|
|
10
8
|
import { DataServiceData } from '../model/data-service-data';
|
|
11
9
|
import { PublicServiceRequestData } from '../model/public-service-request-data';
|
|
12
10
|
import { TokenResponse } from '../model/token-response.bo';
|
|
13
11
|
import { UserInfoService } from '../service/user-info.service';
|
|
12
|
+
import { StorageService } from '../service/storage.service';
|
|
14
13
|
export declare abstract class BaseBackendConnectionService {
|
|
15
14
|
readonly showLoader: Subject<boolean>;
|
|
16
15
|
readonly connectionAborted: Subject<void>;
|
|
@@ -18,16 +17,17 @@ export declare abstract class BaseBackendConnectionService {
|
|
|
18
17
|
session: Session;
|
|
19
18
|
dataSessionId: string;
|
|
20
19
|
sessionId: string;
|
|
20
|
+
windowSessionId: string;
|
|
21
21
|
module: string;
|
|
22
22
|
options: Options;
|
|
23
|
-
|
|
24
|
-
sessionStorageService: SessionStorageService;
|
|
23
|
+
storageService: StorageService;
|
|
25
24
|
jwtService: JwtTokenService;
|
|
26
25
|
version: number;
|
|
27
26
|
usePublicToken: boolean;
|
|
28
27
|
schema: string;
|
|
29
28
|
externalSourceId: number;
|
|
30
29
|
protected methodWithoutAccessToken: string[];
|
|
30
|
+
protected callId: string;
|
|
31
31
|
protected url: string;
|
|
32
32
|
protected loginService: LoginService;
|
|
33
33
|
protected userInfoService: UserInfoService;
|
|
@@ -6,8 +6,6 @@ const session_1 = require("../model/session");
|
|
|
6
6
|
const login_service_1 = require("../service/login.service");
|
|
7
7
|
const rxjs_1 = require("rxjs");
|
|
8
8
|
const datasession_service_1 = require("../service/datasession.service");
|
|
9
|
-
const local_storage_service_1 = require("../service/local-storage.service");
|
|
10
|
-
const session_storage_service_1 = require("../service/session-storage.service");
|
|
11
9
|
const datasession_service_method_enum_1 = require("../enum/datasession-service-method.enum");
|
|
12
10
|
const end_point_enum_1 = require("../enum/end-point.enum");
|
|
13
11
|
const token_response_bo_1 = require("../model/token-response.bo");
|
|
@@ -16,12 +14,14 @@ const external_jwt_token_service_1 = require("../service/external-jwt-token.serv
|
|
|
16
14
|
const internal_jwt_token_service_1 = require("../service/internal-jwt-token.service");
|
|
17
15
|
const public_service_method_enum_1 = require("../enum/public-service-method.enum");
|
|
18
16
|
const login_service_method_enum_1 = require("../enum/login-service-method.enum");
|
|
17
|
+
const storage_service_1 = require("../service/storage.service");
|
|
19
18
|
class BaseBackendConnectionService {
|
|
20
19
|
constructor(options) {
|
|
21
20
|
this.showLoader = new rxjs_1.Subject();
|
|
22
21
|
this.connectionAborted = new rxjs_1.Subject();
|
|
23
22
|
this.connectionResetInactivity = new rxjs_1.Subject();
|
|
24
23
|
this.session = new session_1.Session();
|
|
24
|
+
this.windowSessionId = "1";
|
|
25
25
|
this.module = 'webselector';
|
|
26
26
|
this.usePublicToken = true;
|
|
27
27
|
this.methodWithoutAccessToken = [
|
|
@@ -32,6 +32,7 @@ class BaseBackendConnectionService {
|
|
|
32
32
|
datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession,
|
|
33
33
|
login_service_method_enum_1.LoginServiceMethod.RefreshAccessToken
|
|
34
34
|
];
|
|
35
|
+
this.callId = "1";
|
|
35
36
|
this.options = options;
|
|
36
37
|
if (this.options.schema === "") {
|
|
37
38
|
console.error("Schema is not provided");
|
|
@@ -45,8 +46,8 @@ class BaseBackendConnectionService {
|
|
|
45
46
|
this.schema = options.schema;
|
|
46
47
|
this.url = options.url;
|
|
47
48
|
this.externalSourceId = options.externalSourceId;
|
|
48
|
-
this.
|
|
49
|
-
if ((options && (options.username)) || options.getAccessTokenFunction !== undefined || this.
|
|
49
|
+
this.storageService = new storage_service_1.StorageService(this.url, this.schema, options.username);
|
|
50
|
+
if ((options && (options.username)) || options.getAccessTokenFunction !== undefined || this.storageService.localSessionId) {
|
|
50
51
|
this.usePublicToken = false;
|
|
51
52
|
}
|
|
52
53
|
if (options.sessionId) {
|
|
@@ -55,24 +56,27 @@ class BaseBackendConnectionService {
|
|
|
55
56
|
if (options.dataSessionId) {
|
|
56
57
|
this.dataSessionId = options.dataSessionId;
|
|
57
58
|
}
|
|
59
|
+
if (options.windowSessionId) {
|
|
60
|
+
this.windowSessionId = options.windowSessionId;
|
|
61
|
+
}
|
|
58
62
|
if (options.module) {
|
|
59
63
|
this.module = options.module;
|
|
60
64
|
}
|
|
61
|
-
this.sessionStorageService = new session_storage_service_1.SessionStorageService(this.url, this.schema, options.username);
|
|
62
65
|
this.loginService = new login_service_1.LoginService(this);
|
|
63
66
|
this._datasessionService = new datasession_service_1.DatasessionService(this);
|
|
64
67
|
this.userInfoService = new user_info_service_1.UserInfoService(this);
|
|
65
68
|
if (options.getAccessTokenFunction !== undefined) {
|
|
66
|
-
this.jwtService = new external_jwt_token_service_1.ExternalJwtTokenService(this.
|
|
69
|
+
this.jwtService = new external_jwt_token_service_1.ExternalJwtTokenService(this.storageService, this.loginService);
|
|
70
|
+
this.jwtService.getAccessTokenFunction = options.getAccessTokenFunction;
|
|
67
71
|
}
|
|
68
72
|
else {
|
|
69
|
-
this.jwtService = new internal_jwt_token_service_1.InternalJwtTokenService(this.
|
|
73
|
+
this.jwtService = new internal_jwt_token_service_1.InternalJwtTokenService(this.storageService, this.loginService);
|
|
70
74
|
}
|
|
71
75
|
let forKeycloak = false;
|
|
72
|
-
const keycloakLoginData = this.
|
|
76
|
+
const keycloakLoginData = this.storageService.getSessionKeycloakLoginData();
|
|
73
77
|
if (keycloakLoginData) {
|
|
74
78
|
const userNameFromKeycloak = keycloakLoginData.userName;
|
|
75
|
-
const userObject = this.
|
|
79
|
+
const userObject = this.storageService.getLocalUserObject(userNameFromKeycloak);
|
|
76
80
|
if (userObject && userObject.loginResponse) {
|
|
77
81
|
this.dataSessionId = userObject.dataSessionId;
|
|
78
82
|
this.sessionId = userObject.sessionId;
|
|
@@ -89,44 +93,41 @@ class BaseBackendConnectionService {
|
|
|
89
93
|
return this._closeTheSession();
|
|
90
94
|
}
|
|
91
95
|
storeSessions() {
|
|
92
|
-
this.
|
|
93
|
-
this.
|
|
96
|
+
this.storageService.setLocalDataSessionId(this.session.dataSessionId);
|
|
97
|
+
this.storageService.setLocalSessionId(this.session.id);
|
|
94
98
|
}
|
|
95
99
|
setSchemaUserNameAndVersion(schema, userName) {
|
|
96
100
|
this.schema = schema;
|
|
97
101
|
this.version = parseInt(this.options.version);
|
|
98
|
-
this.
|
|
99
|
-
this.
|
|
100
|
-
this.
|
|
101
|
-
this.sessionStorageService.username = userName;
|
|
102
|
-
this.localStorageService.initLocalStorageObj();
|
|
103
|
-
this.sessionStorageService.initSessionStorageObj();
|
|
102
|
+
this.storageService.schema = schema;
|
|
103
|
+
this.storageService.username = userName;
|
|
104
|
+
this.storageService.initStorageObjects();
|
|
104
105
|
}
|
|
105
106
|
createNewSession(forKeycloak = false) {
|
|
106
107
|
this.session = new session_1.Session();
|
|
107
108
|
if (forKeycloak) {
|
|
108
|
-
this.
|
|
109
|
+
this.storageService.setSessionPublicToken(undefined);
|
|
109
110
|
if (!this.dataSessionId) {
|
|
110
111
|
this.dataSessionId = `${this.module}_${this.generateUniqueId()}`;
|
|
111
112
|
}
|
|
112
113
|
this.session.dataSessionId = this.dataSessionId;
|
|
113
114
|
this.session.id = this.sessionId ? this.sessionId : this.generateUniqueId();
|
|
114
|
-
this.
|
|
115
|
-
this.
|
|
115
|
+
this.storageService.setLocalDataSessionId(this.session.dataSessionId);
|
|
116
|
+
this.storageService.setLocalSessionId(this.session.id);
|
|
116
117
|
}
|
|
117
118
|
else {
|
|
118
119
|
if (this.usePublicToken) {
|
|
119
|
-
this.session.publicToken = this.
|
|
120
|
+
this.session.publicToken = this.storageService.sessionPublicToken;
|
|
120
121
|
}
|
|
121
122
|
else {
|
|
122
|
-
this.
|
|
123
|
+
this.storageService.setSessionPublicToken(undefined);
|
|
123
124
|
if (!this.dataSessionId) {
|
|
124
125
|
this.dataSessionId = `${this.module}_${this.generateUniqueId()}`;
|
|
125
126
|
}
|
|
126
127
|
this.session.dataSessionId = this.dataSessionId;
|
|
127
128
|
this.session.id = this.sessionId ? this.sessionId : this.generateUniqueId();
|
|
128
|
-
this.
|
|
129
|
-
this.
|
|
129
|
+
this.storageService.setLocalDataSessionId(this.session.dataSessionId);
|
|
130
|
+
this.storageService.setLocalSessionId(this.session.id);
|
|
130
131
|
}
|
|
131
132
|
}
|
|
132
133
|
}
|
|
@@ -139,7 +140,7 @@ class BaseBackendConnectionService {
|
|
|
139
140
|
return null;
|
|
140
141
|
});
|
|
141
142
|
if (token) {
|
|
142
|
-
this.
|
|
143
|
+
this.storageService.setSessionPublicToken(token);
|
|
143
144
|
this.jwtService.setLoginDataByPublicToken(token);
|
|
144
145
|
this.createNewSession();
|
|
145
146
|
const tokenResponse = new token_response_bo_1.TokenResponse();
|
|
@@ -158,16 +159,16 @@ class BaseBackendConnectionService {
|
|
|
158
159
|
return s4() + s4() + s4();
|
|
159
160
|
}
|
|
160
161
|
_checkSession(forKeycloak = false) {
|
|
161
|
-
if (this.usePublicToken && this.
|
|
162
|
+
if (this.usePublicToken && this.storageService.sessionPublicToken) {
|
|
162
163
|
this.createNewSession();
|
|
163
164
|
}
|
|
164
165
|
else {
|
|
165
166
|
if (this.sessionId && this.dataSessionId) {
|
|
166
167
|
this.createNewSession(forKeycloak);
|
|
167
168
|
}
|
|
168
|
-
else if (this.
|
|
169
|
-
this.sessionId = this.
|
|
170
|
-
this.dataSessionId = this.
|
|
169
|
+
else if (this.storageService.localSessionId && this.storageService.localDataSessionId) {
|
|
170
|
+
this.sessionId = this.storageService.localSessionId;
|
|
171
|
+
this.dataSessionId = this.storageService.localDataSessionId;
|
|
171
172
|
this.createNewSession(forKeycloak);
|
|
172
173
|
}
|
|
173
174
|
else {
|
|
@@ -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;
|
|
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,10 +1,7 @@
|
|
|
1
1
|
import { JwtTokenService } from "./jwt-token.service";
|
|
2
|
-
import { SessionStorageService } from "./session-storage.service";
|
|
3
|
-
import { LoginService } from "./login.service";
|
|
4
2
|
export declare class ExternalJwtTokenService extends JwtTokenService {
|
|
5
3
|
get jwt(): string;
|
|
6
4
|
get retrievingToken(): boolean;
|
|
7
|
-
|
|
8
|
-
constructor(sessionStorageService: SessionStorageService, loginService: LoginService, getAccessTokenFunction: Function);
|
|
5
|
+
getAccessTokenFunction: Function;
|
|
9
6
|
getAccessToken(refresh?: boolean): Promise<void>;
|
|
10
7
|
}
|
|
@@ -4,17 +4,13 @@ exports.ExternalJwtTokenService = void 0;
|
|
|
4
4
|
const jwt_token_service_1 = require("./jwt-token.service");
|
|
5
5
|
class ExternalJwtTokenService extends jwt_token_service_1.JwtTokenService {
|
|
6
6
|
get jwt() {
|
|
7
|
-
if (this.
|
|
8
|
-
return this.
|
|
7
|
+
if (this.getAccessTokenFunction) {
|
|
8
|
+
return this.getAccessTokenFunction();
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
11
|
get retrievingToken() {
|
|
12
12
|
return false;
|
|
13
13
|
}
|
|
14
|
-
constructor(sessionStorageService, loginService, getAccessTokenFunction) {
|
|
15
|
-
super(sessionStorageService, loginService);
|
|
16
|
-
this._getAccessTokenFunction = getAccessTokenFunction;
|
|
17
|
-
}
|
|
18
14
|
async getAccessToken(refresh) {
|
|
19
15
|
}
|
|
20
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-jwt-token.service.js","sourceRoot":"","sources":["../../src/service/external-jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;
|
|
1
|
+
{"version":3,"file":"external-jwt-token.service.js","sourceRoot":"","sources":["../../src/service/external-jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;AAEpD,MAAa,uBAAwB,SAAQ,mCAAe;IAExD,IAAW,GAAG;QACV,IAAI,IAAI,CAAC,sBAAsB,EAAE;YAC7B,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC;SACxC;IACL,CAAC;IAED,IAAW,eAAe;QAEtB,OAAO,KAAK,CAAC;IACjB,CAAC;IAIM,KAAK,CAAC,cAAc,CAAC,OAAiB;IAE7C,CAAC;CACJ;AAlBD,0DAkBC"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
import { JwtTokenService } from "./jwt-token.service";
|
|
2
|
-
import { SessionStorageService } from "./session-storage.service";
|
|
3
|
-
import { LoginService } from "./login.service";
|
|
4
2
|
export declare class InternalJwtTokenService extends JwtTokenService {
|
|
5
3
|
get jwt(): string;
|
|
6
4
|
get retrievingToken(): boolean;
|
|
7
|
-
constructor(sessionStorageService: SessionStorageService, loginService: LoginService);
|
|
8
5
|
getAccessToken(refresh?: boolean): Promise<void>;
|
|
9
6
|
private _tokenExpired;
|
|
10
7
|
private _refreshToken;
|
|
@@ -4,15 +4,12 @@ exports.InternalJwtTokenService = void 0;
|
|
|
4
4
|
const jwt_token_service_1 = require("./jwt-token.service");
|
|
5
5
|
class InternalJwtTokenService extends jwt_token_service_1.JwtTokenService {
|
|
6
6
|
get jwt() {
|
|
7
|
-
return this.
|
|
8
|
-
this.
|
|
9
|
-
this.
|
|
7
|
+
return this.storageService.getSessionLoginData() && this.storageService.getSessionLoginData().accessToken ?
|
|
8
|
+
this.storageService.getSessionLoginData().accessToken :
|
|
9
|
+
this.storageService.sessionPublicToken;
|
|
10
10
|
}
|
|
11
11
|
get retrievingToken() {
|
|
12
|
-
return this.
|
|
13
|
-
}
|
|
14
|
-
constructor(sessionStorageService, loginService) {
|
|
15
|
-
super(sessionStorageService, loginService);
|
|
12
|
+
return this.storageService.getSessionBusy();
|
|
16
13
|
}
|
|
17
14
|
async getAccessToken(refresh = true) {
|
|
18
15
|
if (refresh && this._tokenExpired()) {
|
|
@@ -20,21 +17,21 @@ class InternalJwtTokenService extends jwt_token_service_1.JwtTokenService {
|
|
|
20
17
|
}
|
|
21
18
|
}
|
|
22
19
|
_tokenExpired() {
|
|
23
|
-
const loginData = this.
|
|
20
|
+
const loginData = this.storageService.getSessionLoginData();
|
|
24
21
|
if (loginData && loginData.accessToken && loginData.tokenExp) {
|
|
25
22
|
return ((1000 * loginData.tokenExp) - (new Date()).getTime()) < 60000;
|
|
26
23
|
}
|
|
27
24
|
return true;
|
|
28
25
|
}
|
|
29
26
|
async _refreshToken() {
|
|
30
|
-
this.
|
|
31
|
-
const tokenResponse = await this.loginService.refreshAccessToken(this.
|
|
32
|
-
const loginData = this.
|
|
27
|
+
this.storageService.setSessionBusy(true);
|
|
28
|
+
const tokenResponse = await this.loginService.refreshAccessToken(this.storageService.getSessionLoginData().refreshToken);
|
|
29
|
+
const loginData = this.storageService.getSessionLoginData();
|
|
33
30
|
loginData.accessToken = tokenResponse.accessToken;
|
|
34
31
|
loginData.refreshToken = tokenResponse.refreshToken;
|
|
35
32
|
this.setExpirationTime(tokenResponse.accessToken);
|
|
36
|
-
this.
|
|
37
|
-
this.
|
|
33
|
+
this.storageService.setSessionLoginData(loginData);
|
|
34
|
+
this.storageService.setSessionBusy(false);
|
|
38
35
|
if (window.hasOwnProperty('tokenRetrieved')) {
|
|
39
36
|
window.tokenRetrieved.next(true);
|
|
40
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-jwt-token.service.js","sourceRoot":"","sources":["../../src/service/internal-jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;
|
|
1
|
+
{"version":3,"file":"internal-jwt-token.service.js","sourceRoot":"","sources":["../../src/service/internal-jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;AAIpD,MAAa,uBAAwB,SAAQ,mCAAe;IAExD,IAAW,GAAG;QACV,OAAO,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,WAAW,CAAC,CAAC;YACzG,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,WAAW,CAAC,CAAC;YACvD,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;IAC7C,CAAC;IAED,IAAW,eAAe;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAChD,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,UAAmB,IAAI;QAC/C,IAAI,OAAO,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;YACjC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;SAC9B;IACL,CAAC;IAEO,aAAa;QACjB,MAAM,SAAS,GAAqB,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;QAC9E,IAAI,SAAS,IAAI,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,QAAQ,EAAE;YAC1D,OAAO,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC;SACzE;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,aAAa;QACvB,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,aAAa,GAAkB,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,YAAY,CAAC,CAAC;QACxI,MAAM,SAAS,GAAqB,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;QAC9E,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,cAAc,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE1C,IAAI,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE;YAEzC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpC;IACL,CAAC;CACJ;AAzCD,0DAyCC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { SessionStorageService } from './session-storage.service';
|
|
2
1
|
import { LoginService } from './login.service';
|
|
2
|
+
import { StorageService } from './storage.service';
|
|
3
3
|
export declare abstract class JwtTokenService {
|
|
4
4
|
abstract get jwt(): string;
|
|
5
|
-
protected
|
|
5
|
+
protected storageService: StorageService;
|
|
6
6
|
protected loginService: LoginService;
|
|
7
7
|
constructor(sessionStorageService: any, loginService: any);
|
|
8
8
|
abstract get retrievingToken(): boolean;
|
|
@@ -5,7 +5,7 @@ const rxjs_1 = require("rxjs");
|
|
|
5
5
|
const jwt_decode_1 = require("jwt-decode");
|
|
6
6
|
class JwtTokenService {
|
|
7
7
|
constructor(sessionStorageService, loginService) {
|
|
8
|
-
this.
|
|
8
|
+
this.storageService = sessionStorageService;
|
|
9
9
|
this.loginService = loginService;
|
|
10
10
|
if (!window.hasOwnProperty('tokenRetrieved')) {
|
|
11
11
|
window.tokenRetrieved = new rxjs_1.Subject();
|
|
@@ -14,19 +14,19 @@ class JwtTokenService {
|
|
|
14
14
|
setExpirationTime(jwt) {
|
|
15
15
|
try {
|
|
16
16
|
const decoded = (0, jwt_decode_1.default)(jwt);
|
|
17
|
-
const loginData = this.
|
|
17
|
+
const loginData = this.storageService.getSessionLoginData();
|
|
18
18
|
loginData.tokenExp = decoded.exp;
|
|
19
|
-
this.
|
|
19
|
+
this.storageService.setSessionLoginData(loginData);
|
|
20
20
|
}
|
|
21
21
|
catch (e) {
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
setLoginDataByPublicToken(token) {
|
|
25
|
-
const loginData = this.
|
|
25
|
+
const loginData = this.storageService.getSessionLoginData();
|
|
26
26
|
loginData.accessToken = token;
|
|
27
27
|
loginData.refreshToken = token;
|
|
28
28
|
this.setExpirationTime(token);
|
|
29
|
-
this.
|
|
29
|
+
this.storageService.setSessionLoginData(loginData);
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
exports.JwtTokenService = JwtTokenService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../src/service/jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,+BAA6B;
|
|
1
|
+
{"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../src/service/jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,+BAA6B;AAG7B,2CAAoC;AAGpC,MAAsB,eAAe;IAMjC,YAAY,qBAAqB,EAAE,YAAY;QAC3C,IAAI,CAAC,cAAc,GAAG,qBAAqB,CAAC;QAC5C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAGjC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE;YAE1C,MAAM,CAAC,cAAc,GAAG,IAAI,cAAO,EAAE,CAAC;SACzC;IACL,CAAC;IAMM,iBAAiB,CAAC,GAAW;QAChC,IAAI;YACA,MAAM,OAAO,GAAQ,IAAA,oBAAU,EAAC,GAAG,CAAC,CAAC;YACrC,MAAM,SAAS,GAAqB,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;YAC9E,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;YACjC,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;SACtD;QAAC,OAAO,CAAC,EAAE;SAEX;IACL,CAAC;IAEM,yBAAyB,CAAC,KAAa;QAC1C,MAAM,SAAS,GAAqB,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;QAC9E,SAAS,CAAC,WAAW,GAAG,KAAK,CAAC;QAC9B,SAAS,CAAC,YAAY,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC;CACJ;AAvCD,0CAuCC"}
|
|
@@ -86,6 +86,7 @@ class LocalStorageService {
|
|
|
86
86
|
}
|
|
87
87
|
if (userObj) {
|
|
88
88
|
userObj.loginResponse = loginResponse;
|
|
89
|
+
userObj.username = loginResponse.userName;
|
|
89
90
|
this.save();
|
|
90
91
|
}
|
|
91
92
|
}
|
|
@@ -163,8 +164,20 @@ class LocalStorageService {
|
|
|
163
164
|
userName = this.username;
|
|
164
165
|
}
|
|
165
166
|
const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
|
|
166
|
-
if (schemaObj && schemaObj.users
|
|
167
|
-
|
|
167
|
+
if (schemaObj && schemaObj.users) {
|
|
168
|
+
if (!userName) {
|
|
169
|
+
const userObj = schemaObj.users.length > 0 ? schemaObj.users[0] : null;
|
|
170
|
+
if (userObj) {
|
|
171
|
+
this.username = userObj.username;
|
|
172
|
+
return userObj;
|
|
173
|
+
}
|
|
174
|
+
else {
|
|
175
|
+
return null;
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
else {
|
|
179
|
+
return schemaObj.users.find(u => u.username.toLowerCase() === userName.toLowerCase());
|
|
180
|
+
}
|
|
168
181
|
}
|
|
169
182
|
}
|
|
170
183
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-storage.service.js","sourceRoot":"","sources":["../../src/service/local-storage.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"local-storage.service.js","sourceRoot":"","sources":["../../src/service/local-storage.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,6 @@ export declare class LoginService {
|
|
|
11
11
|
company: Company;
|
|
12
12
|
protected heartbeatTimer: any;
|
|
13
13
|
protected backendConnection: BaseBackendConnectionService;
|
|
14
|
-
protected windowsSessionId: number;
|
|
15
14
|
protected loginRequest: LoginRequest;
|
|
16
15
|
private _encryptionService;
|
|
17
16
|
private _healthService;
|
|
@@ -18,7 +18,6 @@ const backend_language_code_enum_1 = require("../enum/backend-language-code.enum
|
|
|
18
18
|
const language_code_enum_1 = require("../enum/language-code.enum");
|
|
19
19
|
class LoginService {
|
|
20
20
|
constructor(backendConnection) {
|
|
21
|
-
this.windowsSessionId = 1;
|
|
22
21
|
this._useEncryption = false;
|
|
23
22
|
this._boFactory = new business_object_factory_1.BusinessObjectFactory();
|
|
24
23
|
this._companies = [];
|
|
@@ -68,7 +67,7 @@ class LoginService {
|
|
|
68
67
|
async loginAndCreateDataSession(request, encrypt) {
|
|
69
68
|
if (!request && this.backendConnection.sessionId) {
|
|
70
69
|
this.backendConnection.createNewSession();
|
|
71
|
-
return this.backendConnection.
|
|
70
|
+
return this.backendConnection.storageService.localLoginResponse;
|
|
72
71
|
}
|
|
73
72
|
if (request) {
|
|
74
73
|
this.backendConnection.setSchemaUserNameAndVersion(request.upId.toString(), request.userName);
|
|
@@ -82,16 +81,14 @@ class LoginService {
|
|
|
82
81
|
return response;
|
|
83
82
|
}
|
|
84
83
|
clearStorage() {
|
|
85
|
-
this.backendConnection.
|
|
86
|
-
this.backendConnection.sessionStorageService.clear();
|
|
84
|
+
this.backendConnection.storageService.clear();
|
|
87
85
|
}
|
|
88
86
|
clearAllStorage() {
|
|
89
|
-
this.backendConnection.
|
|
90
|
-
this.backendConnection.sessionStorageService.clearAll();
|
|
87
|
+
this.backendConnection.storageService.clearAll();
|
|
91
88
|
}
|
|
92
89
|
logout() {
|
|
93
90
|
let shouldLogout = false;
|
|
94
|
-
if (this.backendConnection.
|
|
91
|
+
if (this.backendConnection.storageService.localSessionId || this.backendConnection.jwtService.jwt) {
|
|
95
92
|
shouldLogout = true;
|
|
96
93
|
}
|
|
97
94
|
this.clearStorage();
|
|
@@ -127,7 +124,7 @@ class LoginService {
|
|
|
127
124
|
});
|
|
128
125
|
}
|
|
129
126
|
async loginByKeycloakCode(code, state, uri) {
|
|
130
|
-
this.backendConnection.
|
|
127
|
+
this.backendConnection.storageService.setLocalKeycloakState(state);
|
|
131
128
|
return new Promise((resolve, reject) => {
|
|
132
129
|
const loginRequest = new login_request_1.LoginRequest();
|
|
133
130
|
const backendLanguageCode = this._clientLanguageToBackendLanguage.get(this.backendConnection.options.languageCode);
|
|
@@ -147,7 +144,7 @@ class LoginService {
|
|
|
147
144
|
async loginToExternalSource(externalSourceId, url, schema, version) {
|
|
148
145
|
if (this.backendConnection.sessionId) {
|
|
149
146
|
this.backendConnection.createNewSession();
|
|
150
|
-
return this.backendConnection.
|
|
147
|
+
return this.backendConnection.storageService.localLoginResponse;
|
|
151
148
|
}
|
|
152
149
|
this.loginRequest.userName = undefined;
|
|
153
150
|
this.loginRequest.userPassword = undefined;
|
|
@@ -231,7 +228,7 @@ class LoginService {
|
|
|
231
228
|
async _handleAndReturnLoginResponse(response, createDataSession = false, keycloak = false) {
|
|
232
229
|
const loginResponse = this._boFactory.makeWithRawBackendData(login_response_1.LoginResponse, response);
|
|
233
230
|
if (loginResponse && loginResponse.loginStatus === login_status_enum_1.LoginStatus.SUCCESS) {
|
|
234
|
-
this.backendConnection.
|
|
231
|
+
this.backendConnection.storageService.setLocalLoginResponse(loginResponse);
|
|
235
232
|
this.backendConnection.options.username = loginResponse.userName;
|
|
236
233
|
this._setJwtLoginDataByLoginResponse(loginResponse, keycloak);
|
|
237
234
|
if (createDataSession) {
|
|
@@ -250,8 +247,8 @@ class LoginService {
|
|
|
250
247
|
}
|
|
251
248
|
}
|
|
252
249
|
else {
|
|
253
|
-
this.backendConnection.
|
|
254
|
-
this.backendConnection.
|
|
250
|
+
this.backendConnection.storageService.setLocalDataSessionId(undefined);
|
|
251
|
+
this.backendConnection.storageService.setLocalSessionId(undefined);
|
|
255
252
|
this.logout();
|
|
256
253
|
throw new Error('Openening data session failed for session \''
|
|
257
254
|
+ '\'. Logging out user.');
|
|
@@ -269,7 +266,7 @@ class LoginService {
|
|
|
269
266
|
refreshToken: loginResponse.refreshToken,
|
|
270
267
|
keycloak: keycloak
|
|
271
268
|
};
|
|
272
|
-
this.backendConnection.
|
|
269
|
+
this.backendConnection.storageService.setSessionLoginData(loginData);
|
|
273
270
|
this.backendConnection.jwtService.setExpirationTime(loginResponse.accessToken);
|
|
274
271
|
}
|
|
275
272
|
_startHeartBeat() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../src/service/login.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../src/service/login.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { SessionStorageService } from './session-storage.service';
|
|
2
|
+
import { LocalStorageService } from './local-storage.service';
|
|
3
|
+
import { LoginStorageData } from '../interface/login-storage-data.interface';
|
|
4
|
+
import { LoginResponse } from '../model/login-response';
|
|
5
|
+
import { LocalStorageUserObject } from '../model/local-storage-user-object';
|
|
6
|
+
export declare class StorageService {
|
|
7
|
+
sessionStorageService: SessionStorageService;
|
|
8
|
+
localStorageService: LocalStorageService;
|
|
9
|
+
set schema(value: string);
|
|
10
|
+
get schema(): string;
|
|
11
|
+
set username(value: string);
|
|
12
|
+
get username(): string;
|
|
13
|
+
private _schema;
|
|
14
|
+
private _username;
|
|
15
|
+
constructor(url: string, schema: string, username: string);
|
|
16
|
+
initStorageObjects(): void;
|
|
17
|
+
clear(): void;
|
|
18
|
+
clearAll(): void;
|
|
19
|
+
get sessionPublicToken(): string;
|
|
20
|
+
getSessionLoginData(): LoginStorageData;
|
|
21
|
+
getSessionKeycloakLoginData(): LoginStorageData;
|
|
22
|
+
setSessionLoginData(data: LoginStorageData): void;
|
|
23
|
+
setSessionPublicToken(token: string): void;
|
|
24
|
+
setSessionBusy(busy: boolean): void;
|
|
25
|
+
getSessionBusy(): boolean;
|
|
26
|
+
get localLoginResponse(): LoginResponse;
|
|
27
|
+
get localSessionId(): string;
|
|
28
|
+
get localDataSessionId(): string;
|
|
29
|
+
get localKeycloakState(): string;
|
|
30
|
+
getLocalUserObject(userName: string): LocalStorageUserObject;
|
|
31
|
+
setLocalLoginResponse(loginResponse: LoginResponse): void;
|
|
32
|
+
setLocalSessionId(id: string): void;
|
|
33
|
+
setLocalDataSessionId(id: string): void;
|
|
34
|
+
setLocalKeycloakState(keycloakState: string): void;
|
|
35
|
+
}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.StorageService = void 0;
|
|
4
|
+
const session_storage_service_1 = require("./session-storage.service");
|
|
5
|
+
const local_storage_service_1 = require("./local-storage.service");
|
|
6
|
+
class StorageService {
|
|
7
|
+
set schema(value) {
|
|
8
|
+
this._schema = value;
|
|
9
|
+
this.sessionStorageService.schema = this._schema;
|
|
10
|
+
this.localStorageService.schema = this._schema;
|
|
11
|
+
}
|
|
12
|
+
get schema() {
|
|
13
|
+
return this._schema;
|
|
14
|
+
}
|
|
15
|
+
set username(value) {
|
|
16
|
+
this._username = value;
|
|
17
|
+
this.sessionStorageService.username = this._username;
|
|
18
|
+
this.localStorageService.username = this._username;
|
|
19
|
+
}
|
|
20
|
+
get username() {
|
|
21
|
+
return this._username;
|
|
22
|
+
}
|
|
23
|
+
constructor(url, schema, username) {
|
|
24
|
+
this.sessionStorageService = new session_storage_service_1.SessionStorageService(url, schema, username);
|
|
25
|
+
this.localStorageService = new local_storage_service_1.LocalStorageService(url, schema, username);
|
|
26
|
+
}
|
|
27
|
+
initStorageObjects() {
|
|
28
|
+
this.localStorageService.initLocalStorageObj();
|
|
29
|
+
this.sessionStorageService.initSessionStorageObj();
|
|
30
|
+
}
|
|
31
|
+
clear() {
|
|
32
|
+
this.localStorageService.clear();
|
|
33
|
+
this.sessionStorageService.clear();
|
|
34
|
+
}
|
|
35
|
+
clearAll() {
|
|
36
|
+
this.localStorageService.clearAll();
|
|
37
|
+
this.sessionStorageService.clearAll();
|
|
38
|
+
}
|
|
39
|
+
get sessionPublicToken() {
|
|
40
|
+
return this.sessionStorageService.publicToken;
|
|
41
|
+
}
|
|
42
|
+
getSessionLoginData() {
|
|
43
|
+
return this.sessionStorageService.getLoginData();
|
|
44
|
+
}
|
|
45
|
+
getSessionKeycloakLoginData() {
|
|
46
|
+
return this.sessionStorageService.getKeycloakLoginData();
|
|
47
|
+
}
|
|
48
|
+
setSessionLoginData(data) {
|
|
49
|
+
return this.sessionStorageService.setLoginData(data);
|
|
50
|
+
}
|
|
51
|
+
setSessionPublicToken(token) {
|
|
52
|
+
return this.sessionStorageService.setPublicToken(token);
|
|
53
|
+
}
|
|
54
|
+
setSessionBusy(busy) {
|
|
55
|
+
return this.sessionStorageService.setBusy(busy);
|
|
56
|
+
}
|
|
57
|
+
getSessionBusy() {
|
|
58
|
+
return this.sessionStorageService.getBusy();
|
|
59
|
+
}
|
|
60
|
+
get localLoginResponse() {
|
|
61
|
+
return this.localStorageService.loginResponse;
|
|
62
|
+
}
|
|
63
|
+
get localSessionId() {
|
|
64
|
+
return this.localStorageService.sessionId;
|
|
65
|
+
}
|
|
66
|
+
get localDataSessionId() {
|
|
67
|
+
return this.localStorageService.dataSessionId;
|
|
68
|
+
}
|
|
69
|
+
get localKeycloakState() {
|
|
70
|
+
return this.localStorageService.keycloakState;
|
|
71
|
+
}
|
|
72
|
+
getLocalUserObject(userName) {
|
|
73
|
+
return this.localStorageService.getUserObject(userName);
|
|
74
|
+
}
|
|
75
|
+
setLocalLoginResponse(loginResponse) {
|
|
76
|
+
return this.localStorageService.setLoginResponse(loginResponse);
|
|
77
|
+
}
|
|
78
|
+
setLocalSessionId(id) {
|
|
79
|
+
return this.localStorageService.setSessionId(id);
|
|
80
|
+
}
|
|
81
|
+
setLocalDataSessionId(id) {
|
|
82
|
+
return this.localStorageService.setDataSessionId(id);
|
|
83
|
+
}
|
|
84
|
+
setLocalKeycloakState(keycloakState) {
|
|
85
|
+
return this.localStorageService.setKeycloakState(keycloakState);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
exports.StorageService = StorageService;
|
|
89
|
+
//# sourceMappingURL=storage.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../src/service/storage.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@colijnit/ioneconnector",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "260.1.0",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"build": "grunt clean && tsc",
|
|
6
6
|
"uglify": "grunt uglify",
|
|
7
7
|
"unit": "jest unit",
|
|
8
8
|
"integration": "jest int"
|
|
9
9
|
},
|
|
10
|
-
"description": "public base api for ione backend with version 2.5.
|
|
10
|
+
"description": "public base api for ione backend with version 2.5.9.",
|
|
11
11
|
"repository": "npm/npm",
|
|
12
12
|
"author": "Colijn IT",
|
|
13
13
|
"license": "ISC",
|