@colijnit/ioneconnector 3.1.10 → 3.1.12

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.
Files changed (62) hide show
  1. package/build/connector.d.ts +0 -1
  2. package/build/connector.js +1 -4
  3. package/build/connector.js.map +1 -1
  4. package/build/connector.unit.test.js +13 -2
  5. package/build/connector.unit.test.js.map +1 -1
  6. package/build/enum/backend-language-code.enum.d.ts +6 -0
  7. package/build/enum/backend-language-code.enum.js +11 -0
  8. package/build/enum/backend-language-code.enum.js.map +1 -0
  9. package/build/enum/language-code.enum.d.ts +7 -0
  10. package/build/enum/language-code.enum.js +12 -0
  11. package/build/enum/language-code.enum.js.map +1 -0
  12. package/build/enum/public-service-method.enum.d.ts +3 -1
  13. package/build/enum/public-service-method.enum.js +2 -0
  14. package/build/enum/public-service-method.enum.js.map +1 -1
  15. package/build/interface/login-storage-data.interface.d.ts +1 -0
  16. package/build/model/company.bo.d.ts +9 -0
  17. package/build/model/company.bo.js +14 -0
  18. package/build/model/company.bo.js.map +1 -0
  19. package/build/model/ione-local-storage-root-object.d.ts +5 -0
  20. package/build/model/ione-local-storage-root-object.js +10 -0
  21. package/build/model/ione-local-storage-root-object.js.map +1 -0
  22. package/build/model/keycloak-parameters.bo.d.ts +5 -0
  23. package/build/model/keycloak-parameters.bo.js +8 -0
  24. package/build/model/keycloak-parameters.bo.js.map +1 -0
  25. package/build/model/local-storage-root-object.d.ts +2 -0
  26. package/build/model/local-storage-root-object.js +3 -0
  27. package/build/model/local-storage-root-object.js.map +1 -1
  28. package/build/model/local-storage-schema-object.d.ts +3 -2
  29. package/build/model/local-storage-schema-object.js +3 -0
  30. package/build/model/local-storage-schema-object.js.map +1 -1
  31. package/build/model/local-storage-user-object.d.ts +5 -0
  32. package/build/model/local-storage-user-object.js +7 -0
  33. package/build/model/local-storage-user-object.js.map +1 -0
  34. package/build/model/options.d.ts +3 -1
  35. package/build/model/options.js +1 -0
  36. package/build/model/options.js.map +1 -1
  37. package/build/model/server-response-data.d.ts +2 -1
  38. package/build/model/session-storage-root-object.d.ts +1 -0
  39. package/build/model/session-storage-root-object.js +1 -0
  40. package/build/model/session-storage-root-object.js.map +1 -1
  41. package/build/provider/ajax.service.d.ts +11 -8
  42. package/build/provider/ajax.service.js +126 -44
  43. package/build/provider/ajax.service.js.map +1 -1
  44. package/build/provider/base-backend-connection.service.d.ts +8 -3
  45. package/build/provider/base-backend-connection.service.js +39 -6
  46. package/build/provider/base-backend-connection.service.js.map +1 -1
  47. package/build/service/jwt-token.service.d.ts +2 -4
  48. package/build/service/jwt-token.service.js +23 -8
  49. package/build/service/jwt-token.service.js.map +1 -1
  50. package/build/service/local-storage.service.d.ts +7 -1
  51. package/build/service/local-storage.service.js +76 -14
  52. package/build/service/local-storage.service.js.map +1 -1
  53. package/build/service/login.service.d.ts +9 -1
  54. package/build/service/login.service.js +72 -17
  55. package/build/service/login.service.js.map +1 -1
  56. package/build/service/public.service.d.ts +3 -0
  57. package/build/service/public.service.js +8 -1
  58. package/build/service/public.service.js.map +1 -1
  59. package/build/service/session-storage.service.d.ts +3 -0
  60. package/build/service/session-storage.service.js +10 -0
  61. package/build/service/session-storage.service.js.map +1 -1
  62. package/package.json +1 -1
@@ -8,44 +8,79 @@ const url_utils_1 = require("../utils/url-utils");
8
8
  const datasession_service_method_enum_1 = require("../enum/datasession-service-method.enum");
9
9
  const end_point_enum_1 = require("../enum/end-point.enum");
10
10
  const login_status_enum_1 = require("../enum/login-status.enum");
11
+ const public_service_method_enum_1 = require("../enum/public-service-method.enum");
12
+ const login_service_method_enum_1 = require("../enum/login-service-method.enum");
11
13
  class AjaxService extends base_backend_connection_service_1.BaseBackendConnectionService {
12
14
  constructor(options) {
13
15
  super(options);
14
16
  this._showLoaderRequests = 0;
15
17
  this._timeout = 180000;
18
+ this._methodWithoutAccessToken = [
19
+ public_service_method_enum_1.PublicServiceMethod.GetKeycloakParams,
20
+ public_service_method_enum_1.PublicServiceMethod.Companies,
21
+ public_service_method_enum_1.PublicServiceMethod.GetPublicKey,
22
+ datasession_service_method_enum_1.DatasessionServiceMethod.CreatePublicSession,
23
+ datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession,
24
+ login_service_method_enum_1.LoginServiceMethod.RefreshAccessToken
25
+ ];
16
26
  if (options && options.timeoutInMs) {
17
27
  this._timeout = options.timeoutInMs;
18
28
  }
19
29
  }
20
30
  async connect() {
21
- if (this.usePublicToken) {
22
- if (this.localStorageService.publicToken) {
23
- return true;
24
- }
25
- return await this._createPublicSession();
31
+ await this.loginService.getKeycloakParams();
32
+ await this.loginService.getCompanies();
33
+ const keycloakCode = this._getParameter("code");
34
+ const keycloakState = this._getParameter("state");
35
+ if (keycloakCode && keycloakState) {
36
+ let url = window.location.href;
37
+ url = url.replace('#', '?');
38
+ const uri = url.split("?")[0];
39
+ window.history.replaceState(null, "", uri);
40
+ return this.loginService.loginByKeycloakCode(keycloakCode, keycloakState, uri);
26
41
  }
27
42
  else {
28
- if (this.localStorageService.sessionId) {
29
- return true;
43
+ if (this.loginService.keycloakParams.isIdentityServerEnabled) {
44
+ this._redirectToIdentityServerRealm();
30
45
  }
31
- let response = await this.loginService.loginAndCreateDataSession();
32
- if (typeof response !== 'boolean') {
33
- response = response.loginStatus === login_status_enum_1.LoginStatus.SUCCESS;
46
+ if (this.usePublicToken) {
47
+ if (this.localStorageService.publicToken) {
48
+ return true;
49
+ }
50
+ const tokenResponse = await this.createPublicSession();
51
+ return tokenResponse !== null;
52
+ }
53
+ else {
54
+ if (this.localStorageService.sessionId) {
55
+ return true;
56
+ }
57
+ let response = await this.loginService.loginAndCreateDataSession();
58
+ if (typeof response !== 'boolean') {
59
+ response = response.loginStatus === login_status_enum_1.LoginStatus.SUCCESS;
60
+ }
61
+ return response;
34
62
  }
35
- return response;
36
63
  }
37
64
  }
38
65
  hasSession() {
39
66
  return this.localStorageService.sessionId !== undefined;
40
67
  }
41
- async call(method, data = {}, showLoader = true, service = backend_service_name_enum_1.BackendServiceName.LoginService, endPoint = end_point_enum_1.EndPoint.AjaxService, ownMessage) {
68
+ async call(method, data = {}, showLoader = true, service = undefined, endPoint = end_point_enum_1.EndPoint.AjaxService, isPublicService = false, ownMessage) {
69
+ if (!service) {
70
+ if (!this.usePublicToken) {
71
+ service = backend_service_name_enum_1.BackendServiceName.LoginService;
72
+ }
73
+ else {
74
+ service = backend_service_name_enum_1.BackendServiceName.PublicService;
75
+ }
76
+ }
42
77
  if (this.usePublicToken || (service === backend_service_name_enum_1.BackendServiceName.PublicService ||
43
78
  service === backend_service_name_enum_1.BackendServiceName.LoginService ||
44
79
  service === backend_service_name_enum_1.BackendServiceName.DatasessionService)) {
45
- return this._doCall(method, data, showLoader, service, endPoint, ownMessage);
80
+ return this._doCall(method, data, showLoader, service, endPoint, isPublicService, ownMessage);
46
81
  }
47
82
  else {
48
- return this._doCall(method, data, showLoader, service, endPoint, ownMessage);
83
+ return this._doCall(method, data, showLoader, service, endPoint, isPublicService, ownMessage);
49
84
  }
50
85
  }
51
86
  async login(request, encrypt) {
@@ -54,9 +89,6 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
54
89
  return response;
55
90
  }
56
91
  }
57
- async logInByKeycloakCode(code, uri) {
58
- return this.loginService.loginByKeycloakCode(code, uri);
59
- }
60
92
  async confirmCode(upId, userName, confirmationCode, clientDeviceFingerprint, clientDeviceDescription, rememberClientDeviceForMFA) {
61
93
  return this.loginService.confirmCode(upId, userName, confirmationCode, clientDeviceFingerprint, clientDeviceDescription, rememberClientDeviceForMFA);
62
94
  }
@@ -80,26 +112,23 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
80
112
  }
81
113
  close() {
82
114
  if (this.usePublicToken) {
115
+ this.localStorageService.clear();
83
116
  this.localStorageService.setPublicToken(undefined);
84
- return this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession, {});
117
+ return this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession, {}, false, backend_service_name_enum_1.BackendServiceName.PublicService);
85
118
  }
86
119
  else {
87
120
  return this.closeDataSession();
88
121
  }
89
122
  }
90
- async _createPublicSession() {
91
- const data = {
92
- upId: this.schema
93
- };
94
- const token = await this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.CreatePublicSession, data, false, backend_service_name_enum_1.BackendServiceName.PublicService, end_point_enum_1.EndPoint.PublicService);
95
- if (token) {
96
- this.localStorageService.setPublicToken(token);
97
- this.createNewSession();
98
- return true;
123
+ _doCall(method, data = {}, showLoader = true, service = undefined, endPoint = end_point_enum_1.EndPoint.AjaxService, isPublicService = false, ownMessage) {
124
+ if (!service) {
125
+ if (!this.usePublicToken) {
126
+ service = backend_service_name_enum_1.BackendServiceName.LoginService;
127
+ }
128
+ else {
129
+ service = backend_service_name_enum_1.BackendServiceName.PublicService;
130
+ }
99
131
  }
100
- return false;
101
- }
102
- _doCall(method, data = {}, showLoader = true, service = backend_service_name_enum_1.BackendServiceName.LoginService, endPoint = end_point_enum_1.EndPoint.AjaxService, ownMessage) {
103
132
  if (showLoader) {
104
133
  this.setShowLoaderRequests(this._showLoaderRequests + 1);
105
134
  }
@@ -110,7 +139,10 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
110
139
  message = JSON.stringify(ownMessage);
111
140
  }
112
141
  else {
113
- if (this.usePublicToken) {
142
+ if (this._methodNeedsAccessToken(method)) {
143
+ await this._waitForAccessToken((data && service && service === backend_service_name_enum_1.BackendServiceName.LoginService) || method === datasession_service_method_enum_1.DatasessionServiceMethod.CreatePublicSession, this.usePublicToken);
144
+ }
145
+ if (this.usePublicToken && !isPublicService) {
114
146
  message = JSON.stringify({
115
147
  method: method,
116
148
  data: data,
@@ -118,9 +150,6 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
118
150
  });
119
151
  }
120
152
  else {
121
- if (this.options.jwtEnabled) {
122
- await this._waitForAccessToken(data && service && service === backend_service_name_enum_1.BackendServiceName.LoginService);
123
- }
124
153
  message = JSON.stringify({
125
154
  service: service,
126
155
  method: method,
@@ -133,16 +162,14 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
133
162
  }
134
163
  }
135
164
  const headers = {
136
- "Content-Type": "application/json; charset=utf-8"
165
+ "Content-Type": "application/json; charset=utf-8",
166
+ "Authorization": `Bearer ${this.jwtService.jwt}`
137
167
  };
138
- if (this.options.jwtEnabled) {
139
- headers["Authorization"] = `Bearer ${this.jwtService.jwt}`;
140
- }
141
168
  (0, axios_1.default)({
142
169
  method: 'post',
143
170
  url: url,
144
171
  data: message,
145
- withCredentials: this.options.jwtEnabled,
172
+ withCredentials: true,
146
173
  timeout: this._timeout,
147
174
  headers: headers
148
175
  }).then(response => {
@@ -161,7 +188,8 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
161
188
  if (error.code === "ECONNABORTED") {
162
189
  this.connectionAborted.next();
163
190
  }
164
- reject(error);
191
+ console.error(error);
192
+ resolve();
165
193
  });
166
194
  }).then(response => {
167
195
  if (showLoader) {
@@ -170,15 +198,26 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
170
198
  return new Promise((resolve) => { return resolve(response); });
171
199
  });
172
200
  }
173
- async _waitForAccessToken(isLogin) {
174
- if (!isLogin && this.jwtService.retrievingToken) {
201
+ _methodNeedsAccessToken(method) {
202
+ return this._methodWithoutAccessToken.indexOf(method) < 0;
203
+ }
204
+ async _waitForAccessToken(isLogin, publicToken) {
205
+ if (this.jwtService.retrievingToken) {
175
206
  return new Promise((resolve) => {
176
- this.jwtService.tokenRetrieved.subscribe(() => {
207
+ if (window.hasOwnProperty('tokenRetrieved')) {
208
+ window.tokenRetrieved.subscribe(() => {
209
+ resolve(true);
210
+ });
211
+ }
212
+ else {
177
213
  resolve(true);
178
- });
214
+ }
179
215
  });
180
216
  }
181
217
  await this.jwtService.getAccessToken(!isLogin);
218
+ if (publicToken) {
219
+ this.session.publicToken = this.jwtService.jwt;
220
+ }
182
221
  }
183
222
  setShowLoaderRequests(amount) {
184
223
  this._showLoaderRequests = amount;
@@ -189,6 +228,49 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
189
228
  this.showLoader.next(false);
190
229
  }
191
230
  }
231
+ _redirectToIdentityServerRealm() {
232
+ if (this.loginService.company && this.loginService.company.realmId && this.loginService.company.clientId) {
233
+ let state = this.localStorageService.keycloakState;
234
+ if (!state) {
235
+ state = this._createGuid();
236
+ this.localStorageService.setKeycloakState(state);
237
+ }
238
+ const redirectUrl = window.location.href;
239
+ const query = {
240
+ state: state,
241
+ client_id: this.loginService.company.clientId,
242
+ response_type: "code",
243
+ response_mode: "fragment",
244
+ redirect_uri: redirectUrl
245
+ };
246
+ const queryUrl = new URLSearchParams(query).toString();
247
+ const fullUrl = this.loginService.keycloakParams.keycloakUrl + "/realms/" + this.loginService.company.realmId + "/protocol/openid-connect/auth" + "?" + queryUrl;
248
+ window.location.href = fullUrl;
249
+ }
250
+ else {
251
+ console.error("Identity server information is not defined for the selected company");
252
+ }
253
+ }
254
+ _getParameter(parameterName) {
255
+ let url = window.location.href;
256
+ url = url.replace('#', '?');
257
+ parameterName = parameterName.replace(/[\[\]]/g, "\\$&");
258
+ const regex = new RegExp("[?&]" + parameterName + "(=([^&#]*)|&|#|$)");
259
+ const results = regex.exec(url);
260
+ if (!results) {
261
+ return null;
262
+ }
263
+ else if (!results[2]) {
264
+ return "";
265
+ }
266
+ return decodeURIComponent(results[2].replace(/\+/g, " "));
267
+ }
268
+ _createGuid() {
269
+ return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
270
+ const r = Math.random() * 16 | 0;
271
+ return (c === "x" ? r : (r & 0x3 | 0x8)).toString(16);
272
+ });
273
+ }
192
274
  }
193
275
  exports.AjaxService = AjaxService;
194
276
  //# sourceMappingURL=ajax.service.js.map
@@ -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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"}
@@ -7,6 +7,9 @@ import { ServerResponseData } from '../model/server-response-data';
7
7
  import { LocalStorageService } from '../service/local-storage.service';
8
8
  import { JwtTokenService } from '../service/jwt-token.service';
9
9
  import { SessionStorageService } from '../service/session-storage.service';
10
+ import { DataServiceData } from '../model/data-service-data';
11
+ import { PublicServiceRequestData } from '../model/public-service-request-data';
12
+ import { TokenResponse } from '../model/token-response.bo';
10
13
  export declare abstract class BaseBackendConnectionService {
11
14
  readonly showLoader: Subject<boolean>;
12
15
  readonly connectionAborted: Subject<void>;
@@ -22,16 +25,18 @@ export declare abstract class BaseBackendConnectionService {
22
25
  jwtService: JwtTokenService;
23
26
  version: number;
24
27
  usePublicToken: boolean;
28
+ schema: string;
25
29
  protected callId: string;
26
30
  protected url: string;
27
- protected schema: string;
28
31
  protected loginService: LoginService;
29
32
  private _datasessionService;
30
33
  constructor(options: Options);
31
- abstract call(method: string, data: any, showLoader: boolean, service: BackendServiceName, ownMessage?: {}): Promise<any>;
34
+ abstract call(method: string, data: any, showLoader: boolean, service: BackendServiceName, endPoint?: string, isPublicService?: boolean, ownMessage?: {}): Promise<any>;
32
35
  commit(): Promise<boolean>;
33
36
  closeDataSession(): Promise<ServerResponseData>;
34
- createNewSession(): void;
37
+ createNewSession(forKeycloak?: boolean): void;
38
+ createPublicSession(): Promise<TokenResponse>;
35
39
  generateUniqueId(): string;
40
+ protected abstract _doCall(method: string, data: DataServiceData | PublicServiceRequestData, showLoader: boolean, service: string, endPoint: string, isPublicService: boolean, ownMessage?: {}): any;
36
41
  private _checkSession;
37
42
  }
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.BaseBackendConnectionService = void 0;
4
+ const backend_service_name_enum_1 = require("../enum/backend-service-name.enum");
4
5
  const session_1 = require("../model/session");
5
6
  const login_service_1 = require("../service/login.service");
6
7
  const rxjs_1 = require("rxjs");
@@ -8,6 +9,9 @@ const datasession_service_1 = require("../service/datasession.service");
8
9
  const local_storage_service_1 = require("../service/local-storage.service");
9
10
  const jwt_token_service_1 = require("../service/jwt-token.service");
10
11
  const session_storage_service_1 = require("../service/session-storage.service");
12
+ const datasession_service_method_enum_1 = require("../enum/datasession-service-method.enum");
13
+ const end_point_enum_1 = require("../enum/end-point.enum");
14
+ const token_response_bo_1 = require("../model/token-response.bo");
11
15
  class BaseBackendConnectionService {
12
16
  constructor(options) {
13
17
  this.showLoader = new rxjs_1.Subject();
@@ -30,7 +34,7 @@ class BaseBackendConnectionService {
30
34
  }
31
35
  this.schema = options.schema;
32
36
  this.url = options.url;
33
- this.localStorageService = new local_storage_service_1.LocalStorageService(this.url, this.schema);
37
+ this.localStorageService = new local_storage_service_1.LocalStorageService(this.url, this.schema, options.username);
34
38
  if ((options && (options.username && options.password)) || this.localStorageService.sessionId) {
35
39
  this.usePublicToken = false;
36
40
  }
@@ -58,12 +62,9 @@ class BaseBackendConnectionService {
58
62
  closeDataSession() {
59
63
  return this.loginService.logout();
60
64
  }
61
- createNewSession() {
65
+ createNewSession(forKeycloak = false) {
62
66
  this.session = new session_1.Session();
63
- if (this.usePublicToken) {
64
- this.session.publicToken = this.localStorageService.publicToken;
65
- }
66
- else {
67
+ if (forKeycloak) {
67
68
  this.localStorageService.setPublicToken(undefined);
68
69
  if (!this.dataSessionId) {
69
70
  this.dataSessionId = `${this.module}_${this.generateUniqueId()}`;
@@ -74,6 +75,38 @@ class BaseBackendConnectionService {
74
75
  this.localStorageService.setDataSessionId(this.session.dataSessionId);
75
76
  this.localStorageService.setSessionId(this.session.id);
76
77
  }
78
+ else {
79
+ if (this.usePublicToken) {
80
+ this.session.publicToken = this.localStorageService.publicToken;
81
+ }
82
+ else {
83
+ this.localStorageService.setPublicToken(undefined);
84
+ if (!this.dataSessionId) {
85
+ this.dataSessionId = `${this.module}_${this.generateUniqueId()}`;
86
+ }
87
+ this.session.dataSessionId = this.dataSessionId;
88
+ this.session.id = this.sessionId ? this.sessionId : this.generateUniqueId();
89
+ this.session.windowsId = this.windowSessionId;
90
+ this.localStorageService.setDataSessionId(this.session.dataSessionId);
91
+ this.localStorageService.setSessionId(this.session.id);
92
+ }
93
+ }
94
+ }
95
+ async createPublicSession() {
96
+ const data = {
97
+ upId: this.schema
98
+ };
99
+ const token = await this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.CreatePublicSession, data, false, backend_service_name_enum_1.BackendServiceName.PublicService, end_point_enum_1.EndPoint.PublicService, true);
100
+ if (token) {
101
+ this.localStorageService.setPublicToken(token);
102
+ this.jwtService.setLoginDataByPublicToken(token);
103
+ this.createNewSession();
104
+ const tokenResponse = new token_response_bo_1.TokenResponse();
105
+ tokenResponse.accessToken = token;
106
+ tokenResponse.refreshToken = token;
107
+ return tokenResponse;
108
+ }
109
+ return null;
77
110
  }
78
111
  generateUniqueId() {
79
112
  function s4() {
@@ -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,14 +1,12 @@
1
- import { Subject } from 'rxjs';
2
1
  export declare class JwtTokenService {
3
2
  jwt: string;
4
- retrievingToken: boolean;
5
- tokenRetrieved: Subject<boolean>;
6
- private _tokenExpiredTime;
7
3
  private _sessionStorageService;
8
4
  private _loginService;
9
5
  constructor(sessionStorageService: any, loginService: any);
6
+ get retrievingToken(): boolean;
10
7
  getAccessToken(refresh?: boolean): Promise<void>;
11
8
  setExpirationTime(jwt: string): void;
9
+ setLoginDataByPublicToken(token: string): void;
12
10
  private _tokenExpired;
13
11
  private _refreshToken;
14
12
  }
@@ -5,10 +5,14 @@ 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.retrievingToken = false;
9
- this.tokenRetrieved = new rxjs_1.Subject();
10
8
  this._sessionStorageService = sessionStorageService;
11
9
  this._loginService = loginService;
10
+ if (!window.hasOwnProperty('tokenRetrieved')) {
11
+ window.tokenRetrieved = new rxjs_1.Subject();
12
+ }
13
+ }
14
+ get retrievingToken() {
15
+ return this._sessionStorageService.getBusy();
12
16
  }
13
17
  async getAccessToken(refresh = true) {
14
18
  if (refresh && this._tokenExpired()) {
@@ -18,24 +22,35 @@ class JwtTokenService {
18
22
  }
19
23
  setExpirationTime(jwt) {
20
24
  const decoded = (0, jwt_decode_1.default)(jwt);
21
- this._tokenExpiredTime = decoded.exp;
25
+ const loginData = this._sessionStorageService.getLoginData();
26
+ loginData.tokenExp = decoded.exp;
27
+ this._sessionStorageService.setLoginData(loginData);
28
+ }
29
+ setLoginDataByPublicToken(token) {
30
+ const loginData = this._sessionStorageService.getLoginData();
31
+ loginData.accessToken = token;
32
+ loginData.refreshToken = token;
33
+ this.setExpirationTime(token);
34
+ this._sessionStorageService.setLoginData(loginData);
22
35
  }
23
36
  _tokenExpired() {
24
- if (this._sessionStorageService.getLoginData().accessToken && this._tokenExpiredTime) {
25
- return ((1000 * this._tokenExpiredTime) - (new Date()).getTime()) < 120000;
37
+ if (this._sessionStorageService.getLoginData().accessToken && this._sessionStorageService.getLoginData().tokenExp) {
38
+ return ((1000 * this._sessionStorageService.getLoginData().tokenExp) - (new Date()).getTime()) < 60000;
26
39
  }
27
40
  return false;
28
41
  }
29
42
  async _refreshToken() {
30
- this.retrievingToken = true;
43
+ this._sessionStorageService.setBusy(true);
31
44
  const tokenResponse = await this._loginService.refreshAccessToken(this._sessionStorageService.getLoginData().refreshToken);
32
45
  const loginData = this._sessionStorageService.getLoginData();
33
46
  loginData.accessToken = tokenResponse.accessToken;
34
47
  loginData.refreshToken = tokenResponse.refreshToken;
35
48
  this.setExpirationTime(tokenResponse.accessToken);
36
49
  this._sessionStorageService.setLoginData(loginData);
37
- this.retrievingToken = false;
38
- this.tokenRetrieved.next(true);
50
+ this._sessionStorageService.setBusy(false);
51
+ if (window.hasOwnProperty('tokenRetrieved')) {
52
+ window.tokenRetrieved.next(true);
53
+ }
39
54
  }
40
55
  }
41
56
  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;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"}
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;IAMxB,YAAY,qBAAqB,EAAE,YAAY;QAC3C,IAAI,CAAC,sBAAsB,GAAG,qBAAqB,CAAC;QACpD,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAGlC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE;YAE1C,MAAM,CAAC,cAAc,GAAG,IAAI,cAAO,EAAE,CAAC;SACzC;IACL,CAAC;IAED,IAAW,eAAe;QACtB,OAAO,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC;IACjD,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,MAAM,SAAS,GAAqB,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC;QAC/E,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;QACjC,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC;IAEM,yBAAyB,CAAC,KAAa;QAC1C,MAAM,SAAS,GAAqB,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC;QAC/E,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,sBAAsB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC;IAEO,aAAa;QACjB,IAAI,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,WAAW,IAAI,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE;YAC/G,OAAO,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC;SAC1G;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,aAAa;QACvB,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1C,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,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE3C,IAAI,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE;YAEzC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpC;IACL,CAAC;CACJ;AAjED,0CAiEC"}
@@ -1,6 +1,8 @@
1
1
  import { LocalStorageRootObject } from '../model/local-storage-root-object';
2
+ import { IoneLocalStorageRootObject } from '../model/ione-local-storage-root-object';
2
3
  export declare class LocalStorageService {
3
4
  readonly storage: Storage;
5
+ clear(): void;
4
6
  setSessionId(id: string): void;
5
7
  get sessionId(): string;
6
8
  setDataSessionId(id: string): void;
@@ -10,9 +12,13 @@ export declare class LocalStorageService {
10
12
  setKeycloakState(keycloakState: string): void;
11
13
  get keycloakState(): string;
12
14
  protected storageObj: LocalStorageRootObject;
15
+ protected iOneStorageObj: IoneLocalStorageRootObject;
13
16
  protected appRoot: string;
17
+ protected iOneRoot: string;
14
18
  protected schema: string;
15
- constructor(url: string, schema: string);
19
+ protected username: string;
20
+ constructor(url: string, schema: string, username: string);
16
21
  save(): void;
17
22
  protected _initLocalStorageObj(): void;
23
+ private _getUserObject;
18
24
  }