@trudb/tru-common-lib 0.0.718 → 0.0.720
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/components/login/services/tru-auth-interceptor.mjs +9 -15
- package/esm2020/lib/components/login/services/tru-auth.mjs +3 -3
- package/esm2020/lib/components/toolbar/user-profile/tru-toolbar-user-profile.mjs +2 -2
- package/fesm2015/trudb-tru-common-lib.mjs +28 -33
- package/fesm2015/trudb-tru-common-lib.mjs.map +1 -1
- package/fesm2020/trudb-tru-common-lib.mjs +28 -33
- package/fesm2020/trudb-tru-common-lib.mjs.map +1 -1
- package/lib/components/login/services/tru-auth-interceptor.d.ts +1 -3
- package/lib/components/login/services/tru-auth.d.ts +1 -2
- package/package.json +1 -1
|
@@ -6,24 +6,21 @@ import * as i0 from "@angular/core";
|
|
|
6
6
|
import * as i1 from "./tru-auth";
|
|
7
7
|
import * as i2 from "../../../services/tru-app-environment";
|
|
8
8
|
import * as i3 from "../classes/tru-auth-jwt-strategy";
|
|
9
|
-
import * as i4 from "../classes/tru-auth-session-strategy";
|
|
10
|
-
// import { ConfigService } from "../config.service";
|
|
11
9
|
export class TruAuthInterceptor {
|
|
12
|
-
constructor(auth, appEnvironment, jwt
|
|
10
|
+
constructor(auth, appEnvironment, jwt) {
|
|
13
11
|
this.auth = auth;
|
|
14
12
|
this.appEnvironment = appEnvironment;
|
|
15
13
|
this.jwt = jwt;
|
|
16
|
-
this.session = session;
|
|
17
14
|
}
|
|
18
15
|
intercept(request, next) {
|
|
19
|
-
if (this.appEnvironment.authType === 'jwt')
|
|
16
|
+
if (this.appEnvironment.authType === 'jwt')
|
|
20
17
|
request = this.addToken(request, String(this.jwt.getToken()));
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
if (this.appEnvironment.authType === 'session')
|
|
19
|
+
request = request.clone({
|
|
20
|
+
withCredentials: true
|
|
21
|
+
});
|
|
25
22
|
return next.handle(request).pipe(catchError((error) => {
|
|
26
|
-
if (error.status === 401) {
|
|
23
|
+
if (error.status === 401 || error.status === 404) {
|
|
27
24
|
this.auth.doLogoutAndRedirectToLogin();
|
|
28
25
|
}
|
|
29
26
|
return throwError(error);
|
|
@@ -35,15 +32,12 @@ export class TruAuthInterceptor {
|
|
|
35
32
|
});
|
|
36
33
|
}
|
|
37
34
|
}
|
|
38
|
-
TruAuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, deps: [{ token: i1.TruAuth }, { token: i2.TruAppEnvironment }, { token: TRU_AUTH_STRATEGY }
|
|
35
|
+
TruAuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, deps: [{ token: i1.TruAuth }, { token: i2.TruAppEnvironment }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
39
36
|
TruAuthInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor });
|
|
40
37
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, decorators: [{
|
|
41
38
|
type: Injectable
|
|
42
39
|
}], ctorParameters: function () { return [{ type: i1.TruAuth }, { type: i2.TruAppEnvironment }, { type: i3.TruAuthJwtStrategy, decorators: [{
|
|
43
40
|
type: Inject,
|
|
44
41
|
args: [TRU_AUTH_STRATEGY]
|
|
45
|
-
}] }, { type: i4.TruAuthSessionStrategy, decorators: [{
|
|
46
|
-
type: Inject,
|
|
47
|
-
args: [TRU_AUTH_STRATEGY]
|
|
48
42
|
}] }]; } });
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtaW50ZXJjZXB0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90cnUtY29tbW9uLWxpYi9zcmMvbGliL2NvbXBvbmVudHMvbG9naW4vc2VydmljZXMvdHJ1LWF1dGgtaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFPbkQsT0FBTyxFQUFjLFVBQVUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUM5QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFJNUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7Ozs7O0FBSS9ELE1BQU0sT0FBTyxrQkFBa0I7SUFDN0IsWUFDVSxJQUFhLEVBQ2IsY0FBaUMsRUFDTixHQUF1QjtRQUZsRCxTQUFJLEdBQUosSUFBSSxDQUFTO1FBQ2IsbUJBQWMsR0FBZCxjQUFjLENBQW1CO1FBQ04sUUFBRyxHQUFILEdBQUcsQ0FBb0I7SUFDekQsQ0FBQztJQUVKLFNBQVMsQ0FDUCxPQUF5QixFQUN6QixJQUFpQjtRQUVqQixJQUFJLElBQUksQ0FBQyxjQUFjLENBQUMsUUFBUSxLQUFLLEtBQUs7WUFDeEMsT0FBTyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUVoRSxJQUFJLElBQUksQ0FBQyxjQUFjLENBQUMsUUFBUSxLQUFLLFNBQVM7WUFDNUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUM7Z0JBQ3RCLGVBQWUsRUFBRSxJQUFJO2FBQ3RCLENBQUMsQ0FBQztRQUVMLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQzlCLFVBQVUsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ25CLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxHQUFHLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxHQUFHLEVBQUU7Z0JBQ2hELElBQUksQ0FBQyxJQUFJLENBQUMsMEJBQTBCLEVBQUUsQ0FBQzthQUN4QztZQUNELE9BQU8sVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzNCLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDO0lBRU8sUUFBUSxDQUFDLE9BQXlCLEVBQUUsS0FBYTtRQUN2RCxPQUFPLE9BQU8sQ0FBQyxLQUFLLENBQUM7WUFDbkIsVUFBVSxFQUFFLEVBQUUsYUFBYSxFQUFFLFVBQVUsS0FBSyxFQUFFLEVBQUU7U0FDakQsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzs7K0dBakNVLGtCQUFrQiwwRUFJbkIsaUJBQWlCO21IQUpoQixrQkFBa0I7MkZBQWxCLGtCQUFrQjtrQkFEOUIsVUFBVTs7MEJBS04sTUFBTTsyQkFBQyxpQkFBaUIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlLCBJbmplY3QgfSBmcm9tIFwiQGFuZ3VsYXIvY29yZVwiO1xyXG5pbXBvcnQge1xyXG4gIEh0dHBSZXF1ZXN0LFxyXG4gIEh0dHBIYW5kbGVyLFxyXG4gIEh0dHBFdmVudCxcclxuICBIdHRwSW50ZXJjZXB0b3IsXHJcbn0gZnJvbSBcIkBhbmd1bGFyL2NvbW1vbi9odHRwXCI7XHJcbmltcG9ydCB7IE9ic2VydmFibGUsIHRocm93RXJyb3IgfSBmcm9tIFwicnhqc1wiO1xyXG5pbXBvcnQgeyBjYXRjaEVycm9yIH0gZnJvbSBcInJ4anMvb3BlcmF0b3JzXCI7XHJcblxyXG5pbXBvcnQgeyBUcnVBdXRoIH0gZnJvbSBcIi4vdHJ1LWF1dGhcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aEp3dFN0cmF0ZWd5IH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtand0LXN0cmF0ZWd5XCI7XHJcbmltcG9ydCB7IFRSVV9BVVRIX1NUUkFURUdZIH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtY29uZmlnXCI7XHJcbmltcG9ydCB7IFRydUFwcEVudmlyb25tZW50IH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS1hcHAtZW52aXJvbm1lbnRcIjtcclxuXHJcbkBJbmplY3RhYmxlKClcclxuZXhwb3J0IGNsYXNzIFRydUF1dGhJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XHJcbiAgY29uc3RydWN0b3IoXHJcbiAgICBwcml2YXRlIGF1dGg6IFRydUF1dGgsXHJcbiAgICBwcml2YXRlIGFwcEVudmlyb25tZW50OiBUcnVBcHBFbnZpcm9ubWVudCxcclxuICAgIEBJbmplY3QoVFJVX0FVVEhfU1RSQVRFR1kpIHByaXZhdGUgand0OiBUcnVBdXRoSnd0U3RyYXRlZ3lcclxuICApIHt9XHJcblxyXG4gIGludGVyY2VwdChcclxuICAgIHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sXHJcbiAgICBuZXh0OiBIdHRwSGFuZGxlclxyXG4gICk6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcclxuICAgIGlmICh0aGlzLmFwcEVudmlyb25tZW50LmF1dGhUeXBlID09PSAnand0JylcclxuICAgICAgcmVxdWVzdCA9IHRoaXMuYWRkVG9rZW4ocmVxdWVzdCwgU3RyaW5nKHRoaXMuand0LmdldFRva2VuKCkpKTtcclxuXHJcbiAgICBpZiAodGhpcy5hcHBFbnZpcm9ubWVudC5hdXRoVHlwZSA9PT0gJ3Nlc3Npb24nKVxyXG4gICAgICByZXF1ZXN0ID0gcmVxdWVzdC5jbG9uZSh7XHJcbiAgICAgICAgd2l0aENyZWRlbnRpYWxzOiB0cnVlXHJcbiAgICAgIH0pO1xyXG5cclxuICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KS5waXBlKFxyXG4gICAgICBjYXRjaEVycm9yKChlcnJvcikgPT4ge1xyXG4gICAgICAgIGlmIChlcnJvci5zdGF0dXMgPT09IDQwMSB8fCBlcnJvci5zdGF0dXMgPT09IDQwNCkge1xyXG4gICAgICAgICAgdGhpcy5hdXRoLmRvTG9nb3V0QW5kUmVkaXJlY3RUb0xvZ2luKCk7XHJcbiAgICAgICAgfVxyXG4gICAgICAgIHJldHVybiB0aHJvd0Vycm9yKGVycm9yKTtcclxuICAgICAgfSlcclxuICAgICk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIGFkZFRva2VuKHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIHRva2VuOiBzdHJpbmcpIHtcclxuICAgIHJldHVybiByZXF1ZXN0LmNsb25lKHtcclxuICAgICAgc2V0SGVhZGVyczogeyBBdXRob3JpemF0aW9uOiBgQmVhcmVyICR7dG9rZW59YCB9LFxyXG4gICAgfSk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -32,9 +32,9 @@ export class TruAuth {
|
|
|
32
32
|
setUser() {
|
|
33
33
|
this.auth.setUser(this.user);
|
|
34
34
|
}
|
|
35
|
-
logout(
|
|
35
|
+
logout() {
|
|
36
36
|
return this.http
|
|
37
|
-
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/logout`,
|
|
37
|
+
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/logout`, null)
|
|
38
38
|
.pipe(tap(() => {
|
|
39
39
|
this.doLogoutAndRedirectToLogin();
|
|
40
40
|
}));
|
|
@@ -74,4 +74,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
74
74
|
type: Inject,
|
|
75
75
|
args: [TRU_AUTH_STRATEGY]
|
|
76
76
|
}] }]; } });
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90cnUtY29tbW9uLWxpYi9zcmMvbGliL2NvbXBvbmVudHMvbG9naW4vc2VydmljZXMvdHJ1LWF1dGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFJbkQsT0FBTyxFQUFFLGVBQWUsRUFBYyxNQUFNLE1BQU0sQ0FBQztBQUduRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUUvRCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDN0QsT0FBTyxFQUFFLEdBQUcsRUFBOEIsTUFBTSxnQkFBZ0IsQ0FBQzs7Ozs7OztBQVVqRSxNQUFNLE9BQU8sT0FBTztJQUlsQixZQUNVLE1BQWMsRUFDZCxJQUFnQixFQUNoQixLQUFtQixFQUNuQixJQUFhLEVBQ2IsY0FBaUMsRUFDTixJQUEwQjtRQUxyRCxXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2QsU0FBSSxHQUFKLElBQUksQ0FBWTtRQUNoQixVQUFLLEdBQUwsS0FBSyxDQUFjO1FBQ25CLFNBQUksR0FBSixJQUFJLENBQVM7UUFDYixtQkFBYyxHQUFkLGNBQWMsQ0FBbUI7UUFDTixTQUFJLEdBQUosSUFBSSxDQUFzQjtRQVR2RCxhQUFRLEdBQUcsSUFBSSxlQUFlLENBQVUsS0FBSyxDQUFDLENBQUM7UUFDL0MsWUFBTyxHQUFXLEVBQUUsQ0FBQztRQVUzQixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDO0lBQzVDLENBQUM7SUFFRCxLQUFLLENBQUMsWUFBaUM7UUFDckMsT0FBTyxJQUFJLENBQUMsSUFBSTthQUNiLElBQUksQ0FBTSxHQUFHLElBQUksQ0FBQyxPQUFPLEdBQUcsZUFBZSxDQUFDLE9BQU8sUUFBUSxFQUFFLFlBQVksQ0FBQzthQUMxRSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDZixJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUM1QixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMzQixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ1YsQ0FBQztJQUVELE9BQU87UUFDTCxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVELE1BQU07UUFDSixPQUFPLElBQUksQ0FBQyxJQUFJO2FBQ2IsSUFBSSxDQUFNLEdBQUcsSUFBSSxDQUFDLE9BQU8sR0FBRyxlQUFlLENBQUMsT0FBTyxTQUFTLEVBQUUsSUFBSSxDQUFDO2FBQ25FLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFO1lBQ2IsSUFBSSxDQUFDLDBCQUEwQixFQUFFLENBQUM7UUFDcEMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNSLENBQUM7SUFFRCxVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUMsSUFBSTthQUNiLEdBQUcsQ0FBTSxHQUFHLElBQUksQ0FBQyxPQUFPLEdBQUcsZUFBZSxDQUFDLE9BQU8sYUFBYSxDQUFDO2FBQzlELElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxVQUFVLEVBQUUsRUFBRTtZQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNuQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ1IsQ0FBQztJQUVELElBQUksVUFBVTtRQUNaLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRTtZQUN4QixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUM7U0FDNUM7UUFDRCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDdEMsQ0FBQztJQUVELDBCQUEwQjtRQUN4QixJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDcEIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDMUIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzdCLENBQUM7SUFFTyxZQUFZO1FBQ2xCLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDcEIsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN0QixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQzNCLENBQUM7O29HQTdEVSxPQUFPLHNKQVVSLGlCQUFpQjt3R0FWaEIsT0FBTyxjQUZOLE1BQU07MkZBRVAsT0FBTztrQkFIbkIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkI7OzBCQVdJLE1BQU07MkJBQUMsaUJBQWlCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSwgSW5qZWN0IH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIjtcclxuaW1wb3J0IHsgSHR0cENsaWVudCB9IGZyb20gXCJAYW5ndWxhci9jb21tb24vaHR0cFwiO1xyXG5pbXBvcnQgeyBSb3V0ZXIgfSBmcm9tIFwiQGFuZ3VsYXIvcm91dGVyXCI7XHJcbmltcG9ydCB7IE9ic2VydmFibGUsIG9mIH0gZnJvbSBcInJ4anNcIjtcclxuaW1wb3J0IHsgQmVoYXZpb3JTdWJqZWN0LCB0aHJvd0Vycm9yIH0gZnJvbSBcInJ4anNcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aExvZ2luUmVxdWVzdCB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLWxvZ2luLXJlcXVlc3RcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aENhY2hlIH0gZnJvbSBcIi4vdHJ1LWF1dGgtY2FjaGVcIjtcclxuaW1wb3J0IHsgVFJVX0FVVEhfU1RSQVRFR1kgfSBmcm9tIFwiLi4vY2xhc3Nlcy90cnUtYXV0aC1jb25maWdcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aFN0cmF0ZWd5IH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtY29uZmlnXCI7XHJcbmltcG9ydCB7IFRSVV9BVVRIX0NPTkZJRyB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLWNvbmZpZ1wiO1xyXG5pbXBvcnQgeyB0YXAsIG1hcCwgY2F0Y2hFcnJvciwgc3dpdGNoTWFwIH0gZnJvbSBcInJ4anMvb3BlcmF0b3JzXCI7XHJcbmltcG9ydCB7IElUcnVVc2VyLCBUcnVVc2VyIH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS11c2VyXCI7XHJcbmltcG9ydCB7IFRydUFwcEVudmlyb25tZW50IH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS1hcHAtZW52aXJvbm1lbnRcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aFVzZXJSZXF1ZXN0IH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtdXNlci1yZXF1ZXN0XCI7XHJcbmltcG9ydCB7IGZsYXRNYXAgfSBmcm9tIFwibG9kYXNoXCI7XHJcbmltcG9ydCB7IFRydUF1dGhMb2dvdXRSZXF1ZXN0IH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtbG9nb3V0LXJlcXVlc3RcIjtcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICBwcm92aWRlZEluOiBcInJvb3RcIixcclxufSlcclxuZXhwb3J0IGNsYXNzIFRydUF1dGgge1xyXG4gIHByaXZhdGUgbG9nZ2VkSW4gPSBuZXcgQmVoYXZpb3JTdWJqZWN0PGJvb2xlYW4+KGZhbHNlKTtcclxuICBwcml2YXRlIGJhc2VVcmw6IHN0cmluZyA9ICcnO1xyXG5cclxuICBjb25zdHJ1Y3RvcihcclxuICAgIHByaXZhdGUgcm91dGVyOiBSb3V0ZXIsXHJcbiAgICBwcml2YXRlIGh0dHA6IEh0dHBDbGllbnQsXHJcbiAgICBwcml2YXRlIGNhY2hlOiBUcnVBdXRoQ2FjaGUsXHJcbiAgICBwcml2YXRlIHVzZXI6IFRydVVzZXIsXHJcbiAgICBwcml2YXRlIGFwcEVudmlyb25tZW50OiBUcnVBcHBFbnZpcm9ubWVudCxcclxuICAgIEBJbmplY3QoVFJVX0FVVEhfU1RSQVRFR1kpIHByaXZhdGUgYXV0aDogVHJ1QXV0aFN0cmF0ZWd5PGFueT5cclxuICApIHtcclxuICAgIHRoaXMuYmFzZVVybCA9IHRoaXMuYXBwRW52aXJvbm1lbnQuYXBwVXJpO1xyXG4gIH1cclxuXHJcbiAgbG9naW4obG9naW5SZXF1ZXN0OiBUcnVBdXRoTG9naW5SZXF1ZXN0KTogT2JzZXJ2YWJsZTxhbnk+IHtcclxuICAgIHJldHVybiB0aGlzLmh0dHBcclxuICAgICAgLnBvc3Q8YW55PihgJHt0aGlzLmJhc2VVcmx9JHtUUlVfQVVUSF9DT05GSUcuYXV0aFVybH0vbG9naW5gLCBsb2dpblJlcXVlc3QpXHJcbiAgICAgIC5waXBlKHRhcCgoZGF0YSkgPT4geyBcclxuICAgICAgICAgIHRoaXMuYXV0aC5kb0xvZ2luVXNlcihkYXRhKTtcclxuICAgICAgICAgIHRoaXMubG9nZ2VkSW4ubmV4dCh0cnVlKTtcclxuICAgICAgICB9KSk7XHJcbiAgfVxyXG5cclxuICBzZXRVc2VyKCkge1xyXG4gICAgdGhpcy5hdXRoLnNldFVzZXIodGhpcy51c2VyKTtcclxuICB9XHJcblxyXG4gIGxvZ291dCgpIHtcclxuICAgIHJldHVybiB0aGlzLmh0dHBcclxuICAgICAgLnBvc3Q8YW55PihgJHt0aGlzLmJhc2VVcmx9JHtUUlVfQVVUSF9DT05GSUcuYXV0aFVybH0vbG9nb3V0YCwgbnVsbClcclxuICAgICAgLnBpcGUodGFwKCgpID0+IHtcclxuICAgICAgICB0aGlzLmRvTG9nb3V0QW5kUmVkaXJlY3RUb0xvZ2luKCk7XHJcbiAgICAgIH0pKTtcclxuICB9XHJcblxyXG4gIHVzZXJDbGFpbXMoKSB7XHJcbiAgICByZXR1cm4gdGhpcy5odHRwXHJcbiAgICAgIC5nZXQ8YW55PihgJHt0aGlzLmJhc2VVcmx9JHtUUlVfQVVUSF9DT05GSUcuYXV0aFVybH0vdXNlckNsYWltc2ApXHJcbiAgICAgICAgLnBpcGUodGFwKCh1c2VyQ2xhaW1zKSA9PiB7XHJcbiAgICAgICAgICAgIHRoaXMudXNlci5jcmVhdGUodXNlckNsYWltcyk7XHJcbiAgICAgIH0pKTtcclxuICB9XHJcblxyXG4gIGdldCBpc0xvZ2dlZEluKCkge1xyXG4gICAgaWYgKCF0aGlzLmxvZ2dlZEluLnZhbHVlKSB7XHJcbiAgICAgIHRoaXMubG9nZ2VkSW4ubmV4dCh0aGlzLmF1dGguaXNMb2dnZWRJbigpKTtcclxuICAgIH1cclxuICAgIHJldHVybiB0aGlzLmxvZ2dlZEluLmFzT2JzZXJ2YWJsZSgpO1xyXG4gIH1cclxuXHJcbiAgZG9Mb2dvdXRBbmRSZWRpcmVjdFRvTG9naW4oKSB7XHJcbiAgICB0aGlzLmRvTG9nb3V0VXNlcigpO1xyXG4gICAgdGhpcy5sb2dnZWRJbi5uZXh0KGZhbHNlKTtcclxuICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKFtcIlwiXSk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIGRvTG9nb3V0VXNlcigpIHtcclxuICAgIHRoaXMudXNlci5kZXN0cm95KCk7XHJcbiAgICB0aGlzLmNhY2hlLnBydW5lQWxsKCk7XHJcbiAgICB0aGlzLmF1dGguZG9Mb2dvdXRVc2VyKCk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -19,7 +19,7 @@ export class TruToolbarUserProfile {
|
|
|
19
19
|
this.uiNotification.changePassword();
|
|
20
20
|
};
|
|
21
21
|
this.onLogoutButtonClicked = () => {
|
|
22
|
-
this.auth.logout(
|
|
22
|
+
this.auth.logout();
|
|
23
23
|
};
|
|
24
24
|
this.initial = user?.firstName ? user?.firstName.slice(0, 1).toUpperCase() : user?.username?.slice(0, 1).toUpperCase();
|
|
25
25
|
this.name = user?.firstName && user?.lastName ? user?.firstName + ' ' + user?.lastName : user?.username;
|
|
@@ -32,4 +32,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
32
32
|
type: Component,
|
|
33
33
|
args: [{ selector: 'tru-toolbar-user-profile', encapsulation: ViewEncapsulation.None, template: "<div class=\"tru-toolbar-user-profile\">\r\n <button mat-mini-fab color=\"primary\" class=\"tru-toolbar-user-profile-user-button\" [matMenuTriggerFor]=\"userMenu\">\r\n {{initial}}\r\n </button>\r\n</div>\r\n<mat-menu #userMenu=\"matMenu\">\r\n <div class=\"tru-toolbar-user-profile-menu-container\">\r\n <mat-icon class=\"tru-toolbar-user-profile-menu-circle-icon\" [svgIcon]=\"'circle-icon'\"></mat-icon>\r\n <span class=\"tru-toolbar-user-profile-menu-circle-icon-text\">{{initial}}</span>\r\n <div class=\"tru-toolbar-user-profile-menu-text-container\">\r\n <p>{{name}}</p>\r\n <p *ngIf=\"email\">{{email}}</p>\r\n </div>\r\n <button mat-menu-item\r\n (click)=\"onChangePasswordButtonClicked()\"\r\n class=\"tru-toolbar-user-profile-menu-logout-button\">\r\n Change Password\r\n </button>\r\n <button mat-menu-item\r\n (click)=\"onLogoutButtonClicked()\"\r\n class=\"tru-toolbar-user-profile-menu-logout-button\">\r\n Logout\r\n </button>\r\n </div>\r\n</mat-menu>\r\n", styles: [".tru-toolbar-user-profile{height:25px;float:right}.tru-toolbar-user-profile button{height:23px;width:23px;margin-right:10px;margin-top:1px;font-size:12px;box-shadow:none}.tru-toolbar-user-profile-menu-container{width:250px}.tru-toolbar-user-profile-menu-container mat-icon{height:50px;width:50px;margin:auto;display:flex;justify-content:center;color:#006dcc}.tru-toolbar-user-profile-menu-container p{margin:5px;font-size:14px;text-align:center}.tru-toolbar-user-profile-menu-container .tru-toolbar-user-profile-menu-logout-button{display:flex;justify-content:center}.tru-toolbar-user-profile-menu-text-container{margin-top:-15px}.tru-toolbar-user-profile-menu-circle-icon-text{color:#fff;font-weight:200;font-size:30px;margin-right:12px;display:block;margin-left:12px;display:flex;justify-content:center;position:relative;z-index:100;top:-35px}\n"] }]
|
|
34
34
|
}], ctorParameters: function () { return [{ type: i1.TruUser }, { type: i2.TruAuth }, { type: i3.TruUiNotification }]; } });
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jb21wb25lbnRzL3Rvb2xiYXIvdXNlci1wcm9maWxlL3RydS10b29sYmFyLXVzZXItcHJvZmlsZS50cyIsIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3RydS1jb21tb24tbGliL3NyYy9saWIvY29tcG9uZW50cy90b29sYmFyL3VzZXItcHJvZmlsZS90cnUtdG9vbGJhci11c2VyLXByb2ZpbGUuaHRtbCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sZUFBZSxDQUFDOzs7Ozs7Ozs7QUFZN0QsTUFBTSxPQUFPLHFCQUFxQjtJQUtoQyxZQUNVLElBQWEsRUFDYixJQUFhLEVBQ2IsY0FBaUM7UUFGakMsU0FBSSxHQUFKLElBQUksQ0FBUztRQUNiLFNBQUksR0FBSixJQUFJLENBQVM7UUFDYixtQkFBYyxHQUFkLGNBQWMsQ0FBbUI7UUFQM0MsWUFBTyxHQUE4QixJQUFJLENBQUM7UUFDMUMsU0FBSSxHQUE4QixJQUFJLENBQUM7UUFDdkMsVUFBSyxHQUE4QixJQUFJLENBQUM7UUFXeEMsa0NBQTZCLEdBQUcsR0FBRyxFQUFFO1lBQ25DLElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDdkMsQ0FBQyxDQUFBO1FBRUQsMEJBQXFCLEdBQUcsR0FBRyxFQUFFO1lBQzNCLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDckIsQ0FBQyxDQUFBO1FBWEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQTtRQUN0SCxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksRUFBRSxTQUFTLElBQUksSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLFNBQVMsR0FBRyxHQUFHLEdBQUcsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQztRQUN4RyxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksRUFBRSxLQUFLLENBQUM7SUFDM0IsQ0FBQzs7a0hBWlUscUJBQXFCO3NHQUFyQixxQkFBcUIsZ0VDWmxDLDZpQ0F5QkE7MkZEYmEscUJBQXFCO2tCQU5qQyxTQUFTOytCQUNFLDBCQUEwQixpQkFHckIsaUJBQWlCLENBQUMsSUFBSSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbXBvbmVudCwgVmlld0VuY2Fwc3VsYXRpb24gfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgVHJ1VWlOb3RpZmljYXRpb24gfSBmcm9tICcuLi8uLi8uLi9zZXJ2aWNlcy90cnUtdWktbm90aWZpY2F0aW9uJztcclxuaW1wb3J0IHsgVHJ1VXNlciB9IGZyb20gJy4uLy4uLy4uL3NlcnZpY2VzL3RydS11c2VyJztcclxuaW1wb3J0IHsgVHJ1QXV0aCB9IGZyb20gJy4uLy4uL2xvZ2luL3NlcnZpY2VzL3RydS1hdXRoJztcclxuXHJcblxyXG5AQ29tcG9uZW50KHtcclxuICBzZWxlY3RvcjogJ3RydS10b29sYmFyLXVzZXItcHJvZmlsZScsXHJcbiAgdGVtcGxhdGVVcmw6ICcuL3RydS10b29sYmFyLXVzZXItcHJvZmlsZS5odG1sJyxcclxuICBzdHlsZVVybHM6IFsnLi90cnUtdG9vbGJhci11c2VyLXByb2ZpbGUuY3NzJ10sXHJcbiAgZW5jYXBzdWxhdGlvbjogVmlld0VuY2Fwc3VsYXRpb24uTm9uZVxyXG59KVxyXG5leHBvcnQgY2xhc3MgVHJ1VG9vbGJhclVzZXJQcm9maWxlIHtcclxuICBpbml0aWFsOiBzdHJpbmcgfCBudWxsIHwgdW5kZWZpbmVkID0gbnVsbDtcclxuICBuYW1lOiBzdHJpbmcgfCBudWxsIHwgdW5kZWZpbmVkID0gbnVsbDtcclxuICBlbWFpbDogc3RyaW5nIHwgbnVsbCB8IHVuZGVmaW5lZCA9IG51bGw7XHJcblxyXG4gIGNvbnN0cnVjdG9yKFxyXG4gICAgcHJpdmF0ZSB1c2VyOiBUcnVVc2VyLFxyXG4gICAgcHJpdmF0ZSBhdXRoOiBUcnVBdXRoLFxyXG4gICAgcHJpdmF0ZSB1aU5vdGlmaWNhdGlvbjogVHJ1VWlOb3RpZmljYXRpb24pIHtcclxuICAgIHRoaXMuaW5pdGlhbCA9IHVzZXI/LmZpcnN0TmFtZSA/IHVzZXI/LmZpcnN0TmFtZS5zbGljZSgwLCAxKS50b1VwcGVyQ2FzZSgpIDogdXNlcj8udXNlcm5hbWU/LnNsaWNlKDAsIDEpLnRvVXBwZXJDYXNlKClcclxuICAgIHRoaXMubmFtZSA9IHVzZXI/LmZpcnN0TmFtZSAmJiB1c2VyPy5sYXN0TmFtZSA/IHVzZXI/LmZpcnN0TmFtZSArICcgJyArIHVzZXI/Lmxhc3ROYW1lIDogdXNlcj8udXNlcm5hbWU7XHJcbiAgICB0aGlzLmVtYWlsID0gdXNlcj8uZW1haWw7XHJcbiAgfVxyXG5cclxuICBvbkNoYW5nZVBhc3N3b3JkQnV0dG9uQ2xpY2tlZCA9ICgpID0+IHtcclxuICAgIHRoaXMudWlOb3RpZmljYXRpb24uY2hhbmdlUGFzc3dvcmQoKTtcclxuICB9XHJcblxyXG4gIG9uTG9nb3V0QnV0dG9uQ2xpY2tlZCA9ICgpID0+IHtcclxuICAgIHRoaXMuYXV0aC5sb2dvdXQoKTtcclxuICB9XHJcbn1cclxuIiwiPGRpdiBjbGFzcz1cInRydS10b29sYmFyLXVzZXItcHJvZmlsZVwiPlxyXG4gIDxidXR0b24gbWF0LW1pbmktZmFiIGNvbG9yPVwicHJpbWFyeVwiIGNsYXNzPVwidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLXVzZXItYnV0dG9uXCIgW21hdE1lbnVUcmlnZ2VyRm9yXT1cInVzZXJNZW51XCI+XHJcbiAgICB7e2luaXRpYWx9fVxyXG4gIDwvYnV0dG9uPlxyXG48L2Rpdj5cclxuPG1hdC1tZW51ICN1c2VyTWVudT1cIm1hdE1lbnVcIj5cclxuICA8ZGl2IGNsYXNzPVwidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLW1lbnUtY29udGFpbmVyXCI+XHJcbiAgICA8bWF0LWljb24gY2xhc3M9XCJ0cnUtdG9vbGJhci11c2VyLXByb2ZpbGUtbWVudS1jaXJjbGUtaWNvblwiIFtzdmdJY29uXT1cIidjaXJjbGUtaWNvbidcIj48L21hdC1pY29uPlxyXG4gICAgPHNwYW4gY2xhc3M9XCJ0cnUtdG9vbGJhci11c2VyLXByb2ZpbGUtbWVudS1jaXJjbGUtaWNvbi10ZXh0XCI+e3tpbml0aWFsfX08L3NwYW4+XHJcbiAgICA8ZGl2IGNsYXNzPVwidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLW1lbnUtdGV4dC1jb250YWluZXJcIj5cclxuICAgICAgPHA+e3tuYW1lfX08L3A+XHJcbiAgICAgIDxwICpuZ0lmPVwiZW1haWxcIj57e2VtYWlsfX08L3A+XHJcbiAgICA8L2Rpdj5cclxuICAgIDxidXR0b24gbWF0LW1lbnUtaXRlbVxyXG4gICAgICAgICAgICAoY2xpY2spPVwib25DaGFuZ2VQYXNzd29yZEJ1dHRvbkNsaWNrZWQoKVwiXHJcbiAgICAgICAgICAgIGNsYXNzPVwidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLW1lbnUtbG9nb3V0LWJ1dHRvblwiPlxyXG4gICAgICBDaGFuZ2UgUGFzc3dvcmRcclxuICAgIDwvYnV0dG9uPlxyXG4gICAgPGJ1dHRvbiBtYXQtbWVudS1pdGVtXHJcbiAgICAgICAgICAgIChjbGljayk9XCJvbkxvZ291dEJ1dHRvbkNsaWNrZWQoKVwiXHJcbiAgICAgICAgICAgIGNsYXNzPVwidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLW1lbnUtbG9nb3V0LWJ1dHRvblwiPlxyXG4gICAgICBMb2dvdXRcclxuICAgIDwvYnV0dG9uPlxyXG4gIDwvZGl2PlxyXG48L21hdC1tZW51PlxyXG4iXX0=
|
|
@@ -3742,9 +3742,9 @@ class TruAuth {
|
|
|
3742
3742
|
setUser() {
|
|
3743
3743
|
this.auth.setUser(this.user);
|
|
3744
3744
|
}
|
|
3745
|
-
logout(
|
|
3745
|
+
logout() {
|
|
3746
3746
|
return this.http
|
|
3747
|
-
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/logout`,
|
|
3747
|
+
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/logout`, null)
|
|
3748
3748
|
.pipe(tap(() => {
|
|
3749
3749
|
this.doLogoutAndRedirectToLogin();
|
|
3750
3750
|
}));
|
|
@@ -3800,7 +3800,7 @@ class TruToolbarUserProfile {
|
|
|
3800
3800
|
this.uiNotification.changePassword();
|
|
3801
3801
|
};
|
|
3802
3802
|
this.onLogoutButtonClicked = () => {
|
|
3803
|
-
this.auth.logout(
|
|
3803
|
+
this.auth.logout();
|
|
3804
3804
|
};
|
|
3805
3805
|
this.initial = (user === null || user === void 0 ? void 0 : user.firstName) ? user === null || user === void 0 ? void 0 : user.firstName.slice(0, 1).toUpperCase() : (_a = user === null || user === void 0 ? void 0 : user.username) === null || _a === void 0 ? void 0 : _a.slice(0, 1).toUpperCase();
|
|
3806
3806
|
this.name = (user === null || user === void 0 ? void 0 : user.firstName) && (user === null || user === void 0 ? void 0 : user.lastName) ? (user === null || user === void 0 ? void 0 : user.firstName) + ' ' + (user === null || user === void 0 ? void 0 : user.lastName) : user === null || user === void 0 ? void 0 : user.username;
|
|
@@ -6059,40 +6059,21 @@ class TruAuthJwtStrategy {
|
|
|
6059
6059
|
}
|
|
6060
6060
|
}
|
|
6061
6061
|
|
|
6062
|
-
class TruAuthSessionStrategy {
|
|
6063
|
-
constructor(http) {
|
|
6064
|
-
this.http = http;
|
|
6065
|
-
}
|
|
6066
|
-
doLoginUser(user) {
|
|
6067
|
-
this.loggedUser = user;
|
|
6068
|
-
}
|
|
6069
|
-
doLogoutUser() {
|
|
6070
|
-
this.loggedUser = undefined;
|
|
6071
|
-
}
|
|
6072
|
-
setUser(user) {
|
|
6073
|
-
}
|
|
6074
|
-
isLoggedIn() {
|
|
6075
|
-
return false; //todo, implement this
|
|
6076
|
-
}
|
|
6077
|
-
}
|
|
6078
|
-
|
|
6079
|
-
// import { ConfigService } from "../config.service";
|
|
6080
6062
|
class TruAuthInterceptor {
|
|
6081
|
-
constructor(auth, appEnvironment, jwt
|
|
6063
|
+
constructor(auth, appEnvironment, jwt) {
|
|
6082
6064
|
this.auth = auth;
|
|
6083
6065
|
this.appEnvironment = appEnvironment;
|
|
6084
6066
|
this.jwt = jwt;
|
|
6085
|
-
this.session = session;
|
|
6086
6067
|
}
|
|
6087
6068
|
intercept(request, next) {
|
|
6088
|
-
if (this.appEnvironment.authType === 'jwt')
|
|
6069
|
+
if (this.appEnvironment.authType === 'jwt')
|
|
6089
6070
|
request = this.addToken(request, String(this.jwt.getToken()));
|
|
6090
|
-
|
|
6091
|
-
|
|
6092
|
-
|
|
6093
|
-
|
|
6071
|
+
if (this.appEnvironment.authType === 'session')
|
|
6072
|
+
request = request.clone({
|
|
6073
|
+
withCredentials: true
|
|
6074
|
+
});
|
|
6094
6075
|
return next.handle(request).pipe(catchError((error) => {
|
|
6095
|
-
if (error.status === 401) {
|
|
6076
|
+
if (error.status === 401 || error.status === 404) {
|
|
6096
6077
|
this.auth.doLogoutAndRedirectToLogin();
|
|
6097
6078
|
}
|
|
6098
6079
|
return throwError(error);
|
|
@@ -6104,7 +6085,7 @@ class TruAuthInterceptor {
|
|
|
6104
6085
|
});
|
|
6105
6086
|
}
|
|
6106
6087
|
}
|
|
6107
|
-
TruAuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, deps: [{ token: TruAuth }, { token: TruAppEnvironment }, { token: TRU_AUTH_STRATEGY }
|
|
6088
|
+
TruAuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, deps: [{ token: TruAuth }, { token: TruAppEnvironment }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
6108
6089
|
TruAuthInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor });
|
|
6109
6090
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, decorators: [{
|
|
6110
6091
|
type: Injectable
|
|
@@ -6112,12 +6093,26 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
6112
6093
|
return [{ type: TruAuth }, { type: TruAppEnvironment }, { type: TruAuthJwtStrategy, decorators: [{
|
|
6113
6094
|
type: Inject,
|
|
6114
6095
|
args: [TRU_AUTH_STRATEGY]
|
|
6115
|
-
}] }, { type: TruAuthSessionStrategy, decorators: [{
|
|
6116
|
-
type: Inject,
|
|
6117
|
-
args: [TRU_AUTH_STRATEGY]
|
|
6118
6096
|
}] }];
|
|
6119
6097
|
} });
|
|
6120
6098
|
|
|
6099
|
+
class TruAuthSessionStrategy {
|
|
6100
|
+
constructor(http) {
|
|
6101
|
+
this.http = http;
|
|
6102
|
+
}
|
|
6103
|
+
doLoginUser(user) {
|
|
6104
|
+
this.loggedUser = user;
|
|
6105
|
+
}
|
|
6106
|
+
doLogoutUser() {
|
|
6107
|
+
this.loggedUser = undefined;
|
|
6108
|
+
}
|
|
6109
|
+
setUser(user) {
|
|
6110
|
+
}
|
|
6111
|
+
isLoggedIn() {
|
|
6112
|
+
return false; //todo, implement this
|
|
6113
|
+
}
|
|
6114
|
+
}
|
|
6115
|
+
|
|
6121
6116
|
const TruAuthStrategyProvider = {
|
|
6122
6117
|
provide: TRU_AUTH_STRATEGY,
|
|
6123
6118
|
deps: [HttpClient, TruAppEnvironment],
|