@trudb/tru-common-lib 0.0.718 → 0.0.719
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/fesm2015/trudb-tru-common-lib.mjs +25 -30
- package/fesm2015/trudb-tru-common-lib.mjs.map +1 -1
- package/fesm2020/trudb-tru-common-lib.mjs +25 -30
- package/fesm2020/trudb-tru-common-lib.mjs.map +1 -1
- package/lib/components/login/services/tru-auth-interceptor.d.ts +1 -3
- 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==
|
|
@@ -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],
|