@colijnit/ioneconnector 257.1.0 → 257.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.
@@ -15,6 +15,7 @@ export declare class Connector {
15
15
  connect(): Promise<LoginResponse>;
16
16
  hasSession(): boolean;
17
17
  isPublicSession(): boolean;
18
+ checkAndPrepareKeycloak(): Promise<LoginResponse>;
18
19
  logIn(request: LoginRequest, encrypt?: boolean): Promise<LoginResponse>;
19
20
  confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<ServerResponseData>;
20
21
  resetGoogleAuth(upId: number, userName: string): Promise<ServerResponseData>;
@@ -30,6 +30,9 @@ class Connector {
30
30
  isPublicSession() {
31
31
  return this.connection.isPublicSession();
32
32
  }
33
+ checkAndPrepareKeycloak() {
34
+ return this.connection.checkAndPrepareKeycloak();
35
+ }
33
36
  async logIn(request, encrypt = true) {
34
37
  return this.connection.login(request, encrypt);
35
38
  }
@@ -1 +1 @@
1
- {"version":3,"file":"connector.js","sourceRoot":"","sources":["../src/connector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connector.js","sourceRoot":"","sources":["../src/connector.ts"],"names":[],"mappings":"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"}
@@ -7,4 +7,5 @@ export interface LoginStorageData {
7
7
  accessToken?: string;
8
8
  refreshToken?: string;
9
9
  tokenExp?: number;
10
+ keycloak?: boolean;
10
11
  }
@@ -18,6 +18,7 @@ export declare class Options {
18
18
  useLoginEncryption?: boolean;
19
19
  languageCode?: LanguageCode;
20
20
  timeoutInMs?: number;
21
+ keycloakClientId?: string;
21
22
  jwtEnabled?: boolean;
22
23
  jwtRefreshToken?: boolean;
23
24
  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;QAMrC,eAAU,GAAa,KAAK,CAAC;QAC7B,oBAAe,GAAa,IAAI,CAAC;QACjC,sBAAiB,GAAa,IAAI,CAAC;IAG9C,CAAC;CAAA;AA5BD,0BA4BC"}
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;QAOrC,eAAU,GAAa,KAAK,CAAC;QAC7B,oBAAe,GAAa,IAAI,CAAC;QACjC,sBAAiB,GAAa,IAAI,CAAC;IAG9C,CAAC;CAAA;AA7BD,0BA6BC"}
@@ -9,6 +9,7 @@ export declare class AjaxService extends BaseBackendConnectionService {
9
9
  private _showLoaderRequests;
10
10
  private _timeout;
11
11
  constructor(options: Options);
12
+ checkAndPrepareKeycloak(): Promise<LoginResponse>;
12
13
  connect(): Promise<LoginResponse>;
13
14
  hasSession(): boolean;
14
15
  isPublicSession(): boolean;
@@ -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 connect() {
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,44 @@ 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
- if (this.usePublicToken) {
40
- if (this.localStorageService.publicToken) {
41
- return null;
42
- }
43
- await this.createPublicSession();
37
+ }
38
+ }
39
+ async connect() {
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
- else {
47
- if (this.localStorageService.sessionId) {
48
- return this.localStorageService.loginResponse;
49
- }
50
- let response = await this.loginService.loginAndCreateDataSession();
55
+ await this.createPublicSession();
56
+ return null;
57
+ }
58
+ else {
59
+ if (this.localStorageService.sessionId) {
60
+ return this.localStorageService.loginResponse;
61
+ }
62
+ let response = await this.checkAndPrepareKeycloak();
63
+ if (response) {
51
64
  return response;
52
65
  }
66
+ response = await this.loginService.loginAndCreateDataSession();
67
+ return response;
53
68
  }
54
69
  }
55
70
  hasSession() {
@@ -92,7 +107,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
92
107
  id: this.callId,
93
108
  data: data,
94
109
  dataSessionId: this.session ? this.session.dataSessionId : "",
95
- windowSessionId: this.session ? this.session.windowsId : "1",
110
+ windowSessionId: this.session ? this.session.windowsId : 1,
96
111
  sessionId: this.session ? this.session.id : ""
97
112
  });
98
113
  navigator.sendBeacon(url_utils_1.UrlUtils.createReadableUrl(method, data, this.url, endPoint), messageToSend);
@@ -171,7 +186,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
171
186
  id: this.callId,
172
187
  data: data,
173
188
  dataSessionId: this.session ? this.session.dataSessionId : "",
174
- windowSessionId: this.session ? this.session.windowsId : "1",
189
+ windowSessionId: this.session ? this.session.windowsId : 1,
175
190
  sessionId: this.session ? this.session.id : ""
176
191
  });
177
192
  }
@@ -213,7 +228,9 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
213
228
  if (showLoader) {
214
229
  this.setShowLoaderRequests(this._showLoaderRequests - 1);
215
230
  }
216
- return new Promise((resolve) => { return resolve(response); });
231
+ return new Promise((resolve) => {
232
+ return resolve(response);
233
+ });
217
234
  });
218
235
  }
219
236
  _methodNeedsAccessToken(method) {
@@ -247,7 +264,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
247
264
  }
248
265
  }
249
266
  _redirectToIdentityServerRealm() {
250
- if (this.loginService.company && this.loginService.company.realmId && this.loginService.company.clientId) {
267
+ if (this.loginService.company && this.loginService.company.realmId && (this.loginService.company.clientId || this.options.keycloakClientId)) {
251
268
  let state = this.localStorageService.keycloakState;
252
269
  if (!state) {
253
270
  state = this._createGuid();
@@ -256,7 +273,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
256
273
  const redirectUrl = window.location.href;
257
274
  const query = {
258
275
  state: state,
259
- client_id: this.loginService.company.clientId,
276
+ client_id: this.options.keycloakClientId ? this.options.keycloakClientId : this.loginService.company.clientId,
260
277
  response_type: "code",
261
278
  response_mode: "fragment",
262
279
  redirect_uri: redirectUrl
@@ -264,6 +281,8 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
264
281
  const queryUrl = new URLSearchParams(query).toString();
265
282
  const fullUrl = this.loginService.keycloakParams.keycloakUrl + "/realms/" + this.loginService.company.realmId + "/protocol/openid-connect/auth" + "?" + queryUrl;
266
283
  window.location.href = fullUrl;
284
+ setTimeout(() => {
285
+ }, 500);
267
286
  }
268
287
  else {
269
288
  console.error("Identity server information is not defined for the selected company");
@@ -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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"}
@@ -36,6 +36,7 @@ export declare abstract class BaseBackendConnectionService {
36
36
  abstract call(method: string, data: any, showLoader: boolean, service: BackendServiceName, endPoint?: string, isPublicService?: boolean, ownMessage?: {}): Promise<any>;
37
37
  commit(): Promise<boolean>;
38
38
  closeDataSession(): Promise<ServerResponseData>;
39
+ storeSessions(): void;
39
40
  setSchemaUserNameAndVersion(schema: string, userName: string, version: string): void;
40
41
  createNewSession(forKeycloak?: boolean): void;
41
42
  createPublicSession(): Promise<TokenResponse>;
@@ -70,13 +70,37 @@ class BaseBackendConnectionService {
70
70
  this.jwtService = new external_jwt_token_service_1.ExternalJwtTokenService(this.sessionStorageService, this.loginService, options.getAccessTokenFunction);
71
71
  if (!this.localStorageService.loginResponse) {
72
72
  this._userInfoService.getActiveUserInfo()
73
- .then(response => this.localStorageService.setLoginResponse(response));
73
+ .then((response) => {
74
+ if (response && response.upId) {
75
+ this.localStorageService.setLoginResponse(response);
76
+ }
77
+ });
74
78
  }
75
79
  }
76
80
  else {
77
81
  this.jwtService = new internal_jwt_token_service_1.InternalJwtTokenService(this.sessionStorageService, this.loginService);
82
+ if (this.jwtService.jwt && !this.localStorageService.loginResponse) {
83
+ this._userInfoService.getActiveUserInfo()
84
+ .then((response) => {
85
+ if (response && response.upId) {
86
+ this.localStorageService.setLoginResponse(response);
87
+ }
88
+ });
89
+ }
90
+ }
91
+ let forKeycloak = false;
92
+ const keycloakLoginData = this.sessionStorageService.getKeycloakLoginData();
93
+ if (keycloakLoginData) {
94
+ const userNameFromKeycloak = keycloakLoginData.userName;
95
+ const userObject = this.localStorageService.getUserObject(userNameFromKeycloak);
96
+ if (userObject && userObject.loginResponse) {
97
+ this.dataSessionId = userObject.dataSessionId;
98
+ this.sessionId = userObject.sessionId;
99
+ this.usePublicToken = false;
100
+ forKeycloak = true;
101
+ }
78
102
  }
79
- this._checkSession();
103
+ this._checkSession(forKeycloak);
80
104
  }
81
105
  async commit() {
82
106
  return this._datasessionService.commit();
@@ -84,6 +108,10 @@ class BaseBackendConnectionService {
84
108
  closeDataSession() {
85
109
  return this.loginService.logout();
86
110
  }
111
+ storeSessions() {
112
+ this.localStorageService.setDataSessionId(this.session.dataSessionId);
113
+ this.localStorageService.setSessionId(this.session.id);
114
+ }
87
115
  setSchemaUserNameAndVersion(schema, userName, version) {
88
116
  this.schema = schema;
89
117
  this.version = parseInt(this.options.version);
@@ -147,13 +175,13 @@ class BaseBackendConnectionService {
147
175
  }
148
176
  return s4() + s4() + s4();
149
177
  }
150
- _checkSession() {
178
+ _checkSession(forKeycloak = false) {
151
179
  if (this.usePublicToken && this.localStorageService.publicToken) {
152
180
  this.createNewSession();
153
181
  }
154
182
  else {
155
183
  if (this.sessionId && this.dataSessionId) {
156
- this.createNewSession();
184
+ this.createNewSession(forKeycloak);
157
185
  }
158
186
  else if (this.localStorageService.sessionId && this.localStorageService.dataSessionId) {
159
187
  this.sessionId = this.localStorageService.sessionId;
@@ -1 +1 @@
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
+ {"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,6 +16,7 @@ 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;
19
21
  setLoginResponse(loginResponse: LoginResponse): void;
20
22
  setSessionId(id: string): void;
@@ -23,5 +25,7 @@ export declare class LocalStorageService {
23
25
  setKeycloakState(keycloakState: string): void;
24
26
  save(): void;
25
27
  initLocalStorageObj(): void;
28
+ private _createSchemaAndUserObject;
29
+ private _createUserIfNotExistsOnSchema;
26
30
  private _getUserObject;
27
31
  }
@@ -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
- schemaObj.users.splice(idx, 1);
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
- this.storageObj.schemas.splice(idx, 1);
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) {
@@ -67,7 +80,23 @@ class LocalStorageService {
67
80
  this.save();
68
81
  }
69
82
  setLoginResponse(loginResponse) {
70
- const userObj = this._getUserObject();
83
+ if (!loginResponse || (!loginResponse.upId && !loginResponse.userName)) {
84
+ return;
85
+ }
86
+ this.schema = loginResponse.upId.toString();
87
+ this.username = loginResponse.userName;
88
+ let userObj = this._getUserObject();
89
+ if (!userObj) {
90
+ if (!this.storageObj.schemas || (this.storageObj.schemas.find(s => s.schema === this.schema) === undefined)) {
91
+ this._createSchemaAndUserObject(this.schema, this.username);
92
+ }
93
+ else {
94
+ if (this.username) {
95
+ this._createUserIfNotExistsOnSchema(this.schema, this.username);
96
+ }
97
+ }
98
+ userObj = this._getUserObject();
99
+ }
71
100
  if (userObj) {
72
101
  userObj.loginResponse = loginResponse;
73
102
  this.save();
@@ -103,44 +132,53 @@ class LocalStorageService {
103
132
  this.storage.setItem(this.iOneRoot, CircularJSON.stringify(this.iOneStorageObj));
104
133
  }
105
134
  initLocalStorageObj() {
106
- if (!this.schema || !this.username) {
107
- return;
108
- }
109
135
  const existingObj = CircularJSON.parse(this.storage.getItem(this.appRoot));
110
136
  this.storageObj = existingObj || this.storageObj;
111
137
  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
- const schemaObj = new local_storage_schema_object_1.LocalStorageSchemaObject();
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);
138
+ if (this.schema && !this.storageObj.schemas || (this.storageObj.schemas.find(s => s.schema === this.schema) === undefined)) {
139
+ this._createSchemaAndUserObject(this.schema, this.username);
124
140
  }
125
141
  else {
126
142
  if (this.username) {
127
- const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
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
- }
143
+ this._createUserIfNotExistsOnSchema(this.schema, this.username);
136
144
  }
137
145
  }
138
146
  this.save();
139
147
  }
140
- _getUserObject() {
148
+ _createSchemaAndUserObject(schema, userName) {
149
+ const schemaObj = new local_storage_schema_object_1.LocalStorageSchemaObject();
150
+ schemaObj.schema = schema;
151
+ if (userName) {
152
+ const userObj = new local_storage_user_object_1.LocalStorageUserObject();
153
+ userObj.username = userName;
154
+ schemaObj.users.push(userObj);
155
+ }
156
+ if (!this.storageObj.schemas) {
157
+ this.storageObj.schemas = [];
158
+ }
159
+ this.storageObj.schemas.push(schemaObj);
160
+ }
161
+ _createUserIfNotExistsOnSchema(schema, userName) {
162
+ const schemaObj = this.storageObj.schemas.find(s => s.schema === schema);
163
+ if (!schemaObj.users || (schemaObj.users.find(u => u.username === userName) === undefined)) {
164
+ const userObj = new local_storage_user_object_1.LocalStorageUserObject();
165
+ userObj.username = userName;
166
+ if (!schemaObj.users) {
167
+ schemaObj.users = [];
168
+ }
169
+ schemaObj.users.push(userObj);
170
+ }
171
+ }
172
+ _getUserObject(userName) {
173
+ if (!this.storageObj || !this.storageObj.schemas) {
174
+ return;
175
+ }
176
+ if (userName === undefined) {
177
+ userName = this.username;
178
+ }
141
179
  const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
142
- if (this.username) {
143
- return schemaObj.users.find(u => u.username === this.username);
180
+ if (schemaObj && schemaObj.users && userName) {
181
+ return schemaObj.users.find(u => u.username === userName);
144
182
  }
145
183
  }
146
184
  }
@@ -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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"}
@@ -19,7 +19,7 @@ export declare class LoginService {
19
19
  private _publicService;
20
20
  private _datasessionService;
21
21
  private _boFactory;
22
- private _componies;
22
+ private _companies;
23
23
  private readonly _clientLanguageToBackendLanguage;
24
24
  constructor(backendConnection: BaseBackendConnectionService);
25
25
  getPublicKey(): Promise<string>;
@@ -36,6 +36,7 @@ export declare class LoginService {
36
36
  changePasswordAndActivateUser(password: string, securityCode: string, upId: number, reCaptchaResponse?: string): Promise<ServerResponseData>;
37
37
  sendResetPasswordOrInviteMessage(upId: number, userName: string, reCaptchaResponse: string): Promise<ServerResponseData>;
38
38
  getUserNameBySecurityCode(securityCode: string, upId: number): Promise<ServerResponseData>;
39
+ private _setJwtLoginDataByLoginResponse;
39
40
  private _startHeartBeat;
40
41
  private _stopHeartBeat;
41
42
  private _checkEncryption;
@@ -21,7 +21,7 @@ class LoginService {
21
21
  this.windowsSessionId = 1;
22
22
  this._useEncryption = false;
23
23
  this._boFactory = new business_object_factory_1.BusinessObjectFactory();
24
- this._componies = [];
24
+ this._companies = [];
25
25
  this._clientLanguageToBackendLanguage = new Map([
26
26
  [language_code_enum_1.LanguageCode.Dutch, backend_language_code_enum_1.BackendLanguageCode.Dutch],
27
27
  [language_code_enum_1.LanguageCode.English, backend_language_code_enum_1.BackendLanguageCode.English],
@@ -61,8 +61,8 @@ class LoginService {
61
61
  return undefined;
62
62
  });
63
63
  if (response) {
64
- this._componies = this._boFactory.makeBOArrayFromRawBackendDataArray(company_bo_1.Company, response);
65
- this.company = this._componies.find(c => c.upId === +this.backendConnection.schema);
64
+ this._companies = this._boFactory.makeBOArrayFromRawBackendDataArray(company_bo_1.Company, response);
65
+ this.company = this._companies.find(c => c.upId === +this.backendConnection.schema);
66
66
  }
67
67
  }
68
68
  async loginAndCreateDataSession(request, encrypt) {
@@ -107,7 +107,7 @@ class LoginService {
107
107
  }
108
108
  logout() {
109
109
  let shouldLogout = false;
110
- if (this.backendConnection.localStorageService.sessionId) {
110
+ if (this.backendConnection.localStorageService.sessionId || this.backendConnection.jwtService.jwt) {
111
111
  shouldLogout = true;
112
112
  }
113
113
  this.backendConnection.localStorageService.clear();
@@ -140,12 +140,7 @@ class LoginService {
140
140
  .then((result) => {
141
141
  const loginResponse = this._boFactory.makeWithRawBackendData(login_response_1.LoginResponse, result);
142
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);
143
+ this._setJwtLoginDataByLoginResponse(loginResponse);
149
144
  }
150
145
  resolve(loginResponse);
151
146
  })
@@ -170,8 +165,10 @@ class LoginService {
170
165
  const loginResponse = this._boFactory.makeWithRawBackendData(login_response_1.LoginResponse, result);
171
166
  if (loginResponse && loginResponse.loginStatus === login_status_enum_1.LoginStatus.SUCCESS) {
172
167
  this.backendConnection.localStorageService.setLoginResponse(loginResponse);
168
+ this._setJwtLoginDataByLoginResponse(loginResponse, true);
173
169
  const datasessionCreated = await this._datasessionService.createDataSession(this.backendConnection.session.dataSessionId);
174
170
  if (datasessionCreated === true) {
171
+ this.backendConnection.storeSessions();
175
172
  try {
176
173
  if (this.backendConnection.version < 252) {
177
174
  this._startHeartBeat();
@@ -183,15 +180,6 @@ class LoginService {
183
180
  catch (e) {
184
181
  }
185
182
  }
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
183
  }
196
184
  resolve(loginResponse);
197
185
  })
@@ -264,6 +252,18 @@ class LoginService {
264
252
  };
265
253
  return this._call(login_service_method_enum_1.LoginServiceMethod.GetUserNameBySecurityCode, inputParams, true);
266
254
  }
255
+ _setJwtLoginDataByLoginResponse(loginResponse, keycloak = false) {
256
+ const loginData = {
257
+ upId: loginResponse.upId,
258
+ userName: loginResponse.userName,
259
+ dateFormat: loginResponse.userParametersValues.formatDate,
260
+ accessToken: loginResponse.accessToken,
261
+ refreshToken: loginResponse.refreshToken,
262
+ keycloak: keycloak
263
+ };
264
+ this.backendConnection.sessionStorageService.setLoginData(loginData);
265
+ this.backendConnection.jwtService.setExpirationTime(loginResponse.accessToken);
266
+ }
267
267
  _startHeartBeat() {
268
268
  if (!this.heartbeatTimer) {
269
269
  this.heartbeatTimer = setInterval(() => {
@@ -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,CAAC,CAAC;QACnE,IAAI,QAAQ,IAAI,QAAQ,CAAC,WAAW,KAAK,+BAAW,CAAC,OAAO,EAAE;YAC5D,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACtE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAC1H,IAAI,kBAAkB,KAAK,IAAI,EAAE;gBAC/B,IAAI;oBACF,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,GAAG,GAAG,EAAE;wBACxC,IAAI,CAAC,eAAe,EAAE,CAAC;qBACxB;yBAAM;wBACL,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;qBACtC;iBACF;gBAAC,OAAO,CAAC,EAAE;iBAEX;aACF;iBAAM;gBACL,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;gBACvE,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBACnE,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,8CAA8C;sBAC1D,uBAAuB,CAAC,CAAC;aAC9B;SACF;aAAM;YACL,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACvE,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;SACpE;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,MAAM;QACX,IAAI,YAAY,GAAY,KAAK,CAAC;QAClC,IAAI,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,SAAS,IAAI,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,EAAE;YACjG,YAAY,GAAG,IAAI,CAAC;SACrB;QACD,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;QACnD,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QACrD,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;QACpD,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;gBAC/B,MAAM,aAAa,GAAiC,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,8BAAa,EAAE,MAAM,CAAC,CAAC;gBAClH,IAAI,aAAa,IAAI,aAAa,CAAC,WAAW,KAAK,+BAAW,CAAC,OAAO,EAAE;oBACtE,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC,CAAC;iBACrD;gBACD,OAAO,CAAC,aAAa,CAAC,CAAC;YACzB,CAAC,CAAC;iBACD,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;gBACrC,MAAM,aAAa,GAAiC,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,8BAAa,EAAE,MAAM,CAAC,CAAC;gBAClH,IAAI,aAAa,IAAI,aAAa,CAAC,WAAW,KAAK,+BAAW,CAAC,OAAO,EAAE;oBACtE,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;oBAC3E,IAAI,CAAC,+BAA+B,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;oBAC1D,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;oBAC1H,IAAI,kBAAkB,KAAK,IAAI,EAAE;wBAC/B,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC;wBACvC,IAAI;4BACF,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,GAAG,GAAG,EAAE;gCACxC,IAAI,CAAC,eAAe,EAAE,CAAC;6BACxB;iCAAM;gCACL,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;6BACtC;yBACF;wBAAC,OAAO,CAAC,EAAE;yBAEX;qBACF;iBACF;gBACD,OAAO,CAAC,aAAa,CAAC,CAAC;YACzB,CAAC,CAAC;iBACD,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,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,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IACxE,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,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,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;QACtE,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,CAAC,CAAC;IAChG,CAAC;;AAvUH,oCAwUC;AAvUgB,kCAAqB,GAAW,KAAK,CAAC"}
@@ -9,10 +9,14 @@ export declare class SessionStorageService {
9
9
  constructor(url: string, schema: string, username: string);
10
10
  clear(): void;
11
11
  getLoginData(): LoginStorageData;
12
+ getKeycloakLoginData(): LoginStorageData;
12
13
  setLoginData(data: LoginStorageData): void;
13
14
  setBusy(busy: boolean): void;
14
15
  getBusy(): boolean;
15
16
  save(): void;
16
17
  initSessionStorageObj(): void;
18
+ private _createSchemaAndUserObject;
19
+ private _createUserIfNotExistsOnSchema;
17
20
  private _getUserObject;
21
+ private _getKeycloakUserObject;
18
22
  }
@@ -25,20 +25,21 @@ class SessionStorageService {
25
25
  const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
26
26
  if (schemaObj) {
27
27
  const idx = schemaObj.users.findIndex(u => u.username === this.username);
28
- schemaObj.users.splice(idx, 1);
28
+ if (idx > -1) {
29
+ schemaObj.users.splice(idx, 1);
30
+ }
29
31
  }
30
32
  }
31
33
  else {
32
34
  const idx = this.storageObj.schemas.findIndex(s => s.schema === this.schema);
33
- this.storageObj.schemas.splice(idx, 1);
35
+ if (idx > -1) {
36
+ this.storageObj.schemas.splice(idx, 1);
37
+ }
34
38
  }
35
39
  const idx = this.storageObj.schemas.findIndex(s => s.schema === this.schema);
36
- if (this.storageObj.schemas[idx].users.length === 0) {
40
+ if (idx > -1 && this.storageObj.schemas[idx].users.length === 0) {
37
41
  this.storageObj.schemas.splice(idx, 1);
38
42
  }
39
- if (this.storageObj.schemas.length === 0) {
40
- this.storage.clear();
41
- }
42
43
  this.save();
43
44
  }
44
45
  getLoginData() {
@@ -47,10 +48,32 @@ class SessionStorageService {
47
48
  return userObj.loginData;
48
49
  }
49
50
  }
51
+ getKeycloakLoginData() {
52
+ const userObj = this._getKeycloakUserObject();
53
+ if (userObj) {
54
+ return userObj.loginData;
55
+ }
56
+ }
50
57
  setLoginData(data) {
58
+ if (!data || (!data.upId && !data.userName)) {
59
+ return;
60
+ }
61
+ this.schema = data.upId.toString();
62
+ this.username = data.userName;
51
63
  const currentLoginData = this.getLoginData();
52
64
  const newLoginData = Object.assign(currentLoginData ? currentLoginData : {}, data);
53
- const userObj = this._getUserObject();
65
+ let userObj = this._getUserObject();
66
+ if (!userObj) {
67
+ if (!this.storageObj.schemas || (this.storageObj.schemas.find(s => s.schema === this.schema) === undefined)) {
68
+ this._createSchemaAndUserObject(this.schema, this.username);
69
+ }
70
+ else {
71
+ if (this.username) {
72
+ this._createUserIfNotExistsOnSchema(this.schema, this.username);
73
+ }
74
+ }
75
+ userObj = this._getUserObject();
76
+ }
54
77
  if (userObj) {
55
78
  userObj.loginData = newLoginData;
56
79
  this.save();
@@ -73,46 +96,59 @@ class SessionStorageService {
73
96
  this.storage.setItem(this.appRoot, CircularJSON.stringify(this.storageObj));
74
97
  }
75
98
  initSessionStorageObj() {
76
- if (!this.schema || !this.username) {
77
- return;
78
- }
79
99
  const existingObj = CircularJSON.parse(this.storage.getItem(this.appRoot));
80
100
  this.storageObj = existingObj || this.storageObj;
81
- if (!this.storageObj.schemas || (this.storageObj.schemas.find(s => s.schema === this.schema) === undefined)) {
82
- const schemaObj = new session_storage_schema_object_1.SessionStorageSchemaObject();
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);
101
+ if (this.schema && !this.storageObj.schemas || (this.storageObj.schemas.find(s => s.schema === this.schema) === undefined)) {
102
+ this._createSchemaAndUserObject(this.schema, this.username);
93
103
  }
94
104
  else {
95
105
  if (this.username) {
96
- const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
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
- }
106
+ this._createUserIfNotExistsOnSchema(this.schema, this.username);
105
107
  }
106
108
  }
107
109
  this.save();
108
110
  }
111
+ _createSchemaAndUserObject(schema, userName) {
112
+ const schemaObj = new session_storage_schema_object_1.SessionStorageSchemaObject();
113
+ schemaObj.schema = schema;
114
+ if (userName) {
115
+ const userObj = new session_storage_user_object_1.SessionStorageUserObject();
116
+ userObj.username = userName;
117
+ schemaObj.users.push(userObj);
118
+ }
119
+ if (!this.storageObj.schemas) {
120
+ this.storageObj.schemas = [];
121
+ }
122
+ this.storageObj.schemas.push(schemaObj);
123
+ }
124
+ _createUserIfNotExistsOnSchema(schema, userName) {
125
+ const schemaObj = this.storageObj.schemas.find(s => s.schema === schema);
126
+ if (!schemaObj.users || (schemaObj.users.find(u => u.username === userName) === undefined)) {
127
+ const userObj = new session_storage_user_object_1.SessionStorageUserObject();
128
+ userObj.username = userName;
129
+ if (!schemaObj.users) {
130
+ schemaObj.users = [];
131
+ }
132
+ schemaObj.users.push(userObj);
133
+ }
134
+ }
109
135
  _getUserObject() {
136
+ if (!this.storageObj || !this.storageObj.schemas) {
137
+ return;
138
+ }
110
139
  const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
111
140
  if (schemaObj && this.username) {
112
141
  return schemaObj.users.find(u => u.username === this.username);
113
142
  }
114
143
  return null;
115
144
  }
145
+ _getKeycloakUserObject() {
146
+ if (!this.storageObj || !this.storageObj.schemas) {
147
+ return;
148
+ }
149
+ const schemaObj = this.storageObj.schemas.find(s => s.schema === this.schema);
150
+ return schemaObj.users.find(u => u.loginData && u.loginData.keycloak);
151
+ }
116
152
  }
117
153
  exports.SessionStorageService = SessionStorageService;
118
154
  //# 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":"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"}
1
+ {"version":3,"file":"session-storage.service.js","sourceRoot":"","sources":["../../src/service/session-storage.service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@colijnit/ioneconnector",
3
- "version": "257.1.0",
3
+ "version": "257.1.1",
4
4
  "scripts": {
5
5
  "build": "grunt clean && tsc",
6
6
  "uglify": "grunt uglify",