@smartbit4all/ng-client 2.0.10 → 2.0.11
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/esm2020/lib/session/smart-error-catching.interceptor.mjs +51 -27
- package/esm2020/lib/session/smart-session-handler.service.mjs +1 -1
- package/esm2020/lib/session/smart-session.service.mjs +31 -26
- package/fesm2015/smartbit4all-ng-client.mjs +77 -49
- package/fesm2015/smartbit4all-ng-client.mjs.map +1 -1
- package/fesm2020/smartbit4all-ng-client.mjs +77 -49
- package/fesm2020/smartbit4all-ng-client.mjs.map +1 -1
- package/lib/session/smart-error-catching.interceptor.d.ts +8 -4
- package/lib/session/smart-session-handler.service.d.ts +10 -0
- package/lib/session/smart-session.service.d.ts +2 -0
- package/package.json +1 -1
- package/smartbit4all-ng-client-2.0.11.tgz +0 -0
- package/smartbit4all-ng-client-2.0.10.tgz +0 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Injectable } from
|
|
2
|
-
import { from, throwError } from
|
|
3
|
-
import { catchError, switchMap } from
|
|
4
|
-
import { SessionErrorBehaviour, } from
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { from, throwError } from 'rxjs';
|
|
3
|
+
import { catchError, switchMap } from 'rxjs/operators';
|
|
4
|
+
import { SessionErrorBehaviour, } from './projects';
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
6
6
|
import * as i1 from "./projects";
|
|
7
7
|
export class SmartErrorCatchingInterceptor {
|
|
@@ -9,52 +9,68 @@ export class SmartErrorCatchingInterceptor {
|
|
|
9
9
|
this.session = session;
|
|
10
10
|
this.sessionErrorCodes = [
|
|
11
11
|
{
|
|
12
|
-
code:
|
|
12
|
+
code: 'session.expired',
|
|
13
13
|
behaviour: SessionErrorBehaviour.REFRESH,
|
|
14
14
|
},
|
|
15
15
|
{
|
|
16
|
-
code:
|
|
16
|
+
code: 'session.refreshtoken.invalid',
|
|
17
17
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
18
18
|
},
|
|
19
19
|
{
|
|
20
|
-
code:
|
|
20
|
+
code: 'session.badrequest.missingtoken',
|
|
21
21
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
22
22
|
},
|
|
23
23
|
{
|
|
24
|
-
code:
|
|
24
|
+
code: 'session.security.nocontext',
|
|
25
25
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
26
26
|
},
|
|
27
27
|
{
|
|
28
|
-
code:
|
|
28
|
+
code: 'session.invalidsessionuri',
|
|
29
29
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
30
30
|
},
|
|
31
31
|
{
|
|
32
|
-
code:
|
|
32
|
+
code: 'session.notinitialized',
|
|
33
33
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
34
34
|
},
|
|
35
35
|
{
|
|
36
|
-
code:
|
|
36
|
+
code: 'session.viewcontext.missing',
|
|
37
37
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
38
38
|
},
|
|
39
39
|
];
|
|
40
40
|
}
|
|
41
41
|
intercept(request, next) {
|
|
42
|
-
return next
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
return next.handle(request);
|
|
53
|
-
}
|
|
54
|
-
|
|
42
|
+
return next
|
|
43
|
+
.handle(request)
|
|
44
|
+
.pipe(catchError((error) => this.handleError(error, request, next)));
|
|
45
|
+
}
|
|
46
|
+
handleError(error, request, next) {
|
|
47
|
+
if (this.isSessionError(error)) {
|
|
48
|
+
const sessionError = this.getSessionError(error);
|
|
49
|
+
if (sessionError) {
|
|
50
|
+
return this.resolveError(sessionError).pipe(switchMap((resolved) => {
|
|
51
|
+
if (resolved && sessionError.behaviour === SessionErrorBehaviour.REFRESH) {
|
|
52
|
+
return next.handle(this.updateRequestHeaders(request));
|
|
53
|
+
}
|
|
54
|
+
return throwError(() => error);
|
|
55
|
+
}), catchError((resolveError) => {
|
|
56
|
+
// when the resolveError throws a restart error (in the refreshSession), rethrow the original error
|
|
57
|
+
if (this.isSessionError(resolveError)) {
|
|
58
|
+
const resolveSessionError = this.getSessionError(resolveError);
|
|
59
|
+
if (resolveSessionError?.behaviour === SessionErrorBehaviour.RESTART) {
|
|
60
|
+
return throwError(() => error);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return throwError(() => resolveError);
|
|
64
|
+
}));
|
|
55
65
|
}
|
|
56
|
-
|
|
57
|
-
|
|
66
|
+
}
|
|
67
|
+
return throwError(() => error);
|
|
68
|
+
}
|
|
69
|
+
isSessionError(error) {
|
|
70
|
+
return error.status === 400 && error.error.code != null;
|
|
71
|
+
}
|
|
72
|
+
getSessionError(error) {
|
|
73
|
+
return this.sessionErrorCodes.find((sessionError) => sessionError.code === error.error.code);
|
|
58
74
|
}
|
|
59
75
|
resolveError(sessionError) {
|
|
60
76
|
if (sessionError.behaviour === SessionErrorBehaviour.RESTART) {
|
|
@@ -62,10 +78,18 @@ export class SmartErrorCatchingInterceptor {
|
|
|
62
78
|
}
|
|
63
79
|
return from(this.session.refreshSession());
|
|
64
80
|
}
|
|
81
|
+
updateRequestHeaders(request) {
|
|
82
|
+
this.session.headerParams.forEach((headerParam) => {
|
|
83
|
+
request = request.clone({
|
|
84
|
+
headers: request.headers.set(headerParam.headerName, headerParam.value),
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
return request;
|
|
88
|
+
}
|
|
65
89
|
}
|
|
66
90
|
SmartErrorCatchingInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartErrorCatchingInterceptor, deps: [{ token: i1.SmartSessionService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
67
91
|
SmartErrorCatchingInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartErrorCatchingInterceptor });
|
|
68
92
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartErrorCatchingInterceptor, decorators: [{
|
|
69
93
|
type: Injectable
|
|
70
94
|
}], ctorParameters: function () { return [{ type: i1.SmartSessionService }]; } });
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smart-error-catching.interceptor.js","sourceRoot":"","sources":["../../../../../projects/smart-ng-client/src/lib/session/smart-error-catching.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import {\r\n  HttpErrorResponse,\r\n  HttpEvent,\r\n  HttpHandler,\r\n  HttpInterceptor,\r\n  HttpRequest,\r\n} from '@angular/common/http';\r\nimport { Injectable } from '@angular/core';\r\nimport { from, Observable, throwError } from 'rxjs';\r\nimport { catchError, switchMap } from 'rxjs/operators';\r\nimport {\r\n  ApiError,\r\n  HeaderParam,\r\n  SessionError,\r\n  SessionErrorBehaviour,\r\n  SmartSessionService,\r\n} from './projects';\r\n\r\n@Injectable()\r\nexport class SmartErrorCatchingInterceptor implements HttpInterceptor {\r\n  sessionErrorCodes: SessionError[] = [\r\n    {\r\n      code: 'session.expired',\r\n      behaviour: SessionErrorBehaviour.REFRESH,\r\n    },\r\n    {\r\n      code: 'session.refreshtoken.invalid',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n    {\r\n      code: 'session.badrequest.missingtoken',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n    {\r\n      code: 'session.security.nocontext',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n    {\r\n      code: 'session.invalidsessionuri',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n    {\r\n      code: 'session.notinitialized',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n    {\r\n      code: 'session.viewcontext.missing',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n  ];\r\n\r\n  constructor(private session: SmartSessionService) {}\r\n\r\n  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {\r\n    return next\r\n      .handle(request)\r\n      .pipe(catchError((error: HttpErrorResponse) => this.handleError(error, request, next)));\r\n  }\r\n\r\n  private handleError(\r\n    error: HttpErrorResponse,\r\n    request: HttpRequest<unknown>,\r\n    next: HttpHandler\r\n  ): Observable<HttpEvent<unknown>> {\r\n    if (this.isSessionError(error)) {\r\n      const sessionError = this.getSessionError(error);\r\n      if (sessionError) {\r\n        return this.resolveError(sessionError).pipe(\r\n          switchMap((resolved) => {\r\n            if (resolved && sessionError.behaviour === SessionErrorBehaviour.REFRESH) {\r\n              return next.handle(this.updateRequestHeaders(request));\r\n            }\r\n            return throwError(() => error);\r\n          }),\r\n          catchError((resolveError) => {\r\n            // when the resolveError throws a restart error (in the refreshSession), rethrow the original error\r\n            if (this.isSessionError(resolveError)) {\r\n              const resolveSessionError = this.getSessionError(resolveError);\r\n              if (resolveSessionError?.behaviour === SessionErrorBehaviour.RESTART) {\r\n                return throwError(() => error);\r\n              }\r\n            }\r\n            return throwError(() => resolveError);\r\n          })\r\n        );\r\n      }\r\n    }\r\n    return throwError(() => error);\r\n  }\r\n\r\n  private isSessionError(error: HttpErrorResponse): boolean {\r\n    return error.status === 400 && (error.error as ApiError).code != null;\r\n  }\r\n\r\n  private getSessionError(error: HttpErrorResponse): SessionError | undefined {\r\n    return this.sessionErrorCodes.find(\r\n      (sessionError: SessionError) => sessionError.code === (error.error as ApiError).code\r\n    );\r\n  }\r\n\r\n  private resolveError(sessionError: SessionError): Observable<any> {\r\n    if (sessionError.behaviour === SessionErrorBehaviour.RESTART) {\r\n      return from(this.session.handleSessionError(sessionError));\r\n    }\r\n    return from(this.session.refreshSession());\r\n  }\r\n\r\n  private updateRequestHeaders(request: HttpRequest<unknown>): HttpRequest<unknown> {\r\n    this.session.headerParams.forEach((headerParam: HeaderParam) => {\r\n      request = request.clone({\r\n        headers: request.headers.set(headerParam.headerName, headerParam.value),\r\n      });\r\n    });\r\n    return request;\r\n  }\r\n}\r\n"]}
|
|
@@ -3,4 +3,4 @@ export var SessionErrorBehaviour;
|
|
|
3
3
|
SessionErrorBehaviour[SessionErrorBehaviour["REFRESH"] = 0] = "REFRESH";
|
|
4
4
|
SessionErrorBehaviour[SessionErrorBehaviour["RESTART"] = 1] = "RESTART";
|
|
5
5
|
})(SessionErrorBehaviour || (SessionErrorBehaviour = {}));
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnQtc2Vzc2lvbi1oYW5kbGVyLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9zbWFydC1uZy1jbGllbnQvc3JjL2xpYi9zZXNzaW9uL3NtYXJ0LXNlc3Npb24taGFuZGxlci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQW1CQSxNQUFNLENBQU4sSUFBWSxxQkFHWDtBQUhELFdBQVkscUJBQXFCO0lBQy9CLHVFQUFPLENBQUE7SUFDUCx1RUFBTyxDQUFBO0FBQ1QsQ0FBQyxFQUhXLHFCQUFxQixLQUFyQixxQkFBcUIsUUFHaEMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgaW50ZXJmYWNlIFNtYXJ0U2Vzc2lvbkhhbmRsZXJTZXJ2aWNlIHtcclxuICAvKipcclxuICAgKiBIYW5kbGVzIFNlc3Npb25FcnJvcnMgd2l0aCBSRVNUQVJUIGJlaGF2aW91ci4gV2l0aCB0aGlzIG1ldGhvZCBpdCBpcyBwb3NzaWJsZSB0byBhZGQgYXBwbGljYXRpb25cclxuICAgKiBzcGVjaWZpYyBsb2dpYyB0byB0aGUgc2Vzc2lvbiByZXN0YXJ0IG1lY2hhbmlzbS5cclxuICAgKiBFLmcuOiBuYXZpZ2F0ZSB0byB0aGUgbG9naW4gcGFnZSB3aGVuIHRoZSBzZXNzaW9uIGNhbiBub3QgYmUgcmVmcmVzaGVkLlxyXG4gICAqXHJcbiAgICogQnkgZGVmYXVsdCB3aGVuIHRoZSBzZXNzaW9uIGNhbiBub3QgYmUgcmVmcmVzaGVkLCB0aGUgc21hcnQtc2Vzc2lvbi5zZXJ2aWNlIGNsZWFycyBhbmQgc3RhcnRzIGEgbmV3IHNlc3Npb24uXHJcbiAgICogQnkgdGhyb3dpbmcgYW4gZXhjZXB0aW9uIGluIHRoaXMgbWV0aG9kIGl0IGlzIHBvc3NpYmxlIHRvIGF2b2lkIHRoaXMgZGVmYXVsdCBmdW5jdGlvbmFsaXR5LFxyXG4gICAqIGFuZCBoYW5kbGUgdGhlIHNlc3Npb24gcmVjcmVhdGlvbiBjb21wbGV0ZWx5IGhlcmUgaW4gdGhlIGFwcGxpY2F0aW9uIGxldmVsLlxyXG4gICAqIEBwYXJhbSBzZXNzaW9uRXJyb3IgdGhlIFNlc3Npb25FcnJvciB3aXRoIFJFU1RBUlQgYmVoYXZpb3VyIGNhY2hlZCBpbiB0aGUgaHR0cCBpbnRlcmNlcHRvclxyXG4gICAqL1xyXG4gIGhhbmRsZVNlc3Npb25FcnJvcihzZXNzaW9uRXJyb3I6IFNlc3Npb25FcnJvcik6IFByb21pc2U8dm9pZD47XHJcbn1cclxuXHJcbmV4cG9ydCBpbnRlcmZhY2UgU2Vzc2lvbkVycm9yIHtcclxuICBjb2RlOiBzdHJpbmc7XHJcbiAgYmVoYXZpb3VyOiBTZXNzaW9uRXJyb3JCZWhhdmlvdXI7XHJcbn1cclxuXHJcbmV4cG9ydCBlbnVtIFNlc3Npb25FcnJvckJlaGF2aW91ciB7XHJcbiAgUkVGUkVTSCxcclxuICBSRVNUQVJULFxyXG59XHJcbiJdfQ==
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { HttpErrorResponse } from '@angular/common/http';
|
|
1
2
|
import { Injectable } from '@angular/core';
|
|
2
|
-
import { Subject } from 'rxjs';
|
|
3
|
+
import { Subject, lastValueFrom } from 'rxjs';
|
|
3
4
|
import { SmartSubject } from '@smartbit4all/subject';
|
|
4
5
|
import * as i0 from "@angular/core";
|
|
5
6
|
import * as i1 from "./api";
|
|
@@ -37,7 +38,7 @@ export class SmartSessionService {
|
|
|
37
38
|
}
|
|
38
39
|
async handleSessionError(sessionError) {
|
|
39
40
|
if (this.sessionHandlerService) {
|
|
40
|
-
await this.sessionHandlerService.handleSessionError(sessionError);
|
|
41
|
+
return await this.sessionHandlerService.handleSessionError(sessionError);
|
|
41
42
|
}
|
|
42
43
|
throw new Error(`sessionHandlerService was not initialized. Error: ${sessionError.code}`);
|
|
43
44
|
}
|
|
@@ -132,11 +133,7 @@ export class SmartSessionService {
|
|
|
132
133
|
async startSession() {
|
|
133
134
|
let sessionInfo = await this.apiService.startSession().toPromise();
|
|
134
135
|
if (sessionInfo) {
|
|
135
|
-
this.
|
|
136
|
-
this.token = sessionInfo.sid;
|
|
137
|
-
this.saveTokenToLocalStorage();
|
|
138
|
-
this.setAuthenticationStatus();
|
|
139
|
-
this.setUpTokenForSessionService();
|
|
136
|
+
this.updateSessionInfo(sessionInfo);
|
|
140
137
|
}
|
|
141
138
|
return this.sessionInfoData;
|
|
142
139
|
}
|
|
@@ -155,26 +152,34 @@ export class SmartSessionService {
|
|
|
155
152
|
if (!refreshToken) {
|
|
156
153
|
return await this.startSession();
|
|
157
154
|
}
|
|
158
|
-
|
|
159
|
-
.refreshSession({
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
.catch(async (error) => {
|
|
164
|
-
if (error.error &&
|
|
165
|
-
error.error.code &&
|
|
166
|
-
error.error.code === 'session.refreshtoken.invalid') {
|
|
167
|
-
await this.startSession();
|
|
155
|
+
try {
|
|
156
|
+
const sessionInfo = await lastValueFrom(this.apiService.refreshSession({ refreshToken }));
|
|
157
|
+
if (sessionInfo) {
|
|
158
|
+
this.updateSessionInfo(sessionInfo);
|
|
159
|
+
return sessionInfo;
|
|
168
160
|
}
|
|
169
|
-
});
|
|
170
|
-
if (sessionInfo) {
|
|
171
|
-
this.sessionInfoData = sessionInfo;
|
|
172
|
-
this.token = sessionInfo.sid;
|
|
173
|
-
this.saveTokenToLocalStorage();
|
|
174
|
-
this.setAuthenticationStatus();
|
|
175
|
-
this.setUpTokenForSessionService();
|
|
176
161
|
}
|
|
177
|
-
|
|
162
|
+
catch (error) {
|
|
163
|
+
if (this.isInvalidRefreshTokenError(error)) {
|
|
164
|
+
this.clearAndStartNewSession();
|
|
165
|
+
// still throw the error, so the error can be handled in the caller
|
|
166
|
+
}
|
|
167
|
+
throw error;
|
|
168
|
+
}
|
|
169
|
+
// no sessionInfo returned
|
|
170
|
+
throw new Error('Unable to refresh session');
|
|
171
|
+
}
|
|
172
|
+
updateSessionInfo(sessionInfo) {
|
|
173
|
+
this.sessionInfoData = sessionInfo;
|
|
174
|
+
this.token = sessionInfo.sid;
|
|
175
|
+
this.saveTokenToLocalStorage();
|
|
176
|
+
this.setAuthenticationStatus();
|
|
177
|
+
this.setUpTokenForSessionService();
|
|
178
|
+
}
|
|
179
|
+
isInvalidRefreshTokenError(error) {
|
|
180
|
+
return (error instanceof HttpErrorResponse &&
|
|
181
|
+
error.error &&
|
|
182
|
+
error.error.code === 'session.refreshtoken.invalid');
|
|
178
183
|
}
|
|
179
184
|
async getAuthenticationProviders() {
|
|
180
185
|
let providers = await this.apiService
|
|
@@ -222,4 +227,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
|
|
|
222
227
|
providedIn: 'root',
|
|
223
228
|
}]
|
|
224
229
|
}], ctorParameters: function () { return [{ type: i1.SessionService }, { type: i2.SmartCookieService }]; } });
|
|
225
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smart-session.service.js","sourceRoot":"","sources":["../../../../../projects/smart-ng-client/src/lib/session/smart-session.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse } from '@angular/common/http';\r\nimport { Injectable, OnDestroy } from '@angular/core';\r\nimport { Subject } from 'rxjs';\r\nimport {\r\n  ApiError,\r\n  AuthenticationProviderData,\r\n  GetAuthenticationProvidersResponse,\r\n  SessionInfoData,\r\n  SessionService,\r\n} from './api';\r\nimport { SmartCookieService } from './cookie-service/smart-cookie.service';\r\nimport { SessionError, SmartSessionHandlerService } from './smart-session-handler.service';\r\nimport { SmartSubject } from '@smartbit4all/subject';\r\n\r\nexport interface HeaderParam {\r\n  headerName: string;\r\n  value: string;\r\n}\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class SmartSessionService implements OnDestroy {\r\n  private basePath?: string;\r\n  private token?: string;\r\n  private _sessionInfoData?: SessionInfoData;\r\n  private _destroy$: Subject<void> = new Subject();\r\n\r\n  public get sessionInfoData(): SessionInfoData | undefined {\r\n    return this._sessionInfoData;\r\n  }\r\n  private set sessionInfoData(sessionInfoData: SessionInfoData | undefined) {\r\n    let expiracyChanged = this.sessionInfoData?.expiration !== sessionInfoData?.expiration;\r\n\r\n    this._sessionInfoData = sessionInfoData;\r\n\r\n    if (expiracyChanged) {\r\n      this.sessionExpiracyChanged.next();\r\n    }\r\n  }\r\n\r\n  private providers?: Array<AuthenticationProviderData>;\r\n  private cookieName?: string;\r\n  public isAuthenticated: boolean = false;\r\n\r\n  public authenticationStateChanged: Subject<boolean> = new SmartSubject(this._destroy$);\r\n\r\n  public headerParams: Array<HeaderParam> = new Array();\r\n  public headersUpdated: Subject<void> = new SmartSubject(this._destroy$);\r\n\r\n  // Locale\r\n  private localStorageLocaleName: string = 'locale';\r\n  public localeChanged: Subject<void> = new SmartSubject(this._destroy$);\r\n  private initializeRunning: Subject<void> | undefined;\r\n\r\n  public sessionExpiracyChanged: Subject<void> = new SmartSubject(this._destroy$);\r\n\r\n  private sessionHandlerService?: SmartSessionHandlerService;\r\n\r\n  constructor(private apiService: SessionService, private cookieService: SmartCookieService) {}\r\n\r\n  ngOnDestroy(): void {\r\n    this._destroy$.next();\r\n    this._destroy$.complete();\r\n  }\r\n\r\n  public setSessionHandlerService(smartSessionHandlerService: SmartSessionHandlerService): void {\r\n    this.sessionHandlerService = smartSessionHandlerService;\r\n  }\r\n\r\n  public async handleSessionError(sessionError: SessionError): Promise<void> {\r\n    if (this.sessionHandlerService) {\r\n      await this.sessionHandlerService.handleSessionError(sessionError);\r\n    }\r\n    throw new Error(`sessionHandlerService was not initialized. Error: ${sessionError.code}`);\r\n  }\r\n\r\n  public addHeaderParam(headerParam: HeaderParam): void {\r\n    if (this.headerParams.find((h: HeaderParam) => h.headerName === headerParam.headerName)) {\r\n      let index = this.headerParams.findIndex(\r\n        (h: HeaderParam) => h.headerName === headerParam.headerName\r\n      );\r\n      this.headerParams[index!].value = headerParam.value;\r\n    } else {\r\n      this.headerParams.push(headerParam);\r\n    }\r\n    this.headersUpdated.next();\r\n  }\r\n\r\n  private setUpTokenForSessionService(): void {\r\n    this.addHeaderParam({\r\n      headerName: 'Authorization',\r\n      value: `Bearer ${this.token!}`,\r\n    });\r\n  }\r\n\r\n  public setUrl(url: string): void {\r\n    this.basePath = url;\r\n  }\r\n  public getBasePath(): string {\r\n    if (!this.basePath) {\r\n      throw new Error('BasePath has not been set in SmartSessionService!');\r\n    }\r\n    return this.basePath;\r\n  }\r\n\r\n  public setCookieName(name: string): void {\r\n    this.cookieName = name;\r\n  }\r\n\r\n  private saveTokenToLocalStorage(): void {\r\n    if (this.sessionInfoData && this.cookieName) {\r\n      localStorage.setItem('token', this.sessionInfoData.sid);\r\n      if (\r\n        this.sessionInfoData.refreshToken &&\r\n        this.sessionInfoData.refreshToken !== localStorage.getItem('refreshToken')\r\n      ) {\r\n        localStorage.setItem('refreshToken', this.sessionInfoData.refreshToken);\r\n      }\r\n      this.cookieService.set(this.cookieName, this.token!);\r\n    }\r\n  }\r\n\r\n  private setAuthenticationStatus(): void {\r\n    if (this.sessionInfoData && this.sessionInfoData.authentications) {\r\n      this.isAuthenticated = this.sessionInfoData.authentications.length > 0;\r\n    }\r\n    this.authenticationStateChanged.next(this.isAuthenticated);\r\n  }\r\n\r\n  private checkStatements(): void {\r\n    if (!this.basePath) {\r\n      throw new Error('The url of the backend api has not been set!');\r\n    } else if (!this.cookieName) {\r\n      throw new Error('The name of the cookie required by the backend has not been set!');\r\n    }\r\n  }\r\n\r\n  public async initialize(): Promise<void> {\r\n    if (this.initializeRunning) {\r\n      return this.initializeRunning.toPromise();\r\n    } else {\r\n      this.initializeRunning = new SmartSubject(this._destroy$);\r\n      try {\r\n        this.checkStatements();\r\n\r\n        let tokenFromLocalStorage = localStorage.getItem('token');\r\n        let tokenFromCookies = this.cookieService.get(this.cookieName!);\r\n\r\n        if (\r\n          tokenFromLocalStorage &&\r\n          tokenFromCookies &&\r\n          tokenFromLocalStorage === tokenFromCookies\r\n        ) {\r\n          this.token = tokenFromLocalStorage;\r\n          this.setUpTokenForSessionService();\r\n          try {\r\n            await this.getSession();\r\n          } catch (err) {\r\n            await this.startSession();\r\n          }\r\n        } else {\r\n          await this.clearAndStartNewSession();\r\n        }\r\n        if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n          localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n          this.localeChanged.next();\r\n        }\r\n      } finally {\r\n        this.initializeRunning.complete();\r\n        this.initializeRunning = undefined;\r\n      }\r\n    }\r\n  }\r\n\r\n  private async startSession(): Promise<SessionInfoData> {\r\n    let sessionInfo = await this.apiService.startSession().toPromise();\r\n    if (sessionInfo) {\r\n      this.sessionInfoData = sessionInfo;\r\n      this.token = sessionInfo.sid;\r\n      this.saveTokenToLocalStorage();\r\n      this.setAuthenticationStatus();\r\n      this.setUpTokenForSessionService();\r\n    }\r\n\r\n    return this.sessionInfoData!;\r\n  }\r\n\r\n  public async getSession(): Promise<SessionInfoData> {\r\n    let sessionInfo = await this.apiService.getSession().toPromise();\r\n    if (sessionInfo) {\r\n      this.sessionInfoData = sessionInfo;\r\n      this.token = sessionInfo.sid;\r\n      this.saveTokenToLocalStorage();\r\n      this.setAuthenticationStatus();\r\n    }\r\n\r\n    return this.sessionInfoData!;\r\n  }\r\n\r\n  public async refreshSession(): Promise<SessionInfoData> {\r\n    let refreshToken = localStorage.getItem('refreshToken');\r\n    if (!refreshToken) {\r\n      return await this.startSession();\r\n    }\r\n\r\n    let sessionInfo = await this.apiService\r\n      .refreshSession({\r\n        refreshToken,\r\n      })\r\n      .toPromise()\r\n      .catch(async (error: HttpErrorResponse) => {\r\n        if (\r\n          error.error &&\r\n          (error.error as ApiError).code &&\r\n          (error.error as ApiError).code === 'session.refreshtoken.invalid'\r\n        ) {\r\n          await this.startSession();\r\n        }\r\n      });\r\n\r\n    if (sessionInfo) {\r\n      this.sessionInfoData = sessionInfo;\r\n      this.token = sessionInfo.sid;\r\n      this.saveTokenToLocalStorage();\r\n      this.setAuthenticationStatus();\r\n      this.setUpTokenForSessionService();\r\n    }\r\n\r\n    return this.sessionInfoData!;\r\n  }\r\n\r\n  public async getAuthenticationProviders(): Promise<Array<AuthenticationProviderData>> {\r\n    let providers: GetAuthenticationProvidersResponse | undefined = await this.apiService\r\n      .getAuthenticationProviders()\r\n      .toPromise();\r\n\r\n    this.providers = providers?.authenticationProviders;\r\n\r\n    return this.providers!;\r\n  }\r\n\r\n  public async getIsAuthenticated(): Promise<boolean> {\r\n    if (this.sessionInfoData) {\r\n      return this.isAuthenticated;\r\n    }\r\n    await this.getSession();\r\n    return this.isAuthenticated;\r\n  }\r\n\r\n  public async clearAndStartNewSession(): Promise<void> {\r\n    sessionStorage.clear();\r\n    localStorage.clear();\r\n    this.headerParams = [];\r\n    this.cookieService.delete(this.cookieName!);\r\n\r\n    await this.startSession();\r\n  }\r\n\r\n  public getLocale(): string {\r\n    if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n      if (localStorage.getItem(this.localStorageLocaleName) !== this.sessionInfoData.locale) {\r\n        localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n      }\r\n      return this.sessionInfoData.locale;\r\n    }\r\n    throw new Error('There is no SessionInfoData or locale is undefined.');\r\n  }\r\n\r\n  public async changeLocale(locale: string): Promise<void> {\r\n    this.sessionInfoData = await this.apiService.setLocale(locale).toPromise();\r\n    if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n      localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n      this.localeChanged.next();\r\n    }\r\n  }\r\n}\r\n"]}
|
|
230
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smart-session.service.js","sourceRoot":"","sources":["../../../../../projects/smart-ng-client/src/lib/session/smart-session.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse } from '@angular/common/http';\r\nimport { Injectable, OnDestroy } from '@angular/core';\r\nimport { Subject, lastValueFrom } from 'rxjs';\r\nimport {\r\n  ApiError,\r\n  AuthenticationProviderData,\r\n  GetAuthenticationProvidersResponse,\r\n  SessionInfoData,\r\n  SessionService,\r\n} from './api';\r\nimport { SmartCookieService } from './cookie-service/smart-cookie.service';\r\nimport { SessionError, SmartSessionHandlerService } from './smart-session-handler.service';\r\nimport { SmartSubject } from '@smartbit4all/subject';\r\n\r\nexport interface HeaderParam {\r\n  headerName: string;\r\n  value: string;\r\n}\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class SmartSessionService implements OnDestroy {\r\n  private basePath?: string;\r\n  private token?: string;\r\n  private _sessionInfoData?: SessionInfoData;\r\n  private _destroy$: Subject<void> = new Subject();\r\n\r\n  public get sessionInfoData(): SessionInfoData | undefined {\r\n    return this._sessionInfoData;\r\n  }\r\n  private set sessionInfoData(sessionInfoData: SessionInfoData | undefined) {\r\n    let expiracyChanged = this.sessionInfoData?.expiration !== sessionInfoData?.expiration;\r\n\r\n    this._sessionInfoData = sessionInfoData;\r\n\r\n    if (expiracyChanged) {\r\n      this.sessionExpiracyChanged.next();\r\n    }\r\n  }\r\n\r\n  private providers?: Array<AuthenticationProviderData>;\r\n  private cookieName?: string;\r\n  public isAuthenticated: boolean = false;\r\n\r\n  public authenticationStateChanged: Subject<boolean> = new SmartSubject(this._destroy$);\r\n\r\n  public headerParams: Array<HeaderParam> = new Array();\r\n  public headersUpdated: Subject<void> = new SmartSubject(this._destroy$);\r\n\r\n  // Locale\r\n  private localStorageLocaleName: string = 'locale';\r\n  public localeChanged: Subject<void> = new SmartSubject(this._destroy$);\r\n  private initializeRunning: Subject<void> | undefined;\r\n\r\n  public sessionExpiracyChanged: Subject<void> = new SmartSubject(this._destroy$);\r\n\r\n  private sessionHandlerService?: SmartSessionHandlerService;\r\n\r\n  constructor(private apiService: SessionService, private cookieService: SmartCookieService) {}\r\n\r\n  ngOnDestroy(): void {\r\n    this._destroy$.next();\r\n    this._destroy$.complete();\r\n  }\r\n\r\n  public setSessionHandlerService(smartSessionHandlerService: SmartSessionHandlerService): void {\r\n    this.sessionHandlerService = smartSessionHandlerService;\r\n  }\r\n\r\n  public async handleSessionError(sessionError: SessionError): Promise<void> {\r\n    if (this.sessionHandlerService) {\r\n      return await this.sessionHandlerService.handleSessionError(sessionError);\r\n    }\r\n    throw new Error(`sessionHandlerService was not initialized. Error: ${sessionError.code}`);\r\n  }\r\n\r\n  public addHeaderParam(headerParam: HeaderParam): void {\r\n    if (this.headerParams.find((h: HeaderParam) => h.headerName === headerParam.headerName)) {\r\n      let index = this.headerParams.findIndex(\r\n        (h: HeaderParam) => h.headerName === headerParam.headerName\r\n      );\r\n      this.headerParams[index!].value = headerParam.value;\r\n    } else {\r\n      this.headerParams.push(headerParam);\r\n    }\r\n    this.headersUpdated.next();\r\n  }\r\n\r\n  private setUpTokenForSessionService(): void {\r\n    this.addHeaderParam({\r\n      headerName: 'Authorization',\r\n      value: `Bearer ${this.token!}`,\r\n    });\r\n  }\r\n\r\n  public setUrl(url: string): void {\r\n    this.basePath = url;\r\n  }\r\n  public getBasePath(): string {\r\n    if (!this.basePath) {\r\n      throw new Error('BasePath has not been set in SmartSessionService!');\r\n    }\r\n    return this.basePath;\r\n  }\r\n\r\n  public setCookieName(name: string): void {\r\n    this.cookieName = name;\r\n  }\r\n\r\n  private saveTokenToLocalStorage(): void {\r\n    if (this.sessionInfoData && this.cookieName) {\r\n      localStorage.setItem('token', this.sessionInfoData.sid);\r\n      if (\r\n        this.sessionInfoData.refreshToken &&\r\n        this.sessionInfoData.refreshToken !== localStorage.getItem('refreshToken')\r\n      ) {\r\n        localStorage.setItem('refreshToken', this.sessionInfoData.refreshToken);\r\n      }\r\n      this.cookieService.set(this.cookieName, this.token!);\r\n    }\r\n  }\r\n\r\n  private setAuthenticationStatus(): void {\r\n    if (this.sessionInfoData && this.sessionInfoData.authentications) {\r\n      this.isAuthenticated = this.sessionInfoData.authentications.length > 0;\r\n    }\r\n    this.authenticationStateChanged.next(this.isAuthenticated);\r\n  }\r\n\r\n  private checkStatements(): void {\r\n    if (!this.basePath) {\r\n      throw new Error('The url of the backend api has not been set!');\r\n    } else if (!this.cookieName) {\r\n      throw new Error('The name of the cookie required by the backend has not been set!');\r\n    }\r\n  }\r\n\r\n  public async initialize(): Promise<void> {\r\n    if (this.initializeRunning) {\r\n      return this.initializeRunning.toPromise();\r\n    } else {\r\n      this.initializeRunning = new SmartSubject(this._destroy$);\r\n      try {\r\n        this.checkStatements();\r\n\r\n        let tokenFromLocalStorage = localStorage.getItem('token');\r\n        let tokenFromCookies = this.cookieService.get(this.cookieName!);\r\n\r\n        if (\r\n          tokenFromLocalStorage &&\r\n          tokenFromCookies &&\r\n          tokenFromLocalStorage === tokenFromCookies\r\n        ) {\r\n          this.token = tokenFromLocalStorage;\r\n          this.setUpTokenForSessionService();\r\n          try {\r\n            await this.getSession();\r\n          } catch (err) {\r\n            await this.startSession();\r\n          }\r\n        } else {\r\n          await this.clearAndStartNewSession();\r\n        }\r\n        if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n          localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n          this.localeChanged.next();\r\n        }\r\n      } finally {\r\n        this.initializeRunning.complete();\r\n        this.initializeRunning = undefined;\r\n      }\r\n    }\r\n  }\r\n\r\n  private async startSession(): Promise<SessionInfoData> {\r\n    let sessionInfo = await this.apiService.startSession().toPromise();\r\n    if (sessionInfo) {\r\n      this.updateSessionInfo(sessionInfo);\r\n    }\r\n\r\n    return this.sessionInfoData!;\r\n  }\r\n\r\n  public async getSession(): Promise<SessionInfoData> {\r\n    let sessionInfo = await this.apiService.getSession().toPromise();\r\n    if (sessionInfo) {\r\n      this.sessionInfoData = sessionInfo;\r\n      this.token = sessionInfo.sid;\r\n      this.saveTokenToLocalStorage();\r\n      this.setAuthenticationStatus();\r\n    }\r\n\r\n    return this.sessionInfoData!;\r\n  }\r\n\r\n  public async refreshSession(): Promise<SessionInfoData> {\r\n    let refreshToken = localStorage.getItem('refreshToken');\r\n    if (!refreshToken) {\r\n      return await this.startSession();\r\n    }\r\n\r\n    try {\r\n      const sessionInfo = await lastValueFrom(this.apiService.refreshSession({ refreshToken }));\r\n      if (sessionInfo) {\r\n        this.updateSessionInfo(sessionInfo);\r\n        return sessionInfo;\r\n      }\r\n    } catch (error) {\r\n      if (this.isInvalidRefreshTokenError(error)) {\r\n        this.clearAndStartNewSession();\r\n        // still throw the error, so the error can be handled in the caller\r\n      }\r\n      throw error;\r\n    }\r\n    // no sessionInfo returned\r\n    throw new Error('Unable to refresh session');\r\n  }\r\n\r\n  private updateSessionInfo(sessionInfo: SessionInfoData): void {\r\n    this.sessionInfoData = sessionInfo;\r\n    this.token = sessionInfo.sid;\r\n    this.saveTokenToLocalStorage();\r\n    this.setAuthenticationStatus();\r\n    this.setUpTokenForSessionService();\r\n  }\r\n\r\n  private isInvalidRefreshTokenError(error: any): boolean {\r\n    return (\r\n      error instanceof HttpErrorResponse &&\r\n      error.error &&\r\n      (error.error as ApiError).code === 'session.refreshtoken.invalid'\r\n    );\r\n  }\r\n\r\n  public async getAuthenticationProviders(): Promise<Array<AuthenticationProviderData>> {\r\n    let providers: GetAuthenticationProvidersResponse | undefined = await this.apiService\r\n      .getAuthenticationProviders()\r\n      .toPromise();\r\n\r\n    this.providers = providers?.authenticationProviders;\r\n\r\n    return this.providers!;\r\n  }\r\n\r\n  public async getIsAuthenticated(): Promise<boolean> {\r\n    if (this.sessionInfoData) {\r\n      return this.isAuthenticated;\r\n    }\r\n    await this.getSession();\r\n    return this.isAuthenticated;\r\n  }\r\n\r\n  public async clearAndStartNewSession(): Promise<void> {\r\n    sessionStorage.clear();\r\n    localStorage.clear();\r\n    this.headerParams = [];\r\n    this.cookieService.delete(this.cookieName!);\r\n\r\n    await this.startSession();\r\n  }\r\n\r\n  public getLocale(): string {\r\n    if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n      if (localStorage.getItem(this.localStorageLocaleName) !== this.sessionInfoData.locale) {\r\n        localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n      }\r\n      return this.sessionInfoData.locale;\r\n    }\r\n    throw new Error('There is no SessionInfoData or locale is undefined.');\r\n  }\r\n\r\n  public async changeLocale(locale: string): Promise<void> {\r\n    this.sessionInfoData = await this.apiService.setLocale(locale).toPromise();\r\n    if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n      localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n      this.localeChanged.next();\r\n    }\r\n  }\r\n}\r\n"]}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
2
|
import { InjectionToken, Injectable, Optional, Inject, PLATFORM_ID, NgModule, SkipSelf, Component, Pipe, CUSTOM_ELEMENTS_SCHEMA, ViewChild, Input, ViewChildren } from '@angular/core';
|
|
3
3
|
import { __awaiter, __decorate, __param } from 'tslib';
|
|
4
|
-
import { Subject, takeUntil, map, catchError, throwError, from } from 'rxjs';
|
|
5
|
-
import { SmartSubject } from '@smartbit4all/subject';
|
|
6
4
|
import * as i1 from '@angular/common/http';
|
|
7
|
-
import { HttpHeaders, HttpContext, HttpParams, HttpEventType, HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
|
|
5
|
+
import { HttpHeaders, HttpContext, HttpErrorResponse, HttpParams, HttpEventType, HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
|
|
6
|
+
import { Subject, lastValueFrom, takeUntil, map, catchError, throwError, from } from 'rxjs';
|
|
7
|
+
import { SmartSubject } from '@smartbit4all/subject';
|
|
8
8
|
import * as i4 from '@angular/common';
|
|
9
9
|
import { isPlatformBrowser, DOCUMENT, DatePipe, CommonModule } from '@angular/common';
|
|
10
10
|
import * as i2 from '@angular/material/button';
|
|
@@ -711,7 +711,7 @@ class SmartSessionService {
|
|
|
711
711
|
handleSessionError(sessionError) {
|
|
712
712
|
return __awaiter(this, void 0, void 0, function* () {
|
|
713
713
|
if (this.sessionHandlerService) {
|
|
714
|
-
yield this.sessionHandlerService.handleSessionError(sessionError);
|
|
714
|
+
return yield this.sessionHandlerService.handleSessionError(sessionError);
|
|
715
715
|
}
|
|
716
716
|
throw new Error(`sessionHandlerService was not initialized. Error: ${sessionError.code}`);
|
|
717
717
|
});
|
|
@@ -810,11 +810,7 @@ class SmartSessionService {
|
|
|
810
810
|
return __awaiter(this, void 0, void 0, function* () {
|
|
811
811
|
let sessionInfo = yield this.apiService.startSession().toPromise();
|
|
812
812
|
if (sessionInfo) {
|
|
813
|
-
this.
|
|
814
|
-
this.token = sessionInfo.sid;
|
|
815
|
-
this.saveTokenToLocalStorage();
|
|
816
|
-
this.setAuthenticationStatus();
|
|
817
|
-
this.setUpTokenForSessionService();
|
|
813
|
+
this.updateSessionInfo(sessionInfo);
|
|
818
814
|
}
|
|
819
815
|
return this.sessionInfoData;
|
|
820
816
|
});
|
|
@@ -837,28 +833,36 @@ class SmartSessionService {
|
|
|
837
833
|
if (!refreshToken) {
|
|
838
834
|
return yield this.startSession();
|
|
839
835
|
}
|
|
840
|
-
|
|
841
|
-
.refreshSession({
|
|
842
|
-
|
|
843
|
-
|
|
844
|
-
|
|
845
|
-
.catch((error) => __awaiter(this, void 0, void 0, function* () {
|
|
846
|
-
if (error.error &&
|
|
847
|
-
error.error.code &&
|
|
848
|
-
error.error.code === 'session.refreshtoken.invalid') {
|
|
849
|
-
yield this.startSession();
|
|
836
|
+
try {
|
|
837
|
+
const sessionInfo = yield lastValueFrom(this.apiService.refreshSession({ refreshToken }));
|
|
838
|
+
if (sessionInfo) {
|
|
839
|
+
this.updateSessionInfo(sessionInfo);
|
|
840
|
+
return sessionInfo;
|
|
850
841
|
}
|
|
851
|
-
}));
|
|
852
|
-
if (sessionInfo) {
|
|
853
|
-
this.sessionInfoData = sessionInfo;
|
|
854
|
-
this.token = sessionInfo.sid;
|
|
855
|
-
this.saveTokenToLocalStorage();
|
|
856
|
-
this.setAuthenticationStatus();
|
|
857
|
-
this.setUpTokenForSessionService();
|
|
858
842
|
}
|
|
859
|
-
|
|
843
|
+
catch (error) {
|
|
844
|
+
if (this.isInvalidRefreshTokenError(error)) {
|
|
845
|
+
this.clearAndStartNewSession();
|
|
846
|
+
// still throw the error, so the error can be handled in the caller
|
|
847
|
+
}
|
|
848
|
+
throw error;
|
|
849
|
+
}
|
|
850
|
+
// no sessionInfo returned
|
|
851
|
+
throw new Error('Unable to refresh session');
|
|
860
852
|
});
|
|
861
853
|
}
|
|
854
|
+
updateSessionInfo(sessionInfo) {
|
|
855
|
+
this.sessionInfoData = sessionInfo;
|
|
856
|
+
this.token = sessionInfo.sid;
|
|
857
|
+
this.saveTokenToLocalStorage();
|
|
858
|
+
this.setAuthenticationStatus();
|
|
859
|
+
this.setUpTokenForSessionService();
|
|
860
|
+
}
|
|
861
|
+
isInvalidRefreshTokenError(error) {
|
|
862
|
+
return (error instanceof HttpErrorResponse &&
|
|
863
|
+
error.error &&
|
|
864
|
+
error.error.code === 'session.refreshtoken.invalid');
|
|
865
|
+
}
|
|
862
866
|
getAuthenticationProviders() {
|
|
863
867
|
return __awaiter(this, void 0, void 0, function* () {
|
|
864
868
|
let providers = yield this.apiService
|
|
@@ -3233,52 +3237,68 @@ class SmartErrorCatchingInterceptor {
|
|
|
3233
3237
|
this.session = session;
|
|
3234
3238
|
this.sessionErrorCodes = [
|
|
3235
3239
|
{
|
|
3236
|
-
code:
|
|
3240
|
+
code: 'session.expired',
|
|
3237
3241
|
behaviour: SessionErrorBehaviour.REFRESH,
|
|
3238
3242
|
},
|
|
3239
3243
|
{
|
|
3240
|
-
code:
|
|
3244
|
+
code: 'session.refreshtoken.invalid',
|
|
3241
3245
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
3242
3246
|
},
|
|
3243
3247
|
{
|
|
3244
|
-
code:
|
|
3248
|
+
code: 'session.badrequest.missingtoken',
|
|
3245
3249
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
3246
3250
|
},
|
|
3247
3251
|
{
|
|
3248
|
-
code:
|
|
3252
|
+
code: 'session.security.nocontext',
|
|
3249
3253
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
3250
3254
|
},
|
|
3251
3255
|
{
|
|
3252
|
-
code:
|
|
3256
|
+
code: 'session.invalidsessionuri',
|
|
3253
3257
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
3254
3258
|
},
|
|
3255
3259
|
{
|
|
3256
|
-
code:
|
|
3260
|
+
code: 'session.notinitialized',
|
|
3257
3261
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
3258
3262
|
},
|
|
3259
3263
|
{
|
|
3260
|
-
code:
|
|
3264
|
+
code: 'session.viewcontext.missing',
|
|
3261
3265
|
behaviour: SessionErrorBehaviour.RESTART,
|
|
3262
3266
|
},
|
|
3263
3267
|
];
|
|
3264
3268
|
}
|
|
3265
3269
|
intercept(request, next) {
|
|
3266
|
-
return next
|
|
3267
|
-
|
|
3268
|
-
|
|
3269
|
-
|
|
3270
|
-
|
|
3271
|
-
|
|
3272
|
-
|
|
3273
|
-
|
|
3274
|
-
|
|
3275
|
-
|
|
3276
|
-
return next.handle(request);
|
|
3277
|
-
}
|
|
3278
|
-
|
|
3270
|
+
return next
|
|
3271
|
+
.handle(request)
|
|
3272
|
+
.pipe(catchError$1((error) => this.handleError(error, request, next)));
|
|
3273
|
+
}
|
|
3274
|
+
handleError(error, request, next) {
|
|
3275
|
+
if (this.isSessionError(error)) {
|
|
3276
|
+
const sessionError = this.getSessionError(error);
|
|
3277
|
+
if (sessionError) {
|
|
3278
|
+
return this.resolveError(sessionError).pipe(switchMap((resolved) => {
|
|
3279
|
+
if (resolved && sessionError.behaviour === SessionErrorBehaviour.REFRESH) {
|
|
3280
|
+
return next.handle(this.updateRequestHeaders(request));
|
|
3281
|
+
}
|
|
3282
|
+
return throwError(() => error);
|
|
3283
|
+
}), catchError$1((resolveError) => {
|
|
3284
|
+
// when the resolveError throws a restart error (in the refreshSession), rethrow the original error
|
|
3285
|
+
if (this.isSessionError(resolveError)) {
|
|
3286
|
+
const resolveSessionError = this.getSessionError(resolveError);
|
|
3287
|
+
if ((resolveSessionError === null || resolveSessionError === void 0 ? void 0 : resolveSessionError.behaviour) === SessionErrorBehaviour.RESTART) {
|
|
3288
|
+
return throwError(() => error);
|
|
3289
|
+
}
|
|
3290
|
+
}
|
|
3291
|
+
return throwError(() => resolveError);
|
|
3292
|
+
}));
|
|
3279
3293
|
}
|
|
3280
|
-
|
|
3281
|
-
|
|
3294
|
+
}
|
|
3295
|
+
return throwError(() => error);
|
|
3296
|
+
}
|
|
3297
|
+
isSessionError(error) {
|
|
3298
|
+
return error.status === 400 && error.error.code != null;
|
|
3299
|
+
}
|
|
3300
|
+
getSessionError(error) {
|
|
3301
|
+
return this.sessionErrorCodes.find((sessionError) => sessionError.code === error.error.code);
|
|
3282
3302
|
}
|
|
3283
3303
|
resolveError(sessionError) {
|
|
3284
3304
|
if (sessionError.behaviour === SessionErrorBehaviour.RESTART) {
|
|
@@ -3286,6 +3306,14 @@ class SmartErrorCatchingInterceptor {
|
|
|
3286
3306
|
}
|
|
3287
3307
|
return from(this.session.refreshSession());
|
|
3288
3308
|
}
|
|
3309
|
+
updateRequestHeaders(request) {
|
|
3310
|
+
this.session.headerParams.forEach((headerParam) => {
|
|
3311
|
+
request = request.clone({
|
|
3312
|
+
headers: request.headers.set(headerParam.headerName, headerParam.value),
|
|
3313
|
+
});
|
|
3314
|
+
});
|
|
3315
|
+
return request;
|
|
3316
|
+
}
|
|
3289
3317
|
}
|
|
3290
3318
|
SmartErrorCatchingInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartErrorCatchingInterceptor, deps: [{ token: SmartSessionService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
3291
3319
|
SmartErrorCatchingInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartErrorCatchingInterceptor });
|