@myclub_se/data-access 3.1.14 → 3.1.15
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.
|
@@ -1,25 +1,31 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { map } from 'rxjs/operators';
|
|
3
3
|
import { REDIRECT_PARAM_NAME } from '../authentication.config';
|
|
4
|
+
import { loginTokenSuccessAction, setCurrentTokenAction } from "../../store";
|
|
4
5
|
import * as i0 from "@angular/core";
|
|
5
6
|
import * as i1 from "../authentication.service";
|
|
6
7
|
import * as i2 from "@angular/router";
|
|
8
|
+
import * as i3 from "@ngrx/store";
|
|
7
9
|
export class HandleGrantTokenGuard {
|
|
8
10
|
authenticationService;
|
|
9
11
|
router;
|
|
10
|
-
|
|
12
|
+
store;
|
|
13
|
+
constructor(authenticationService, router, store) {
|
|
11
14
|
this.authenticationService = authenticationService;
|
|
12
15
|
this.router = router;
|
|
16
|
+
this.store = store;
|
|
13
17
|
}
|
|
14
18
|
canActivate(route) {
|
|
15
|
-
return this.authenticationService.authenticateByToken(route.params['code']).pipe(map(() => {
|
|
19
|
+
return this.authenticationService.authenticateByToken(route.params['code']).pipe(map((token) => {
|
|
16
20
|
const redirectUrl = route.queryParamMap.get(REDIRECT_PARAM_NAME);
|
|
21
|
+
this.store.dispatch(loginTokenSuccessAction({ payload: token }));
|
|
22
|
+
this.store.dispatch(setCurrentTokenAction({ payload: token }));
|
|
17
23
|
return this.authenticationService.isAuthenticated && redirectUrl
|
|
18
24
|
? this.router.parseUrl(redirectUrl)
|
|
19
25
|
: false;
|
|
20
26
|
}));
|
|
21
27
|
}
|
|
22
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: HandleGrantTokenGuard, deps: [{ token: i1.AuthenticationService }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
28
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: HandleGrantTokenGuard, deps: [{ token: i1.AuthenticationService }, { token: i2.Router }, { token: i3.Store }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
23
29
|
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: HandleGrantTokenGuard, providedIn: 'root' });
|
|
24
30
|
}
|
|
25
31
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: HandleGrantTokenGuard, decorators: [{
|
|
@@ -27,5 +33,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
|
|
|
27
33
|
args: [{
|
|
28
34
|
providedIn: 'root'
|
|
29
35
|
}]
|
|
30
|
-
}], ctorParameters: () => [{ type: i1.AuthenticationService }, { type: i2.Router }] });
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
}], ctorParameters: () => [{ type: i1.AuthenticationService }, { type: i2.Router }, { type: i3.Store }] });
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFuZGxlLWdyYW50LXRva2VuLmd1YXJkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvZGF0YS1hY2Nlc3Mvc3JjL2xpYi9hdXRoZW50aWNhdGlvbi9ndWFyZHMvaGFuZGxlLWdyYW50LXRva2VuLmd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRXJDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRy9ELE9BQU8sRUFBQyx1QkFBdUIsRUFBRSxxQkFBcUIsRUFBQyxNQUFNLGFBQWEsQ0FBQzs7Ozs7QUFLM0UsTUFBTSxPQUFPLHFCQUFxQjtJQUNaO0lBQXNEO0lBQXdCO0lBQWxHLFlBQW9CLHFCQUE0QyxFQUFVLE1BQWMsRUFBVSxLQUFZO1FBQTFGLDBCQUFxQixHQUFyQixxQkFBcUIsQ0FBdUI7UUFBVSxXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQVUsVUFBSyxHQUFMLEtBQUssQ0FBTztJQUFHLENBQUM7SUFFbEgsV0FBVyxDQUFDLEtBQTZCO1FBQ3ZDLE9BQU8sSUFBSSxDQUFDLHFCQUFxQixDQUFDLG1CQUFtQixDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQzlFLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ1osTUFBTSxXQUFXLEdBQUcsS0FBSyxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsbUJBQW1CLENBQUMsQ0FBQztZQUNqRSxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyx1QkFBdUIsQ0FBQyxFQUFDLE9BQU8sRUFBRSxLQUFLLEVBQUMsQ0FBQyxDQUFDLENBQUM7WUFDL0QsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMscUJBQXFCLENBQUMsRUFBQyxPQUFPLEVBQUUsS0FBSyxFQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzdELE9BQU8sSUFBSSxDQUFDLHFCQUFxQixDQUFDLGVBQWUsSUFBSSxXQUFXO2dCQUM5RCxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDO2dCQUNuQyxDQUFDLENBQUMsS0FBSyxDQUFDO1FBQ1osQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7dUdBZFUscUJBQXFCOzJHQUFyQixxQkFBcUIsY0FGcEIsTUFBTTs7MkZBRVAscUJBQXFCO2tCQUhqQyxVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIENhbkFjdGl2YXRlLCBSb3V0ZXIgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG5pbXBvcnQgeyBSRURJUkVDVF9QQVJBTV9OQU1FIH0gZnJvbSAnLi4vYXV0aGVudGljYXRpb24uY29uZmlnJztcbmltcG9ydCB7IEF1dGhlbnRpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL2F1dGhlbnRpY2F0aW9uLnNlcnZpY2UnO1xuaW1wb3J0IHtTdG9yZX0gZnJvbSBcIkBuZ3J4L3N0b3JlXCI7XG5pbXBvcnQge2xvZ2luVG9rZW5TdWNjZXNzQWN0aW9uLCBzZXRDdXJyZW50VG9rZW5BY3Rpb259IGZyb20gXCIuLi8uLi9zdG9yZVwiO1xuXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBIYW5kbGVHcmFudFRva2VuR3VhcmQgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSB7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgYXV0aGVudGljYXRpb25TZXJ2aWNlOiBBdXRoZW50aWNhdGlvblNlcnZpY2UsIHByaXZhdGUgcm91dGVyOiBSb3V0ZXIsIHByaXZhdGUgc3RvcmU6IFN0b3JlKSB7fVxuXG4gIGNhbkFjdGl2YXRlKHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90KSB7XG4gICAgcmV0dXJuIHRoaXMuYXV0aGVudGljYXRpb25TZXJ2aWNlLmF1dGhlbnRpY2F0ZUJ5VG9rZW4ocm91dGUucGFyYW1zWydjb2RlJ10pLnBpcGUoXG4gICAgICBtYXAoKHRva2VuKSA9PiB7XG4gICAgICAgIGNvbnN0IHJlZGlyZWN0VXJsID0gcm91dGUucXVlcnlQYXJhbU1hcC5nZXQoUkVESVJFQ1RfUEFSQU1fTkFNRSk7XG4gICAgICAgIHRoaXMuc3RvcmUuZGlzcGF0Y2gobG9naW5Ub2tlblN1Y2Nlc3NBY3Rpb24oe3BheWxvYWQ6IHRva2VufSkpO1xuICAgICAgICB0aGlzLnN0b3JlLmRpc3BhdGNoKHNldEN1cnJlbnRUb2tlbkFjdGlvbih7cGF5bG9hZDogdG9rZW59KSk7XG4gICAgICAgIHJldHVybiB0aGlzLmF1dGhlbnRpY2F0aW9uU2VydmljZS5pc0F1dGhlbnRpY2F0ZWQgJiYgcmVkaXJlY3RVcmxcbiAgICAgICAgICA/IHRoaXMucm91dGVyLnBhcnNlVXJsKHJlZGlyZWN0VXJsKVxuICAgICAgICAgIDogZmFsc2U7XG4gICAgICB9KVxuICAgICk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -11123,19 +11123,23 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
|
|
|
11123
11123
|
class HandleGrantTokenGuard {
|
|
11124
11124
|
authenticationService;
|
|
11125
11125
|
router;
|
|
11126
|
-
|
|
11126
|
+
store;
|
|
11127
|
+
constructor(authenticationService, router, store) {
|
|
11127
11128
|
this.authenticationService = authenticationService;
|
|
11128
11129
|
this.router = router;
|
|
11130
|
+
this.store = store;
|
|
11129
11131
|
}
|
|
11130
11132
|
canActivate(route) {
|
|
11131
|
-
return this.authenticationService.authenticateByToken(route.params['code']).pipe(map(() => {
|
|
11133
|
+
return this.authenticationService.authenticateByToken(route.params['code']).pipe(map((token) => {
|
|
11132
11134
|
const redirectUrl = route.queryParamMap.get(REDIRECT_PARAM_NAME);
|
|
11135
|
+
this.store.dispatch(loginTokenSuccessAction({ payload: token }));
|
|
11136
|
+
this.store.dispatch(setCurrentTokenAction({ payload: token }));
|
|
11133
11137
|
return this.authenticationService.isAuthenticated && redirectUrl
|
|
11134
11138
|
? this.router.parseUrl(redirectUrl)
|
|
11135
11139
|
: false;
|
|
11136
11140
|
}));
|
|
11137
11141
|
}
|
|
11138
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: HandleGrantTokenGuard, deps: [{ token: AuthenticationService }, { token: i2$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
11142
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: HandleGrantTokenGuard, deps: [{ token: AuthenticationService }, { token: i2$1.Router }, { token: i1$2.Store }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
11139
11143
|
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: HandleGrantTokenGuard, providedIn: 'root' });
|
|
11140
11144
|
}
|
|
11141
11145
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: HandleGrantTokenGuard, decorators: [{
|
|
@@ -11143,7 +11147,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
|
|
|
11143
11147
|
args: [{
|
|
11144
11148
|
providedIn: 'root'
|
|
11145
11149
|
}]
|
|
11146
|
-
}], ctorParameters: () => [{ type: AuthenticationService }, { type: i2$1.Router }] });
|
|
11150
|
+
}], ctorParameters: () => [{ type: AuthenticationService }, { type: i2$1.Router }, { type: i1$2.Store }] });
|
|
11147
11151
|
|
|
11148
11152
|
class MaintenanceInterceptor {
|
|
11149
11153
|
maintenanceModeService;
|