@daffodil/auth 0.61.0 → 0.62.0
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/driver/in-memory/package.json +1 -1
- package/driver/magento/package.json +1 -1
- package/driver/package.json +1 -1
- package/driver/testing/package.json +1 -1
- package/esm2020/routing/effects/redirect.effects.mjs +2 -8
- package/esm2020/routing/guards/guest-only.guard.mjs +2 -2
- package/esm2020/routing/guards/member-only.guard.mjs +2 -2
- package/esm2020/routing/helpers/public_api.mjs +2 -0
- package/esm2020/routing/helpers/redirect-unauthenticated-hook-factory.mjs +16 -0
- package/esm2020/routing/public_api.mjs +2 -1
- package/esm2020/routing/redirect.module.mjs +20 -3
- package/esm2020/state/actions/auth.actions.mjs +3 -2
- package/esm2020/state/effects/auth.effects.mjs +12 -9
- package/esm2020/state/injection-tokens/unauthenticated/hook.token.mjs +6 -5
- package/esm2020/state/injection-tokens/unauthenticated/hook.type.mjs +2 -0
- package/esm2020/state/injection-tokens/unauthenticated/hooks.token.mjs +2 -3
- package/esm2020/state/injection-tokens/unauthenticated/public_api.mjs +1 -1
- package/fesm2015/daffodil-auth-routing.mjs +35 -13
- package/fesm2015/daffodil-auth-routing.mjs.map +1 -1
- package/fesm2015/daffodil-auth-state.mjs +20 -17
- package/fesm2015/daffodil-auth-state.mjs.map +1 -1
- package/fesm2020/daffodil-auth-routing.mjs +35 -13
- package/fesm2020/daffodil-auth-routing.mjs.map +1 -1
- package/fesm2020/daffodil-auth-state.mjs +19 -16
- package/fesm2020/daffodil-auth-state.mjs.map +1 -1
- package/package.json +1 -1
- package/routing/effects/redirect.effects.d.ts +0 -2
- package/routing/helpers/public_api.d.ts +1 -0
- package/routing/helpers/redirect-unauthenticated-hook-factory.d.ts +4 -0
- package/routing/package.json +1 -1
- package/routing/public_api.d.ts +1 -0
- package/state/actions/auth.actions.d.ts +2 -0
- package/state/effects/auth.effects.d.ts +2 -1
- package/state/injection-tokens/unauthenticated/hook.token.d.ts +2 -1
- package/state/injection-tokens/unauthenticated/hook.type.d.ts +9 -0
- package/state/injection-tokens/unauthenticated/hooks.token.d.ts +4 -4
- package/state/injection-tokens/unauthenticated/public_api.d.ts +1 -0
- package/state/package.json +1 -1
- package/state/testing/package.json +1 -1
- package/testing/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@daffodil/auth/driver/in-memory","module":"../../fesm2015/daffodil-auth-driver-in-memory.mjs","es2020":"../../fesm2020/daffodil-auth-driver-in-memory.mjs","esm2020":"../../esm2020/driver/in-memory/daffodil-auth-driver-in-memory.mjs","fesm2020":"../../fesm2020/daffodil-auth-driver-in-memory.mjs","fesm2015":"../../fesm2015/daffodil-auth-driver-in-memory.mjs","typings":"daffodil-auth-driver-in-memory.d.ts","sideEffects":false,"version":"0.
|
|
1
|
+
{"name":"@daffodil/auth/driver/in-memory","module":"../../fesm2015/daffodil-auth-driver-in-memory.mjs","es2020":"../../fesm2020/daffodil-auth-driver-in-memory.mjs","esm2020":"../../esm2020/driver/in-memory/daffodil-auth-driver-in-memory.mjs","fesm2020":"../../fesm2020/daffodil-auth-driver-in-memory.mjs","fesm2015":"../../fesm2015/daffodil-auth-driver-in-memory.mjs","typings":"daffodil-auth-driver-in-memory.d.ts","sideEffects":false,"version":"0.62.0"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@daffodil/auth/driver/magento","module":"../../fesm2015/daffodil-auth-driver-magento.mjs","es2020":"../../fesm2020/daffodil-auth-driver-magento.mjs","esm2020":"../../esm2020/driver/magento/daffodil-auth-driver-magento.mjs","fesm2020":"../../fesm2020/daffodil-auth-driver-magento.mjs","fesm2015":"../../fesm2015/daffodil-auth-driver-magento.mjs","typings":"daffodil-auth-driver-magento.d.ts","sideEffects":false,"version":"0.
|
|
1
|
+
{"name":"@daffodil/auth/driver/magento","module":"../../fesm2015/daffodil-auth-driver-magento.mjs","es2020":"../../fesm2020/daffodil-auth-driver-magento.mjs","esm2020":"../../esm2020/driver/magento/daffodil-auth-driver-magento.mjs","fesm2020":"../../fesm2020/daffodil-auth-driver-magento.mjs","fesm2015":"../../fesm2015/daffodil-auth-driver-magento.mjs","typings":"daffodil-auth-driver-magento.d.ts","sideEffects":false,"version":"0.62.0"}
|
package/driver/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@daffodil/auth/driver","module":"../fesm2015/daffodil-auth-driver.mjs","es2020":"../fesm2020/daffodil-auth-driver.mjs","esm2020":"../esm2020/driver/daffodil-auth-driver.mjs","fesm2020":"../fesm2020/daffodil-auth-driver.mjs","fesm2015":"../fesm2015/daffodil-auth-driver.mjs","typings":"daffodil-auth-driver.d.ts","sideEffects":false,"version":"0.
|
|
1
|
+
{"name":"@daffodil/auth/driver","module":"../fesm2015/daffodil-auth-driver.mjs","es2020":"../fesm2020/daffodil-auth-driver.mjs","esm2020":"../esm2020/driver/daffodil-auth-driver.mjs","fesm2020":"../fesm2020/daffodil-auth-driver.mjs","fesm2015":"../fesm2015/daffodil-auth-driver.mjs","typings":"daffodil-auth-driver.d.ts","sideEffects":false,"version":"0.62.0"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@daffodil/auth/driver/testing","module":"../../fesm2015/daffodil-auth-driver-testing.mjs","es2020":"../../fesm2020/daffodil-auth-driver-testing.mjs","esm2020":"../../esm2020/driver/testing/daffodil-auth-driver-testing.mjs","fesm2020":"../../fesm2020/daffodil-auth-driver-testing.mjs","fesm2015":"../../fesm2015/daffodil-auth-driver-testing.mjs","typings":"daffodil-auth-driver-testing.d.ts","sideEffects":false,"version":"0.
|
|
1
|
+
{"name":"@daffodil/auth/driver/testing","module":"../../fesm2015/daffodil-auth-driver-testing.mjs","es2020":"../../fesm2020/daffodil-auth-driver-testing.mjs","esm2020":"../../esm2020/driver/testing/daffodil-auth-driver-testing.mjs","fesm2020":"../../fesm2020/daffodil-auth-driver-testing.mjs","fesm2015":"../../fesm2015/daffodil-auth-driver-testing.mjs","typings":"daffodil-auth-driver-testing.d.ts","sideEffects":false,"version":"0.62.0"}
|
|
@@ -3,7 +3,7 @@ import { ActivatedRoute, Router, } from '@angular/router';
|
|
|
3
3
|
import { Actions, createEffect, ofType, } from '@ngrx/effects';
|
|
4
4
|
import { EMPTY } from 'rxjs';
|
|
5
5
|
import { filter, switchMap, tap, } from 'rxjs/operators';
|
|
6
|
-
import {
|
|
6
|
+
import { DaffAuthLoginActionTypes, DaffAuthRegisterActionTypes, DaffAuthResetPasswordActionTypes, } from '@daffodil/auth/state';
|
|
7
7
|
import { DAFF_AUTH_ROUTING_CONFIG, } from '../config/public_api';
|
|
8
8
|
import * as i0 from "@angular/core";
|
|
9
9
|
import * as i1 from "@ngrx/effects";
|
|
@@ -25,12 +25,6 @@ export class DaffAuthRedirectEffects {
|
|
|
25
25
|
}), tap((action) => {
|
|
26
26
|
this.router.navigateByUrl(this.route.snapshot.queryParamMap.get(this.config.redirectUrlParam) || this.config.authCompleteRedirectPath);
|
|
27
27
|
}), switchMap(() => EMPTY)), { dispatch: false });
|
|
28
|
-
this.redirectAfterLogout$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthLoginActionTypes.LogoutSuccessAction), tap((action) => {
|
|
29
|
-
this.router.navigateByUrl(this.route.snapshot.queryParamMap.get(this.config.redirectUrlParam) || this.config.logoutRedirectPath);
|
|
30
|
-
}), switchMap(() => EMPTY)), { dispatch: false });
|
|
31
|
-
this.redirectAfterExpiration$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.AuthCheckFailureAction, DaffAuthActionTypes.AuthGuardLogoutAction), tap(() => {
|
|
32
|
-
this.router.navigateByUrl(this.route.snapshot.queryParamMap.get(this.config.redirectUrlParam) || this.config.tokenExpirationRedirectPath);
|
|
33
|
-
}), switchMap(() => EMPTY)), { dispatch: false });
|
|
34
28
|
}
|
|
35
29
|
}
|
|
36
30
|
/** @nocollapse */ DaffAuthRedirectEffects.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRedirectEffects, deps: [{ token: i1.Actions }, { token: i2.Router }, { token: i2.ActivatedRoute }, { token: DAFF_AUTH_ROUTING_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -41,4 +35,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
41
35
|
type: Inject,
|
|
42
36
|
args: [DAFF_AUTH_ROUTING_CONFIG]
|
|
43
37
|
}] }]; } });
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXJlY3QuZWZmZWN0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9yb3V0aW5nL3NyYy9lZmZlY3RzL3JlZGlyZWN0LmVmZmVjdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLE1BQU0sRUFDTixVQUFVLEdBQ1gsTUFBTSxlQUFlLENBQUM7QUFDdkIsT0FBTyxFQUNMLGNBQWMsRUFDZCxNQUFNLEdBQ1AsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEVBQ0wsT0FBTyxFQUNQLFlBQVksRUFDWixNQUFNLEdBQ1AsTUFBTSxlQUFlLENBQUM7QUFDdkIsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEVBQ0wsTUFBTSxFQUNOLFNBQVMsRUFDVCxHQUFHLEdBQ0osTUFBTSxnQkFBZ0IsQ0FBQztBQUV4QixPQUFPLEVBR0wsd0JBQXdCLEVBRXhCLDJCQUEyQixFQUUzQixnQ0FBZ0MsR0FFakMsTUFBTSxzQkFBc0IsQ0FBQztBQUU5QixPQUFPLEVBRUwsd0JBQXdCLEdBQ3pCLE1BQU0sc0JBQXNCLENBQUM7Ozs7QUFFOUI7O0dBRUc7QUFFSCxNQUFNLE9BQU8sdUJBQXVCO0lBQ2xDLFlBQ1UsUUFBa0gsRUFDbEgsTUFBYyxFQUNkLEtBQXFCLEVBQ2EsTUFBNkI7UUFIL0QsYUFBUSxHQUFSLFFBQVEsQ0FBMEc7UUFDbEgsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUNkLFVBQUssR0FBTCxLQUFLLENBQWdCO1FBQ2EsV0FBTSxHQUFOLE1BQU0sQ0FBdUI7UUFHekUsa0NBQTZCLEdBQUcsWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUNuRSxNQUFNLENBQ0osd0JBQXdCLENBQUMsa0JBQWtCLEVBQzNDLDJCQUEyQixDQUFDLHFCQUFxQixFQUNqRCxnQ0FBZ0MsQ0FBQywwQkFBMEIsQ0FDNUQsRUFDRCxNQUFNLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtZQUNoQixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksS0FBSywyQkFBMkIsQ0FBQyxxQkFBcUIsSUFBSSxNQUFNLENBQUMsSUFBSSxLQUFLLGdDQUFnQyxDQUFDLDBCQUEwQixDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO2dCQUN2SyxPQUFPLEtBQUssQ0FBQzthQUNkO1lBQ0QsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDLENBQUMsRUFDRixHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtZQUNiLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsd0JBQXdCLENBQUMsQ0FBQztRQUN6SSxDQUFDLENBQUMsRUFDRixTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQ3ZCLEVBQUUsRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQWxCckIsQ0FBQzs7dUlBTk8sdUJBQXVCLDZGQUt4Qix3QkFBd0I7MklBTHZCLHVCQUF1QjsyRkFBdkIsdUJBQXVCO2tCQURuQyxVQUFVOzswQkFNTixNQUFNOzJCQUFDLHdCQUF3QiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEluamVjdCxcbiAgSW5qZWN0YWJsZSxcbn0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge1xuICBBY3RpdmF0ZWRSb3V0ZSxcbiAgUm91dGVyLFxufSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHtcbiAgQWN0aW9ucyxcbiAgY3JlYXRlRWZmZWN0LFxuICBvZlR5cGUsXG59IGZyb20gJ0BuZ3J4L2VmZmVjdHMnO1xuaW1wb3J0IHsgRU1QVFkgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7XG4gIGZpbHRlcixcbiAgc3dpdGNoTWFwLFxuICB0YXAsXG59IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcblxuaW1wb3J0IHtcbiAgRGFmZkF1dGhBY3Rpb25UeXBlcyxcbiAgRGFmZkF1dGhBY3Rpb25zLFxuICBEYWZmQXV0aExvZ2luQWN0aW9uVHlwZXMsXG4gIERhZmZBdXRoTG9naW5BY3Rpb25zLFxuICBEYWZmQXV0aFJlZ2lzdGVyQWN0aW9uVHlwZXMsXG4gIERhZmZBdXRoUmVnaXN0ZXJBY3Rpb25zLFxuICBEYWZmQXV0aFJlc2V0UGFzc3dvcmRBY3Rpb25UeXBlcyxcbiAgRGFmZkF1dGhSZXNldFBhc3N3b3JkQWN0aW9ucyxcbn0gZnJvbSAnQGRhZmZvZGlsL2F1dGgvc3RhdGUnO1xuXG5pbXBvcnQge1xuICBEYWZmQXV0aFJvdXRpbmdDb25maWcsXG4gIERBRkZfQVVUSF9ST1VUSU5HX0NPTkZJRyxcbn0gZnJvbSAnLi4vY29uZmlnL3B1YmxpY19hcGknO1xuXG4vKipcbiAqIFJlZGlyZWN0cyB0aGUgdXNlciB0byBjZXJ0YWluIHBhZ2VzIGJhc2VkIG9uIGNlcnRhaW4gYXV0aCBhY3Rpb25zLlxuICovXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgRGFmZkF1dGhSZWRpcmVjdEVmZmVjdHMge1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGFjdGlvbnMkOiBBY3Rpb25zPERhZmZBdXRoTG9naW5BY3Rpb25zIHwgRGFmZkF1dGhBY3Rpb25zIHwgRGFmZkF1dGhSZWdpc3RlckFjdGlvbnMgfCBEYWZmQXV0aFJlc2V0UGFzc3dvcmRBY3Rpb25zPixcbiAgICBwcml2YXRlIHJvdXRlcjogUm91dGVyLFxuICAgIHByaXZhdGUgcm91dGU6IEFjdGl2YXRlZFJvdXRlLFxuICAgIEBJbmplY3QoREFGRl9BVVRIX1JPVVRJTkdfQ09ORklHKSBwcml2YXRlIGNvbmZpZzogRGFmZkF1dGhSb3V0aW5nQ29uZmlnLFxuICApIHt9XG5cbiAgcmVkaXJlY3RBZnRlckxvZ2luT3JSZWdpc3RlciQgPSBjcmVhdGVFZmZlY3QoKCkgPT4gdGhpcy5hY3Rpb25zJC5waXBlKFxuICAgIG9mVHlwZShcbiAgICAgIERhZmZBdXRoTG9naW5BY3Rpb25UeXBlcy5Mb2dpblN1Y2Nlc3NBY3Rpb24sXG4gICAgICBEYWZmQXV0aFJlZ2lzdGVyQWN0aW9uVHlwZXMuUmVnaXN0ZXJTdWNjZXNzQWN0aW9uLFxuICAgICAgRGFmZkF1dGhSZXNldFBhc3N3b3JkQWN0aW9uVHlwZXMuUmVzZXRQYXNzd29yZFN1Y2Nlc3NBY3Rpb24sXG4gICAgKSxcbiAgICBmaWx0ZXIoKGFjdGlvbikgPT4ge1xuICAgICAgaWYgKChhY3Rpb24udHlwZSA9PT0gRGFmZkF1dGhSZWdpc3RlckFjdGlvblR5cGVzLlJlZ2lzdGVyU3VjY2Vzc0FjdGlvbiB8fCBhY3Rpb24udHlwZSA9PT0gRGFmZkF1dGhSZXNldFBhc3N3b3JkQWN0aW9uVHlwZXMuUmVzZXRQYXNzd29yZFN1Y2Nlc3NBY3Rpb24pICYmICFhY3Rpb24udG9rZW4pIHtcbiAgICAgICAgcmV0dXJuIGZhbHNlO1xuICAgICAgfVxuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfSksXG4gICAgdGFwKChhY3Rpb24pID0+IHtcbiAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlQnlVcmwodGhpcy5yb3V0ZS5zbmFwc2hvdC5xdWVyeVBhcmFtTWFwLmdldCh0aGlzLmNvbmZpZy5yZWRpcmVjdFVybFBhcmFtKSB8fCB0aGlzLmNvbmZpZy5hdXRoQ29tcGxldGVSZWRpcmVjdFBhdGgpO1xuICAgIH0pLFxuICAgIHN3aXRjaE1hcCgoKSA9PiBFTVBUWSksXG4gICksIHsgZGlzcGF0Y2g6IGZhbHNlIH0pO1xufVxuIl19
|
|
@@ -30,7 +30,7 @@ export class GuestOnlyGuard {
|
|
|
30
30
|
}
|
|
31
31
|
isUnauthenticated() {
|
|
32
32
|
return this.tokenCheck.check().pipe(map(() => false), catchError((error) => {
|
|
33
|
-
if (error.code === DaffAuthDriverErrorCodes.UNAUTHORIZED) {
|
|
33
|
+
if (error.code === DaffAuthDriverErrorCodes.UNAUTHORIZED || error.code === DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED) {
|
|
34
34
|
this.storage.removeAuthToken();
|
|
35
35
|
this.store.dispatch(new DaffAuthGuardLogout(this.errorMatcher(error)));
|
|
36
36
|
}
|
|
@@ -52,4 +52,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
52
52
|
type: Inject,
|
|
53
53
|
args: [DaffAuthGuestOnlyGuardRedirectUrl]
|
|
54
54
|
}] }]; } });
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3Vlc3Qtb25seS5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9yb3V0aW5nL3NyYy9ndWFyZHMvZ3Vlc3Qtb25seS5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsTUFBTSxFQUNOLFVBQVUsR0FDWCxNQUFNLGVBQWUsQ0FBQztBQUN2QixPQUFPLEVBRUwsTUFBTSxHQUNQLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNwQyxPQUFPLEVBRUwsRUFBRSxHQUNILE1BQU0sTUFBTSxDQUFDO0FBQ2QsT0FBTyxFQUNMLFVBQVUsRUFDVixHQUFHLEVBQ0gsR0FBRyxHQUNKLE1BQU0sZ0JBQWdCLENBQUM7QUFFeEIsT0FBTyxFQUNMLHVCQUF1QixFQUN2QixzQkFBc0IsR0FDdkIsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QixPQUFPLEVBQ0wsd0JBQXdCLEVBQ3hCLHdCQUF3QixHQUN6QixNQUFNLHVCQUF1QixDQUFDO0FBQy9CLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBSTNELE9BQU8sRUFBRSxpQ0FBaUMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDOzs7Ozs7QUFLdEYsTUFBTSxPQUFPLGNBQWM7SUFDekIsWUFDVSxVQUFvQyxFQUNwQyxPQUErQixFQUMvQixNQUFjLEVBQ2QsS0FBWSxFQUNxQixZQUE4QixFQUNwQixXQUFtQjtRQUw5RCxlQUFVLEdBQVYsVUFBVSxDQUEwQjtRQUNwQyxZQUFPLEdBQVAsT0FBTyxDQUF3QjtRQUMvQixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2QsVUFBSyxHQUFMLEtBQUssQ0FBTztRQUNxQixpQkFBWSxHQUFaLFlBQVksQ0FBa0I7UUFDcEIsZ0JBQVcsR0FBWCxXQUFXLENBQVE7SUFDckUsQ0FBQztJQUVKLFdBQVc7UUFDVCxPQUFPLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLElBQUksQ0FDbEMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQ1gsSUFBSSxDQUFDLE1BQU0sRUFBRTtnQkFDWCxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7YUFDN0M7UUFDSCxDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVPLGlCQUFpQjtRQUN2QixPQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUNqQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLEVBQ2hCLFVBQVUsQ0FBQyxDQUFDLEtBQWdCLEVBQUUsRUFBRTtZQUM5QixJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssd0JBQXdCLENBQUMsWUFBWSxJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssd0JBQXdCLENBQUMscUJBQXFCLEVBQUU7Z0JBQ3pILElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxFQUFFLENBQUM7Z0JBQy9CLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLElBQUksbUJBQW1CLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7YUFDeEU7WUFDRCxPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNsQixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQzs7OEhBL0JVLGNBQWMsMklBTWYsdUJBQXVCLGFBQ3ZCLGlDQUFpQztrSUFQaEMsY0FBYyxjQUZiLEtBQUs7MkZBRU4sY0FBYztrQkFIMUIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsS0FBSztpQkFDbEI7OzBCQU9JLE1BQU07MkJBQUMsdUJBQXVCOzswQkFDOUIsTUFBTTsyQkFBQyxpQ0FBaUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBJbmplY3QsXG4gIEluamVjdGFibGUsXG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtcbiAgQ2FuQWN0aXZhdGUsXG4gIFJvdXRlcixcbn0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IFN0b3JlIH0gZnJvbSAnQG5ncngvc3RvcmUnO1xuaW1wb3J0IHtcbiAgT2JzZXJ2YWJsZSxcbiAgb2YsXG59IGZyb20gJ3J4anMnO1xuaW1wb3J0IHtcbiAgY2F0Y2hFcnJvcixcbiAgbWFwLFxuICB0YXAsXG59IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcblxuaW1wb3J0IHtcbiAgREFGRl9BVVRIX0VSUk9SX01BVENIRVIsXG4gIERhZmZBdXRoU3RvcmFnZVNlcnZpY2UsXG59IGZyb20gJ0BkYWZmb2RpbC9hdXRoJztcbmltcG9ydCB7XG4gIERhZmZBdXRoRHJpdmVyRXJyb3JDb2RlcyxcbiAgRGFmZkF1dGhEcml2ZXJUb2tlbkNoZWNrLFxufSBmcm9tICdAZGFmZm9kaWwvYXV0aC9kcml2ZXInO1xuaW1wb3J0IHsgRGFmZkF1dGhHdWFyZExvZ291dCB9IGZyb20gJ0BkYWZmb2RpbC9hdXRoL3N0YXRlJztcbmltcG9ydCB7IERhZmZFcnJvciB9IGZyb20gJ0BkYWZmb2RpbC9jb3JlJztcbmltcG9ydCB7IEVycm9yVHJhbnNmb3JtZXIgfSBmcm9tICdAZGFmZm9kaWwvY29yZS9zdGF0ZSc7XG5cbmltcG9ydCB7IERhZmZBdXRoR3Vlc3RPbmx5R3VhcmRSZWRpcmVjdFVybCB9IGZyb20gJy4vZ3Vlc3Qtb25seS1ndWFyZC1yZWRpcmVjdC50b2tlbic7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ2FueScsXG59KVxuZXhwb3J0IGNsYXNzIEd1ZXN0T25seUd1YXJkIGltcGxlbWVudHMgQ2FuQWN0aXZhdGUge1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIHRva2VuQ2hlY2s6IERhZmZBdXRoRHJpdmVyVG9rZW5DaGVjayxcbiAgICBwcml2YXRlIHN0b3JhZ2U6IERhZmZBdXRoU3RvcmFnZVNlcnZpY2UsXG4gICAgcHJpdmF0ZSByb3V0ZXI6IFJvdXRlcixcbiAgICBwcml2YXRlIHN0b3JlOiBTdG9yZSxcbiAgICBASW5qZWN0KERBRkZfQVVUSF9FUlJPUl9NQVRDSEVSKSBwcml2YXRlIGVycm9yTWF0Y2hlcjogRXJyb3JUcmFuc2Zvcm1lcixcbiAgICBASW5qZWN0KERhZmZBdXRoR3Vlc3RPbmx5R3VhcmRSZWRpcmVjdFVybCkgcHJpdmF0ZSByZWRpcmVjdFVybDogc3RyaW5nLFxuICApIHt9XG5cbiAgY2FuQWN0aXZhdGUoKTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XG4gICAgcmV0dXJuIHRoaXMuaXNVbmF1dGhlbnRpY2F0ZWQoKS5waXBlKFxuICAgICAgdGFwKHJlc3VsdCA9PiB7XG4gICAgICAgIGlmICghcmVzdWx0KSB7XG4gICAgICAgICAgdGhpcy5yb3V0ZXIubmF2aWdhdGVCeVVybCh0aGlzLnJlZGlyZWN0VXJsKTtcbiAgICAgICAgfVxuICAgICAgfSksXG4gICAgKTtcbiAgfVxuXG4gIHByaXZhdGUgaXNVbmF1dGhlbnRpY2F0ZWQoKTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XG4gICAgcmV0dXJuIHRoaXMudG9rZW5DaGVjay5jaGVjaygpLnBpcGUoXG4gICAgICBtYXAoKCkgPT4gZmFsc2UpLFxuICAgICAgY2F0Y2hFcnJvcigoZXJyb3I6IERhZmZFcnJvcikgPT4ge1xuICAgICAgICBpZiAoZXJyb3IuY29kZSA9PT0gRGFmZkF1dGhEcml2ZXJFcnJvckNvZGVzLlVOQVVUSE9SSVpFRCB8fCBlcnJvci5jb2RlID09PSBEYWZmQXV0aERyaXZlckVycm9yQ29kZXMuQVVUSEVOVElDQVRJT05fRkFJTEVEKSB7XG4gICAgICAgICAgdGhpcy5zdG9yYWdlLnJlbW92ZUF1dGhUb2tlbigpO1xuICAgICAgICAgIHRoaXMuc3RvcmUuZGlzcGF0Y2gobmV3IERhZmZBdXRoR3VhcmRMb2dvdXQodGhpcy5lcnJvck1hdGNoZXIoZXJyb3IpKSk7XG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuIG9mKHRydWUpO1xuICAgICAgfSksXG4gICAgKTtcbiAgfVxufVxuIl19
|
|
@@ -30,7 +30,7 @@ export class MemberOnlyGuard {
|
|
|
30
30
|
}
|
|
31
31
|
isAuthenticated() {
|
|
32
32
|
return this.tokenCheck.check().pipe(map(() => true), catchError((error) => {
|
|
33
|
-
if (error.code === DaffAuthDriverErrorCodes.UNAUTHORIZED) {
|
|
33
|
+
if (error.code === DaffAuthDriverErrorCodes.UNAUTHORIZED || error.code === DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED) {
|
|
34
34
|
this.storage.removeAuthToken();
|
|
35
35
|
this.store.dispatch(new DaffAuthGuardLogout(this.errorMatcher(error)));
|
|
36
36
|
}
|
|
@@ -52,4 +52,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
52
52
|
type: Inject,
|
|
53
53
|
args: [DaffAuthMemberOnlyGuardRedirectUrl]
|
|
54
54
|
}] }]; } });
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtYmVyLW9ubHkuZ3VhcmQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWJzL2F1dGgvcm91dGluZy9zcmMvZ3VhcmRzL21lbWJlci1vbmx5Lmd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxNQUFNLEVBQ04sVUFBVSxHQUNYLE1BQU0sZUFBZSxDQUFDO0FBQ3ZCLE9BQU8sRUFFTCxNQUFNLEdBQ1AsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3BDLE9BQU8sRUFFTCxFQUFFLEdBQ0gsTUFBTSxNQUFNLENBQUM7QUFDZCxPQUFPLEVBQ0wsVUFBVSxFQUNWLEdBQUcsRUFDSCxHQUFHLEdBQ0osTUFBTSxnQkFBZ0IsQ0FBQztBQUV4QixPQUFPLEVBQ0wsdUJBQXVCLEVBQ3ZCLHNCQUFzQixHQUN2QixNQUFNLGdCQUFnQixDQUFDO0FBQ3hCLE9BQU8sRUFDTCx3QkFBd0IsRUFDeEIsd0JBQXdCLEdBQ3pCLE1BQU0sdUJBQXVCLENBQUM7QUFDL0IsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFJM0QsT0FBTyxFQUFFLGtDQUFrQyxFQUFFLE1BQU0sb0NBQW9DLENBQUM7Ozs7OztBQU14RixNQUFNLE9BQU8sZUFBZTtJQUMxQixZQUNVLFVBQW9DLEVBQ3BDLE9BQStCLEVBQy9CLE1BQWMsRUFDZCxLQUFZLEVBQ3FCLFlBQThCLEVBQ25CLFdBQW1CO1FBTC9ELGVBQVUsR0FBVixVQUFVLENBQTBCO1FBQ3BDLFlBQU8sR0FBUCxPQUFPLENBQXdCO1FBQy9CLFdBQU0sR0FBTixNQUFNLENBQVE7UUFDZCxVQUFLLEdBQUwsS0FBSyxDQUFPO1FBQ3FCLGlCQUFZLEdBQVosWUFBWSxDQUFrQjtRQUNuQixnQkFBVyxHQUFYLFdBQVcsQ0FBUTtJQUN0RSxDQUFDO0lBRUosV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDLElBQUksQ0FDaEMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQ1gsSUFBSSxDQUFDLE1BQU0sRUFBRTtnQkFDWCxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7YUFDN0M7UUFDSCxDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVPLGVBQWU7UUFDckIsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDLElBQUksQ0FDakMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUNmLFVBQVUsQ0FBQyxDQUFDLEtBQWdCLEVBQUUsRUFBRTtZQUM5QixJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssd0JBQXdCLENBQUMsWUFBWSxJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssd0JBQXdCLENBQUMscUJBQXFCLEVBQUU7Z0JBQ3pILElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxFQUFFLENBQUM7Z0JBQy9CLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLElBQUksbUJBQW1CLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7YUFDeEU7WUFDRCxPQUFPLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNuQixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQzs7K0hBL0JVLGVBQWUsMklBTWhCLHVCQUF1QixhQUN2QixrQ0FBa0M7bUlBUGpDLGVBQWUsY0FGZCxLQUFLOzJGQUVOLGVBQWU7a0JBSDNCLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLEtBQUs7aUJBQ2xCOzswQkFPSSxNQUFNOzJCQUFDLHVCQUF1Qjs7MEJBQzlCLE1BQU07MkJBQUMsa0NBQWtDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgSW5qZWN0LFxuICBJbmplY3RhYmxlLFxufSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7XG4gIENhbkFjdGl2YXRlLFxuICBSb3V0ZXIsXG59IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBTdG9yZSB9IGZyb20gJ0BuZ3J4L3N0b3JlJztcbmltcG9ydCB7XG4gIE9ic2VydmFibGUsXG4gIG9mLFxufSBmcm9tICdyeGpzJztcbmltcG9ydCB7XG4gIGNhdGNoRXJyb3IsXG4gIG1hcCxcbiAgdGFwLFxufSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cbmltcG9ydCB7XG4gIERBRkZfQVVUSF9FUlJPUl9NQVRDSEVSLFxuICBEYWZmQXV0aFN0b3JhZ2VTZXJ2aWNlLFxufSBmcm9tICdAZGFmZm9kaWwvYXV0aCc7XG5pbXBvcnQge1xuICBEYWZmQXV0aERyaXZlckVycm9yQ29kZXMsXG4gIERhZmZBdXRoRHJpdmVyVG9rZW5DaGVjayxcbn0gZnJvbSAnQGRhZmZvZGlsL2F1dGgvZHJpdmVyJztcbmltcG9ydCB7IERhZmZBdXRoR3VhcmRMb2dvdXQgfSBmcm9tICdAZGFmZm9kaWwvYXV0aC9zdGF0ZSc7XG5pbXBvcnQgeyBEYWZmRXJyb3IgfSBmcm9tICdAZGFmZm9kaWwvY29yZSc7XG5pbXBvcnQgeyBFcnJvclRyYW5zZm9ybWVyIH0gZnJvbSAnQGRhZmZvZGlsL2NvcmUvc3RhdGUnO1xuXG5pbXBvcnQgeyBEYWZmQXV0aE1lbWJlck9ubHlHdWFyZFJlZGlyZWN0VXJsIH0gZnJvbSAnLi9tZW1iZXItb25seS1ndWFyZC1yZWRpcmVjdC50b2tlbic7XG5cblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAnYW55Jyxcbn0pXG5leHBvcnQgY2xhc3MgTWVtYmVyT25seUd1YXJkIGltcGxlbWVudHMgQ2FuQWN0aXZhdGUge1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIHRva2VuQ2hlY2s6IERhZmZBdXRoRHJpdmVyVG9rZW5DaGVjayxcbiAgICBwcml2YXRlIHN0b3JhZ2U6IERhZmZBdXRoU3RvcmFnZVNlcnZpY2UsXG4gICAgcHJpdmF0ZSByb3V0ZXI6IFJvdXRlcixcbiAgICBwcml2YXRlIHN0b3JlOiBTdG9yZSxcbiAgICBASW5qZWN0KERBRkZfQVVUSF9FUlJPUl9NQVRDSEVSKSBwcml2YXRlIGVycm9yTWF0Y2hlcjogRXJyb3JUcmFuc2Zvcm1lcixcbiAgICBASW5qZWN0KERhZmZBdXRoTWVtYmVyT25seUd1YXJkUmVkaXJlY3RVcmwpIHByaXZhdGUgcmVkaXJlY3RVcmw6IHN0cmluZyxcbiAgKSB7fVxuXG4gIGNhbkFjdGl2YXRlKCk6IE9ic2VydmFibGU8Ym9vbGVhbj4ge1xuICAgIHJldHVybiB0aGlzLmlzQXV0aGVudGljYXRlZCgpLnBpcGUoXG4gICAgICB0YXAocmVzdWx0ID0+IHtcbiAgICAgICAgaWYgKCFyZXN1bHQpIHtcbiAgICAgICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZUJ5VXJsKHRoaXMucmVkaXJlY3RVcmwpO1xuICAgICAgICB9XG4gICAgICB9KSxcbiAgICApO1xuICB9XG5cbiAgcHJpdmF0ZSBpc0F1dGhlbnRpY2F0ZWQoKTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XG4gICAgcmV0dXJuIHRoaXMudG9rZW5DaGVjay5jaGVjaygpLnBpcGUoXG4gICAgICBtYXAoKCkgPT4gdHJ1ZSksXG4gICAgICBjYXRjaEVycm9yKChlcnJvcjogRGFmZkVycm9yKSA9PiB7XG4gICAgICAgIGlmIChlcnJvci5jb2RlID09PSBEYWZmQXV0aERyaXZlckVycm9yQ29kZXMuVU5BVVRIT1JJWkVEIHx8IGVycm9yLmNvZGUgPT09IERhZmZBdXRoRHJpdmVyRXJyb3JDb2Rlcy5BVVRIRU5USUNBVElPTl9GQUlMRUQpIHtcbiAgICAgICAgICB0aGlzLnN0b3JhZ2UucmVtb3ZlQXV0aFRva2VuKCk7XG4gICAgICAgICAgdGhpcy5zdG9yZS5kaXNwYXRjaChuZXcgRGFmZkF1dGhHdWFyZExvZ291dCh0aGlzLmVycm9yTWF0Y2hlcihlcnJvcikpKTtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gb2YoZmFsc2UpO1xuICAgICAgfSksXG4gICAgKTtcbiAgfVxufVxuIl19
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export { daffAuthRoutingRedirectUnauthenticatedHookFactory } from './redirect-unauthenticated-hook-factory';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2FwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9yb3V0aW5nL3NyYy9oZWxwZXJzL3B1YmxpY19hcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlEQUFpRCxFQUFFLE1BQU0seUNBQXlDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgeyBkYWZmQXV0aFJvdXRpbmdSZWRpcmVjdFVuYXV0aGVudGljYXRlZEhvb2tGYWN0b3J5IH0gZnJvbSAnLi9yZWRpcmVjdC11bmF1dGhlbnRpY2F0ZWQtaG9vay1mYWN0b3J5JztcbiJdfQ==
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { from, of, } from 'rxjs';
|
|
2
|
+
import { DaffAuthActionTypes, DaffAuthLoginActionTypes, } from '@daffodil/auth/state';
|
|
3
|
+
export function daffAuthRoutingRedirectUnauthenticatedHookFactory(router, route, config) {
|
|
4
|
+
return (trigger) => {
|
|
5
|
+
switch (trigger) {
|
|
6
|
+
case DaffAuthLoginActionTypes.LogoutSuccessAction:
|
|
7
|
+
return from(router.navigateByUrl(route.snapshot.queryParamMap.get(config.redirectUrlParam) || config.logoutRedirectPath));
|
|
8
|
+
case DaffAuthActionTypes.AuthCheckFailureAction:
|
|
9
|
+
case DaffAuthActionTypes.AuthGuardLogoutAction:
|
|
10
|
+
return from(router.navigateByUrl(route.snapshot.queryParamMap.get(config.redirectUrlParam) || config.tokenExpirationRedirectPath));
|
|
11
|
+
default:
|
|
12
|
+
return of(null);
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXJlY3QtdW5hdXRoZW50aWNhdGVkLWhvb2stZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9yb3V0aW5nL3NyYy9oZWxwZXJzL3JlZGlyZWN0LXVuYXV0aGVudGljYXRlZC1ob29rLWZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxFQUNMLElBQUksRUFDSixFQUFFLEdBQ0gsTUFBTSxNQUFNLENBQUM7QUFFZCxPQUFPLEVBQ0wsbUJBQW1CLEVBQ25CLHdCQUF3QixHQUV6QixNQUFNLHNCQUFzQixDQUFDO0FBSTlCLE1BQU0sVUFBVSxpREFBaUQsQ0FBQyxNQUFjLEVBQUUsS0FBcUIsRUFBRSxNQUE2QjtJQUNwSSxPQUFPLENBQUMsT0FBTyxFQUFFLEVBQUU7UUFDakIsUUFBUSxPQUFPLEVBQUU7WUFDZixLQUFLLHdCQUF3QixDQUFDLG1CQUFtQjtnQkFDL0MsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLElBQUksTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQztZQUU1SCxLQUFLLG1CQUFtQixDQUFDLHNCQUFzQixDQUFDO1lBQ2hELEtBQUssbUJBQW1CLENBQUMscUJBQXFCO2dCQUM1QyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxNQUFNLENBQUMsMkJBQTJCLENBQUMsQ0FBQyxDQUFDO1lBRXJJO2dCQUNFLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ25CO0lBQ0gsQ0FBQyxDQUFDO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEFjdGl2YXRlZFJvdXRlLFxuICBSb3V0ZXIsXG59IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQge1xuICBmcm9tLFxuICBvZixcbn0gZnJvbSAncnhqcyc7XG5cbmltcG9ydCB7XG4gIERhZmZBdXRoQWN0aW9uVHlwZXMsXG4gIERhZmZBdXRoTG9naW5BY3Rpb25UeXBlcyxcbiAgRGFmZkF1dGhVbmF1dGhlbnRpY2F0ZWRIb29rLFxufSBmcm9tICdAZGFmZm9kaWwvYXV0aC9zdGF0ZSc7XG5cbmltcG9ydCB7IERhZmZBdXRoUm91dGluZ0NvbmZpZyB9IGZyb20gJy4uL2NvbmZpZy9wdWJsaWNfYXBpJztcblxuZXhwb3J0IGZ1bmN0aW9uIGRhZmZBdXRoUm91dGluZ1JlZGlyZWN0VW5hdXRoZW50aWNhdGVkSG9va0ZhY3Rvcnkocm91dGVyOiBSb3V0ZXIsIHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZSwgY29uZmlnOiBEYWZmQXV0aFJvdXRpbmdDb25maWcpOiBEYWZmQXV0aFVuYXV0aGVudGljYXRlZEhvb2sge1xuICByZXR1cm4gKHRyaWdnZXIpID0+IHtcbiAgICBzd2l0Y2ggKHRyaWdnZXIpIHtcbiAgICAgIGNhc2UgRGFmZkF1dGhMb2dpbkFjdGlvblR5cGVzLkxvZ291dFN1Y2Nlc3NBY3Rpb246XG4gICAgICAgIHJldHVybiBmcm9tKHJvdXRlci5uYXZpZ2F0ZUJ5VXJsKHJvdXRlLnNuYXBzaG90LnF1ZXJ5UGFyYW1NYXAuZ2V0KGNvbmZpZy5yZWRpcmVjdFVybFBhcmFtKSB8fCBjb25maWcubG9nb3V0UmVkaXJlY3RQYXRoKSk7XG5cbiAgICAgIGNhc2UgRGFmZkF1dGhBY3Rpb25UeXBlcy5BdXRoQ2hlY2tGYWlsdXJlQWN0aW9uOlxuICAgICAgY2FzZSBEYWZmQXV0aEFjdGlvblR5cGVzLkF1dGhHdWFyZExvZ291dEFjdGlvbjpcbiAgICAgICAgcmV0dXJuIGZyb20ocm91dGVyLm5hdmlnYXRlQnlVcmwocm91dGUuc25hcHNob3QucXVlcnlQYXJhbU1hcC5nZXQoY29uZmlnLnJlZGlyZWN0VXJsUGFyYW0pIHx8IGNvbmZpZy50b2tlbkV4cGlyYXRpb25SZWRpcmVjdFBhdGgpKTtcblxuICAgICAgZGVmYXVsdDpcbiAgICAgICAgcmV0dXJuIG9mKG51bGwpO1xuICAgIH1cbiAgfTtcbn1cbiJdfQ==
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from './guards/public_api';
|
|
2
2
|
export * from './config/public_api';
|
|
3
|
+
export * from './helpers/public_api';
|
|
3
4
|
export * from './module';
|
|
4
5
|
export * from './redirect.module';
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2FwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYnMvYXV0aC9yb3V0aW5nL3NyYy9wdWJsaWNfYXBpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLHNCQUFzQixDQUFDO0FBRXJDLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsbUJBQW1CLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tICcuL2d1YXJkcy9wdWJsaWNfYXBpJztcbmV4cG9ydCAqIGZyb20gJy4vY29uZmlnL3B1YmxpY19hcGknO1xuZXhwb3J0ICogZnJvbSAnLi9oZWxwZXJzL3B1YmxpY19hcGknO1xuXG5leHBvcnQgKiBmcm9tICcuL21vZHVsZSc7XG5leHBvcnQgKiBmcm9tICcuL3JlZGlyZWN0Lm1vZHVsZSc7XG4iXX0=
|
|
@@ -1,13 +1,23 @@
|
|
|
1
|
-
import { NgModule } from '@angular/core';
|
|
1
|
+
import { NgModule, inject, } from '@angular/core';
|
|
2
|
+
import { ActivatedRoute, Router, } from '@angular/router';
|
|
2
3
|
import { EffectsModule } from '@ngrx/effects';
|
|
4
|
+
import { DAFF_AUTH_UNAUTHENTICATED_HOOKS, } from '@daffodil/auth/state';
|
|
5
|
+
import { DAFF_AUTH_ROUTING_CONFIG } from './config/public_api';
|
|
3
6
|
import { DaffAuthRedirectEffects } from './effects/redirect.effects';
|
|
7
|
+
import { daffAuthRoutingRedirectUnauthenticatedHookFactory } from './helpers/public_api';
|
|
4
8
|
import * as i0 from "@angular/core";
|
|
5
9
|
import * as i1 from "@ngrx/effects";
|
|
6
10
|
export class DaffAuthRoutingRedirectModule {
|
|
7
11
|
}
|
|
8
12
|
/** @nocollapse */ DaffAuthRoutingRedirectModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRoutingRedirectModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
9
13
|
/** @nocollapse */ DaffAuthRoutingRedirectModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRoutingRedirectModule, imports: [i1.EffectsFeatureModule] });
|
|
10
|
-
/** @nocollapse */ DaffAuthRoutingRedirectModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRoutingRedirectModule,
|
|
14
|
+
/** @nocollapse */ DaffAuthRoutingRedirectModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRoutingRedirectModule, providers: [
|
|
15
|
+
{
|
|
16
|
+
provide: DAFF_AUTH_UNAUTHENTICATED_HOOKS,
|
|
17
|
+
multi: true,
|
|
18
|
+
useFactory: (() => daffAuthRoutingRedirectUnauthenticatedHookFactory(inject(Router), inject(ActivatedRoute), inject(DAFF_AUTH_ROUTING_CONFIG))),
|
|
19
|
+
},
|
|
20
|
+
], imports: [[
|
|
11
21
|
EffectsModule.forFeature([
|
|
12
22
|
DaffAuthRedirectEffects,
|
|
13
23
|
]),
|
|
@@ -20,6 +30,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
20
30
|
DaffAuthRedirectEffects,
|
|
21
31
|
]),
|
|
22
32
|
],
|
|
33
|
+
providers: [
|
|
34
|
+
{
|
|
35
|
+
provide: DAFF_AUTH_UNAUTHENTICATED_HOOKS,
|
|
36
|
+
multi: true,
|
|
37
|
+
useFactory: (() => daffAuthRoutingRedirectUnauthenticatedHookFactory(inject(Router), inject(ActivatedRoute), inject(DAFF_AUTH_ROUTING_CONFIG))),
|
|
38
|
+
},
|
|
39
|
+
],
|
|
23
40
|
}]
|
|
24
41
|
}] });
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXJlY3QubW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vbGlicy9hdXRoL3JvdXRpbmcvc3JjL3JlZGlyZWN0Lm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsUUFBUSxFQUNSLE1BQU0sR0FDUCxNQUFNLGVBQWUsQ0FBQztBQUN2QixPQUFPLEVBQ0wsY0FBYyxFQUNkLE1BQU0sR0FDUCxNQUFNLGlCQUFpQixDQUFDO0FBQ3pCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFNOUMsT0FBTyxFQUNMLCtCQUErQixHQUloQyxNQUFNLHNCQUFzQixDQUFDO0FBRTlCLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQy9ELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxpREFBaUQsRUFBRSxNQUFNLHNCQUFzQixDQUFDOzs7QUFzQnpGLE1BQU0sT0FBTyw2QkFBNkI7OzZJQUE3Qiw2QkFBNkI7OElBQTdCLDZCQUE2Qjs4SUFBN0IsNkJBQTZCLGFBYjdCO1FBQ1Q7WUFDRSxPQUFPLEVBQUUsK0JBQStCO1lBQ3hDLEtBQUssRUFBRSxJQUFJO1lBQ1gsVUFBVSxHQUFFLEdBQUcsRUFBRSxDQUNmLGlEQUFpRCxDQUMvQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQ2QsTUFBTSxDQUFDLGNBQWMsQ0FBQyxFQUN0QixNQUFNLENBQUMsd0JBQXdCLENBQUMsQ0FDakMsQ0FBQTtTQUNKO0tBQ0YsWUFoQlE7WUFDUCxhQUFhLENBQUMsVUFBVSxDQUFDO2dCQUN2Qix1QkFBdUI7YUFDeEIsQ0FBQztTQUNIOzJGQWNVLDZCQUE2QjtrQkFuQnpDLFFBQVE7bUJBQUM7b0JBQ1IsT0FBTyxFQUFFO3dCQUNQLGFBQWEsQ0FBQyxVQUFVLENBQUM7NEJBQ3ZCLHVCQUF1Qjt5QkFDeEIsQ0FBQztxQkFDSDtvQkFDRCxTQUFTLEVBQUU7d0JBQ1Q7NEJBQ0UsT0FBTyxFQUFFLCtCQUErQjs0QkFDeEMsS0FBSyxFQUFFLElBQUk7NEJBQ1gsVUFBVSxHQUFFLEdBQUcsRUFBRSxDQUNmLGlEQUFpRCxDQUMvQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQ2QsTUFBTSxDQUFDLGNBQWMsQ0FBQyxFQUN0QixNQUFNLENBQUMsd0JBQXdCLENBQUMsQ0FDakMsQ0FBQTt5QkFDSjtxQkFDRjtpQkFDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIE5nTW9kdWxlLFxuICBpbmplY3QsXG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtcbiAgQWN0aXZhdGVkUm91dGUsXG4gIFJvdXRlcixcbn0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IEVmZmVjdHNNb2R1bGUgfSBmcm9tICdAbmdyeC9lZmZlY3RzJztcbmltcG9ydCB7XG4gIGZyb20sXG4gIG9mLFxufSBmcm9tICdyeGpzJztcblxuaW1wb3J0IHtcbiAgREFGRl9BVVRIX1VOQVVUSEVOVElDQVRFRF9IT09LUyxcbiAgRGFmZkF1dGhBY3Rpb25UeXBlcyxcbiAgRGFmZkF1dGhMb2dpbkFjdGlvblR5cGVzLFxuICBEYWZmQXV0aFVuYXV0aGVudGljYXRlZEhvb2ssXG59IGZyb20gJ0BkYWZmb2RpbC9hdXRoL3N0YXRlJztcblxuaW1wb3J0IHsgREFGRl9BVVRIX1JPVVRJTkdfQ09ORklHIH0gZnJvbSAnLi9jb25maWcvcHVibGljX2FwaSc7XG5pbXBvcnQgeyBEYWZmQXV0aFJlZGlyZWN0RWZmZWN0cyB9IGZyb20gJy4vZWZmZWN0cy9yZWRpcmVjdC5lZmZlY3RzJztcbmltcG9ydCB7IGRhZmZBdXRoUm91dGluZ1JlZGlyZWN0VW5hdXRoZW50aWNhdGVkSG9va0ZhY3RvcnkgfSBmcm9tICcuL2hlbHBlcnMvcHVibGljX2FwaSc7XG5cblxuQE5nTW9kdWxlKHtcbiAgaW1wb3J0czogW1xuICAgIEVmZmVjdHNNb2R1bGUuZm9yRmVhdHVyZShbXG4gICAgICBEYWZmQXV0aFJlZGlyZWN0RWZmZWN0cyxcbiAgICBdKSxcbiAgXSxcbiAgcHJvdmlkZXJzOiBbXG4gICAge1xuICAgICAgcHJvdmlkZTogREFGRl9BVVRIX1VOQVVUSEVOVElDQVRFRF9IT09LUyxcbiAgICAgIG11bHRpOiB0cnVlLFxuICAgICAgdXNlRmFjdG9yeTogKCkgPT5cbiAgICAgICAgZGFmZkF1dGhSb3V0aW5nUmVkaXJlY3RVbmF1dGhlbnRpY2F0ZWRIb29rRmFjdG9yeShcbiAgICAgICAgICBpbmplY3QoUm91dGVyKSxcbiAgICAgICAgICBpbmplY3QoQWN0aXZhdGVkUm91dGUpLFxuICAgICAgICAgIGluamVjdChEQUZGX0FVVEhfUk9VVElOR19DT05GSUcpLFxuICAgICAgICApLFxuICAgIH0sXG4gIF0sXG59KVxuZXhwb3J0IGNsYXNzIERhZmZBdXRoUm91dGluZ1JlZGlyZWN0TW9kdWxlIHt9XG4iXX0=
|
|
@@ -13,7 +13,8 @@ export var DaffAuthActionTypes;
|
|
|
13
13
|
* That reason could be a logout, auth token check failure, or an unauthorized error.
|
|
14
14
|
*/
|
|
15
15
|
export class DaffAuthResetToUnauthenticated {
|
|
16
|
-
constructor() {
|
|
16
|
+
constructor(reason) {
|
|
17
|
+
this.reason = reason;
|
|
17
18
|
this.type = DaffAuthActionTypes.ResetToUnauthenticatedAction;
|
|
18
19
|
}
|
|
19
20
|
}
|
|
@@ -74,4 +75,4 @@ export class DaffAuthCheckFailure {
|
|
|
74
75
|
this.type = DaffAuthActionTypes.AuthCheckFailureAction;
|
|
75
76
|
}
|
|
76
77
|
}
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5hY3Rpb25zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGlicy9hdXRoL3N0YXRlL3NyYy9hY3Rpb25zL2F1dGguYWN0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxNQUFNLENBQU4sSUFBWSxtQkFRWDtBQVJELFdBQVksbUJBQW1CO0lBQzdCLHdHQUFpRixDQUFBO0lBQ2pGLGdHQUF5RSxDQUFBO0lBQ3pFLDBGQUFtRSxDQUFBO0lBQ25FLHdGQUFpRSxDQUFBO0lBQ2pFLDZFQUFzRCxDQUFBO0lBQ3RELDRGQUFxRSxDQUFBO0lBQ3JFLDRGQUFxRSxDQUFBO0FBQ3ZFLENBQUMsRUFSVyxtQkFBbUIsS0FBbkIsbUJBQW1CLFFBUTlCO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLDhCQUE4QjtJQUd6QyxZQUNTLE1BQXNCO1FBQXRCLFdBQU0sR0FBTixNQUFNLENBQWdCO1FBSHRCLFNBQUksR0FBRyxtQkFBbUIsQ0FBQyw0QkFBNEIsQ0FBQztJQUk5RCxDQUFDO0NBQ0w7QUFFRDs7R0FFRztBQUNILE1BQU0sT0FBTyxzQkFBc0I7SUFHakMsWUFBbUIsWUFBNEI7UUFBNUIsaUJBQVksR0FBWixZQUFZLENBQWdCO1FBRnRDLFNBQUksR0FBRyxtQkFBbUIsQ0FBQyx3QkFBd0IsQ0FBQztJQUVYLENBQUM7Q0FDcEQ7QUFFRDs7R0FFRztBQUNILE1BQU0sT0FBTyxtQkFBbUI7SUFHOUIsWUFBbUIsWUFBNEI7UUFBNUIsaUJBQVksR0FBWixZQUFZLENBQWdCO1FBRnRDLFNBQUksR0FBRyxtQkFBbUIsQ0FBQyxxQkFBcUIsQ0FBQztJQUVSLENBQUM7Q0FDcEQ7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sa0JBQWtCO0lBRzdCLFlBQW1CLFlBQTRCO1FBQTVCLGlCQUFZLEdBQVosWUFBWSxDQUFnQjtRQUZ0QyxTQUFJLEdBQUcsbUJBQW1CLENBQUMsb0JBQW9CLENBQUM7SUFFUCxDQUFDO0NBQ3BEO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sYUFBYTtJQUExQjtRQUNXLFNBQUksR0FBRyxtQkFBbUIsQ0FBQyxlQUFlLENBQUM7SUFDdEQsQ0FBQztDQUFBO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxvQkFBb0I7SUFBakM7UUFDVyxTQUFJLEdBQUcsbUJBQW1CLENBQUMsc0JBQXNCLENBQUM7SUFDN0QsQ0FBQztDQUFBO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxvQkFBb0I7SUFHL0IsWUFBbUIsWUFBNEI7UUFBNUIsaUJBQVksR0FBWixZQUFZLENBQWdCO1FBRnRDLFNBQUksR0FBRyxtQkFBbUIsQ0FBQyxzQkFBc0IsQ0FBQztJQUVULENBQUM7Q0FDcEQiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBY3Rpb24gfSBmcm9tICdAbmdyeC9zdG9yZSc7XG5cbmltcG9ydCB7IERhZmZTdGF0ZUVycm9yIH0gZnJvbSAnQGRhZmZvZGlsL2NvcmUvc3RhdGUnO1xuXG5leHBvcnQgZW51bSBEYWZmQXV0aEFjdGlvblR5cGVzIHtcbiAgUmVzZXRUb1VuYXV0aGVudGljYXRlZEFjdGlvbiA9ICdbQGRhZmZvZGlsL2F1dGhdIFJlc2V0IFRvIFVuYXV0aGVudGljYXRlZCBBY3Rpb24nLFxuICBBdXRoU3RvcmFnZUZhaWx1cmVBY3Rpb24gPSAnW0BkYWZmb2RpbC9hdXRoXSBBdXRoIFN0b3JhZ2UgRmFpbHVyZSBBY3Rpb24nLFxuICBBdXRoR3VhcmRMb2dvdXRBY3Rpb24gPSAnW0BkYWZmb2RpbC9hdXRoXSBBdXRoIEd1YXJkIExvZ291dCBBY3Rpb24nLFxuICBBdXRoU2VydmVyU2lkZUFjdGlvbiA9ICdbQGRhZmZvZGlsL2F1dGhdIEF1dGggU2VydmVyIFNpZGUgQWN0aW9uJyxcbiAgQXV0aENoZWNrQWN0aW9uID0gJ1tAZGFmZm9kaWwvYXV0aF0gQXV0aCBDaGVjayBBY3Rpb24nLFxuICBBdXRoQ2hlY2tTdWNjZXNzQWN0aW9uID0gJ1tAZGFmZm9kaWwvYXV0aF0gQXV0aCBDaGVjayBTdWNjZXNzIEFjdGlvbicsXG4gIEF1dGhDaGVja0ZhaWx1cmVBY3Rpb24gPSAnW0BkYWZmb2RpbC9hdXRoXSBBdXRoIENoZWNrIEZhaWx1cmUgQWN0aW9uJyxcbn1cblxuLypcbiAqIEFuIGFjdGlvbiB0cmlnZ2VyZWQgd2hlbiB0aGUgYXV0aGVuaWNhdGVkIHN0YXR1cyBvZiB0aGUgdXNlciBpcyBpbnZhbGlkYXRlZCBmb3Igc29tZSByZWFzb24uXG4gKiBUaGF0IHJlYXNvbiBjb3VsZCBiZSBhIGxvZ291dCwgYXV0aCB0b2tlbiBjaGVjayBmYWlsdXJlLCBvciBhbiB1bmF1dGhvcml6ZWQgZXJyb3IuXG4gKi9cbmV4cG9ydCBjbGFzcyBEYWZmQXV0aFJlc2V0VG9VbmF1dGhlbnRpY2F0ZWQgaW1wbGVtZW50cyBBY3Rpb24ge1xuICByZWFkb25seSB0eXBlID0gRGFmZkF1dGhBY3Rpb25UeXBlcy5SZXNldFRvVW5hdXRoZW50aWNhdGVkQWN0aW9uO1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHB1YmxpYyByZWFzb246IEFjdGlvblsndHlwZSddLFxuICApIHt9XG59XG5cbi8qXG4gKiBBbiBhY3Rpb24gdHJpZ2dlcmVkIHVwb24gYSBmYWlsZWQgYXV0aCBzdG9yYWdlIG9wZXJhdGlvbi5cbiAqL1xuZXhwb3J0IGNsYXNzIERhZmZBdXRoU3RvcmFnZUZhaWx1cmUgaW1wbGVtZW50cyBBY3Rpb24ge1xuICByZWFkb25seSB0eXBlID0gRGFmZkF1dGhBY3Rpb25UeXBlcy5BdXRoU3RvcmFnZUZhaWx1cmVBY3Rpb247XG5cbiAgY29uc3RydWN0b3IocHVibGljIGVycm9yTWVzc2FnZTogRGFmZlN0YXRlRXJyb3IpIHt9XG59XG5cbi8qXG4gKiBBbiBhY3Rpb24gdHJpZ2dlcmVkIHdoZW4gYW4gYXV0aCB0b2tlbiBpcyBjbGVhcmVkIGZyb20gc3RvcmFnZSBieSBhIHJvdXRpbmcgZ3VhcmQuXG4gKi9cbmV4cG9ydCBjbGFzcyBEYWZmQXV0aEd1YXJkTG9nb3V0IGltcGxlbWVudHMgQWN0aW9uIHtcbiAgcmVhZG9ubHkgdHlwZSA9IERhZmZBdXRoQWN0aW9uVHlwZXMuQXV0aEd1YXJkTG9nb3V0QWN0aW9uO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyBlcnJvck1lc3NhZ2U6IERhZmZTdGF0ZUVycm9yKSB7fVxufVxuXG4vKlxuICogQW4gYWN0aW9uIHRyaWdnZXJlZCB3aGVuIGFuIGludmFsaWQgb3BlcmF0aW9uIGlzIHBlcmZvcm1lZCBpbiB0aGUgc2VydmVyIGVudmlyb25tZW50LlxuICogQSBjb21tb24gZXhhbXBsZSBpcyB0cnlpbmcgdG8gYWNjZXNzIHRoZSBhdXRoIHRva2VuIGZyb20gc3RvcmFnZS5cbiAqL1xuZXhwb3J0IGNsYXNzIERhZmZBdXRoU2VydmVyU2lkZSBpbXBsZW1lbnRzIEFjdGlvbiB7XG4gIHJlYWRvbmx5IHR5cGUgPSBEYWZmQXV0aEFjdGlvblR5cGVzLkF1dGhTZXJ2ZXJTaWRlQWN0aW9uO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyBlcnJvck1lc3NhZ2U6IERhZmZTdGF0ZUVycm9yKSB7fVxufVxuXG4vKipcbiAqIEFuIGFjdGlvbiB0cmlnZ2VyZWQgdG8gaW5pdGlhbGl6ZSBhbiBhdXRoIGNoZWNrIHJlcXVlc3QuXG4gKi9cbmV4cG9ydCBjbGFzcyBEYWZmQXV0aENoZWNrIGltcGxlbWVudHMgQWN0aW9uIHtcbiAgcmVhZG9ubHkgdHlwZSA9IERhZmZBdXRoQWN0aW9uVHlwZXMuQXV0aENoZWNrQWN0aW9uO1xufVxuXG4vKipcbiAqIEFuIGFjdGlvbiB0cmlnZ2VyZWQgdXBvbiBhIHN1Y2Nlc3NmdWwgYXV0aCBjaGVjay5cbiAqXG4gKiBAcGFyYW0gdG9rZW4gLSB0aGUgY3VzdG9tZXIgYWNjZXNzIHRva2VuXG4gKi9cbmV4cG9ydCBjbGFzcyBEYWZmQXV0aENoZWNrU3VjY2VzcyBpbXBsZW1lbnRzIEFjdGlvbiB7XG4gIHJlYWRvbmx5IHR5cGUgPSBEYWZmQXV0aEFjdGlvblR5cGVzLkF1dGhDaGVja1N1Y2Nlc3NBY3Rpb247XG59XG5cbi8qKlxuICogQW4gYWN0aW9uIHRyaWdnZXJlZCB1cG9uIGEgZmFpbGVkIGF1dGggY2hlY2sgcmVxdWVzdC5cbiAqXG4gKiBAcGFyYW0gZXJyb3JNZXNzYWdlIC0gYW4gZXJyb3IgbWVzc2FnZVxuICovXG5leHBvcnQgY2xhc3MgRGFmZkF1dGhDaGVja0ZhaWx1cmUgaW1wbGVtZW50cyBBY3Rpb24ge1xuICByZWFkb25seSB0eXBlID0gRGFmZkF1dGhBY3Rpb25UeXBlcy5BdXRoQ2hlY2tGYWlsdXJlQWN0aW9uO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyBlcnJvck1lc3NhZ2U6IERhZmZTdGF0ZUVycm9yKSB7fVxufVxuXG5leHBvcnQgdHlwZSBEYWZmQXV0aEFjdGlvbnMgPVxuICB8IERhZmZBdXRoUmVzZXRUb1VuYXV0aGVudGljYXRlZFxuICB8IERhZmZBdXRoU3RvcmFnZUZhaWx1cmVcbiAgfCBEYWZmQXV0aEd1YXJkTG9nb3V0XG4gIHwgRGFmZkF1dGhTZXJ2ZXJTaWRlXG4gIHwgRGFmZkF1dGhDaGVja1xuICB8IERhZmZBdXRoQ2hlY2tTdWNjZXNzXG4gIHwgRGFmZkF1dGhDaGVja0ZhaWx1cmU7XG4iXX0=
|
|
@@ -3,7 +3,7 @@ import { Actions, createEffect, ofType, } from '@ngrx/effects';
|
|
|
3
3
|
import { of, EMPTY, } from 'rxjs';
|
|
4
4
|
import { switchMap, catchError, map, repeat, filter, tap, } from 'rxjs/operators';
|
|
5
5
|
import { DaffAuthStorageService, DAFF_AUTH_ERROR_MATCHER, } from '@daffodil/auth';
|
|
6
|
-
import { DaffAuthDriverTokenCheck } from '@daffodil/auth/driver';
|
|
6
|
+
import { DaffAuthDriverErrorCodes, DaffAuthDriverTokenCheck, } from '@daffodil/auth/driver';
|
|
7
7
|
import { DaffServerSideStorageError, DaffStorageServiceError, } from '@daffodil/core';
|
|
8
8
|
import { DAFF_DRIVER_HTTP_CLIENT_CACHE_SERVICE, } from '@daffodil/driver';
|
|
9
9
|
import { DaffAuthActionTypes, DaffAuthCheckSuccess, DaffAuthCheckFailure, DaffAuthCheck, DaffAuthStorageFailure, DaffAuthServerSide, DaffAuthLoginActionTypes, DaffAuthResetToUnauthenticated, } from '../actions/public_api';
|
|
@@ -45,13 +45,16 @@ export class DaffAuthEffects {
|
|
|
45
45
|
return EMPTY;
|
|
46
46
|
}
|
|
47
47
|
})));
|
|
48
|
-
this.resetToUnauthenticated$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.AuthCheckFailureAction, DaffAuthActionTypes.AuthGuardLogoutAction, DaffAuthLoginActionTypes.LogoutSuccessAction),
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
48
|
+
this.resetToUnauthenticated$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.AuthCheckFailureAction, DaffAuthActionTypes.AuthGuardLogoutAction, DaffAuthLoginActionTypes.LogoutSuccessAction), filter((action) => {
|
|
49
|
+
// if the auth check failure is for any reason other than auth failure, don't reset
|
|
50
|
+
if (action.type === DaffAuthActionTypes.AuthCheckFailureAction
|
|
51
|
+
&& action.errorMessage.code !== DaffAuthDriverErrorCodes.UNAUTHORIZED
|
|
52
|
+
&& action.errorMessage.code !== DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED) {
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
55
|
+
return true;
|
|
56
|
+
}), map((action) => new DaffAuthResetToUnauthenticated(action.type))));
|
|
57
|
+
this.clearClientCache$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.ResetToUnauthenticatedAction), switchMap((action) => this.unauthenticatedHook(action.reason)), tap(() => {
|
|
55
58
|
this.clientCache.reset();
|
|
56
59
|
}), switchMap(() => EMPTY)), { dispatch: false });
|
|
57
60
|
}
|
|
@@ -73,4 +76,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
73
76
|
type: Inject,
|
|
74
77
|
args: [DAFF_AUTH_UNAUTHENTICATED_HOOK]
|
|
75
78
|
}] }]; } });
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.effects.js","sourceRoot":"","sources":["../../../../../libs/auth/state/src/effects/auth.effects.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Injectable,\n  Inject,\n} from '@angular/core';\nimport {\n  Actions,\n  createEffect,\n  ofType,\n} from '@ngrx/effects';\nimport {\n  of,\n  EMPTY,\n  asyncScheduler,\n} from 'rxjs';\nimport {\n  switchMap,\n  catchError,\n  map,\n  repeat,\n  filter,\n  tap,\n  delay,\n} from 'rxjs/operators';\n\nimport {\n  DaffAuthStorageService,\n  DAFF_AUTH_ERROR_MATCHER,\n} from '@daffodil/auth';\nimport { DaffAuthDriverTokenCheck } from '@daffodil/auth/driver';\nimport {\n  DaffError,\n  DaffServerSideStorageError,\n  DaffStorageServiceError,\n} from '@daffodil/core';\nimport { ErrorTransformer } from '@daffodil/core/state';\nimport {\n  DAFF_DRIVER_HTTP_CLIENT_CACHE_SERVICE,\n  DaffDriverHttpClientCacheServiceInterface,\n} from '@daffodil/driver';\n\nimport {\n  DaffAuthActionTypes,\n  DaffAuthCheckSuccess,\n  DaffAuthCheckFailure,\n  DaffAuthCheck,\n  DaffAuthStorageFailure,\n  DaffAuthServerSide,\n  DaffAuthLoginActionTypes,\n  DaffAuthActions,\n  DaffAuthLoginActions,\n  DaffAuthResetToUnauthenticated,\n} from '../actions/public_api';\nimport {\n  DaffAuthStateConfig,\n  DAFF_AUTH_STATE_CONFIG,\n} from '../config/public_api';\nimport { DAFF_AUTH_UNAUTHENTICATED_HOOK } from '../injection-tokens/unauthenticated/hook.token';\n\n@Injectable()\nexport class DaffAuthEffects {\n  constructor(\n    private actions$: Actions<DaffAuthActions | DaffAuthLoginActions>,\n    private tokenCheck: DaffAuthDriverTokenCheck,\n    @Inject(DAFF_AUTH_ERROR_MATCHER) private errorMatcher: ErrorTransformer,\n    private storage: DaffAuthStorageService,\n    @Inject(DAFF_AUTH_STATE_CONFIG) private config: DaffAuthStateConfig,\n    @Inject(DAFF_DRIVER_HTTP_CLIENT_CACHE_SERVICE) private clientCache: DaffDriverHttpClientCacheServiceInterface,\n    @Inject(DAFF_AUTH_UNAUTHENTICATED_HOOK) private unauthenticatedHook: () => void,\n  ) {}\n\n  check$ = createEffect(() => this.actions$.pipe(\n    ofType(DaffAuthActionTypes.AuthCheckAction),\n    switchMap((action) =>\n      this.tokenCheck.check().pipe(\n        map(() => new DaffAuthCheckSuccess()),\n        catchError((error: DaffError) => of(new DaffAuthCheckFailure(this.errorMatcher(error)))),\n      ),\n    ),\n  ));\n\n  removeAuthToken$ = createEffect(() => this.actions$.pipe(\n    ofType(\n      DaffAuthActionTypes.AuthCheckFailureAction,\n    ),\n    tap(() => {\n      this.storage.removeAuthToken();\n    }),\n    switchMap(() => EMPTY),\n    catchError((error: Error) => {\n      switch (true) {\n        case error instanceof DaffServerSideStorageError:\n          return of(new DaffAuthServerSide(this.errorMatcher(error)));\n\n        case error instanceof DaffStorageServiceError:\n        default:\n          return of(new DaffAuthStorageFailure(this.errorMatcher(error)));\n      }\n    }),\n  ), { dispatch: false });\n\n  // this needs to be defined after `check$` or else the driver call won't be run\n  authCheckInterval$ = createEffect(() => of(new DaffAuthCheck()).pipe(\n    repeat({ delay: this.config.checkInterval }),\n    filter(() => !!this.storage.getAuthToken()),\n    catchError((error: Error) => {\n      switch (true) {\n        case error instanceof DaffServerSideStorageError:\n          return of(new DaffAuthServerSide(this.errorMatcher(error)));\n\n        case error instanceof DaffStorageServiceError:\n          return of(new DaffAuthStorageFailure(this.errorMatcher(error)));\n\n        default:\n          return EMPTY;\n      }\n    }),\n  ));\n\n  resetToUnauthenticated$ = createEffect(() => this.actions$.pipe(\n    ofType(\n      DaffAuthActionTypes.AuthCheckFailureAction,\n      DaffAuthActionTypes.AuthGuardLogoutAction,\n      DaffAuthLoginActionTypes.LogoutSuccessAction,\n    ),\n    map(() => new DaffAuthResetToUnauthenticated()),\n  ));\n\n  clearClientCache$ = createEffect(() => this.actions$.pipe(\n    ofType(\n      DaffAuthActionTypes.ResetToUnauthenticatedAction,\n    ),\n    // map here to be sure that the stream waits for the hook to complete\n    // tap is for side effects and might use setTimeout\n    map(() => {\n      this.unauthenticatedHook();\n    }),\n    tap(() => {\n      this.clientCache.reset();\n    }),\n    switchMap(() => EMPTY),\n  ), { dispatch: false });\n}\n"]}
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.effects.js","sourceRoot":"","sources":["../../../../../libs/auth/state/src/effects/auth.effects.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Injectable,\n  Inject,\n} from '@angular/core';\nimport {\n  Actions,\n  createEffect,\n  ofType,\n} from '@ngrx/effects';\nimport {\n  of,\n  EMPTY,\n  asyncScheduler,\n} from 'rxjs';\nimport {\n  switchMap,\n  catchError,\n  map,\n  repeat,\n  filter,\n  tap,\n  delay,\n} from 'rxjs/operators';\n\nimport {\n  DaffAuthStorageService,\n  DAFF_AUTH_ERROR_MATCHER,\n} from '@daffodil/auth';\nimport {\n  DaffAuthDriverErrorCodes,\n  DaffAuthDriverTokenCheck,\n} from '@daffodil/auth/driver';\nimport {\n  DaffError,\n  DaffServerSideStorageError,\n  DaffStorageServiceError,\n} from '@daffodil/core';\nimport { ErrorTransformer } from '@daffodil/core/state';\nimport {\n  DAFF_DRIVER_HTTP_CLIENT_CACHE_SERVICE,\n  DaffDriverHttpClientCacheServiceInterface,\n} from '@daffodil/driver';\n\nimport {\n  DaffAuthActionTypes,\n  DaffAuthCheckSuccess,\n  DaffAuthCheckFailure,\n  DaffAuthCheck,\n  DaffAuthStorageFailure,\n  DaffAuthServerSide,\n  DaffAuthLoginActionTypes,\n  DaffAuthActions,\n  DaffAuthLoginActions,\n  DaffAuthResetToUnauthenticated,\n} from '../actions/public_api';\nimport {\n  DaffAuthStateConfig,\n  DAFF_AUTH_STATE_CONFIG,\n} from '../config/public_api';\nimport { DaffAuthUnauthenticatedHook } from '../injection-tokens/public_api';\nimport { DAFF_AUTH_UNAUTHENTICATED_HOOK } from '../injection-tokens/unauthenticated/hook.token';\n\n@Injectable()\nexport class DaffAuthEffects {\n  constructor(\n    private actions$: Actions<DaffAuthActions | DaffAuthLoginActions>,\n    private tokenCheck: DaffAuthDriverTokenCheck,\n    @Inject(DAFF_AUTH_ERROR_MATCHER) private errorMatcher: ErrorTransformer,\n    private storage: DaffAuthStorageService,\n    @Inject(DAFF_AUTH_STATE_CONFIG) private config: DaffAuthStateConfig,\n    @Inject(DAFF_DRIVER_HTTP_CLIENT_CACHE_SERVICE) private clientCache: DaffDriverHttpClientCacheServiceInterface,\n    @Inject(DAFF_AUTH_UNAUTHENTICATED_HOOK) private unauthenticatedHook: DaffAuthUnauthenticatedHook,\n  ) {}\n\n  check$ = createEffect(() => this.actions$.pipe(\n    ofType(DaffAuthActionTypes.AuthCheckAction),\n    switchMap((action) =>\n      this.tokenCheck.check().pipe(\n        map(() => new DaffAuthCheckSuccess()),\n        catchError((error: DaffError) => of(new DaffAuthCheckFailure(this.errorMatcher(error)))),\n      ),\n    ),\n  ));\n\n  removeAuthToken$ = createEffect(() => this.actions$.pipe(\n    ofType(\n      DaffAuthActionTypes.AuthCheckFailureAction,\n    ),\n    tap(() => {\n      this.storage.removeAuthToken();\n    }),\n    switchMap(() => EMPTY),\n    catchError((error: Error) => {\n      switch (true) {\n        case error instanceof DaffServerSideStorageError:\n          return of(new DaffAuthServerSide(this.errorMatcher(error)));\n\n        case error instanceof DaffStorageServiceError:\n        default:\n          return of(new DaffAuthStorageFailure(this.errorMatcher(error)));\n      }\n    }),\n  ), { dispatch: false });\n\n  // this needs to be defined after `check$` or else the driver call won't be run\n  authCheckInterval$ = createEffect(() => of(new DaffAuthCheck()).pipe(\n    repeat({ delay: this.config.checkInterval }),\n    filter(() => !!this.storage.getAuthToken()),\n    catchError((error: Error) => {\n      switch (true) {\n        case error instanceof DaffServerSideStorageError:\n          return of(new DaffAuthServerSide(this.errorMatcher(error)));\n\n        case error instanceof DaffStorageServiceError:\n          return of(new DaffAuthStorageFailure(this.errorMatcher(error)));\n\n        default:\n          return EMPTY;\n      }\n    }),\n  ));\n\n  resetToUnauthenticated$ = createEffect(() => this.actions$.pipe(\n    ofType(\n      DaffAuthActionTypes.AuthCheckFailureAction,\n      DaffAuthActionTypes.AuthGuardLogoutAction,\n      DaffAuthLoginActionTypes.LogoutSuccessAction,\n    ),\n    filter((action) => {\n      // if the auth check failure is for any reason other than auth failure, don't reset\n      if (\n        action.type === DaffAuthActionTypes.AuthCheckFailureAction\n        && action.errorMessage.code !== DaffAuthDriverErrorCodes.UNAUTHORIZED\n        && action.errorMessage.code !== DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED\n      ) {\n        return false;\n      }\n\n      return true;\n    }),\n    map((action) => new DaffAuthResetToUnauthenticated(action.type)),\n  ));\n\n  clearClientCache$ = createEffect(() => this.actions$.pipe(\n    ofType(\n      DaffAuthActionTypes.ResetToUnauthenticatedAction,\n    ),\n    switchMap((action) => this.unauthenticatedHook(action.reason)),\n    tap(() => {\n      this.clientCache.reset();\n    }),\n    switchMap(() => EMPTY),\n  ), { dispatch: false });\n}\n"]}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { inject, InjectionToken, } from '@angular/core';
|
|
2
|
+
import { combineLatest } from 'rxjs';
|
|
2
3
|
import { DAFF_AUTH_UNAUTHENTICATED_HOOKS } from './hooks.token';
|
|
3
4
|
/**
|
|
4
5
|
* An internal token to hold the unauthenticated hook.
|
|
@@ -7,9 +8,9 @@ import { DAFF_AUTH_UNAUTHENTICATED_HOOKS } from './hooks.token';
|
|
|
7
8
|
* @docs-private
|
|
8
9
|
*/
|
|
9
10
|
export const DAFF_AUTH_UNAUTHENTICATED_HOOK = new InjectionToken('DAFF_AUTH_UNAUTHENTICATED_HOOK', {
|
|
10
|
-
factory: () =>
|
|
11
|
-
|
|
12
|
-
hook();
|
|
13
|
-
},
|
|
11
|
+
factory: () => {
|
|
12
|
+
const hooks = inject(DAFF_AUTH_UNAUTHENTICATED_HOOKS);
|
|
13
|
+
return (action) => combineLatest(hooks.map((hook) => hook(action)));
|
|
14
|
+
},
|
|
14
15
|
});
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9vay50b2tlbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9zdGF0ZS9zcmMvaW5qZWN0aW9uLXRva2Vucy91bmF1dGhlbnRpY2F0ZWQvaG9vay50b2tlbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsTUFBTSxFQUNOLGNBQWMsR0FDZixNQUFNLGVBQWUsQ0FBQztBQUN2QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBR3JDLE9BQU8sRUFBRSwrQkFBK0IsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUVoRTs7Ozs7R0FLRztBQUNILE1BQU0sQ0FBQyxNQUFNLDhCQUE4QixHQUFHLElBQUksY0FBYyxDQUM5RCxnQ0FBZ0MsRUFDaEM7SUFDRSxPQUFPLEVBQUUsR0FBRyxFQUFFO1FBQ1osTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLCtCQUErQixDQUFDLENBQUM7UUFDdEQsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdEUsQ0FBQztDQUNGLENBQ0YsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIGluamVjdCxcbiAgSW5qZWN0aW9uVG9rZW4sXG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgY29tYmluZUxhdGVzdCB9IGZyb20gJ3J4anMnO1xuXG5pbXBvcnQgeyBEYWZmQXV0aFVuYXV0aGVudGljYXRlZEhvb2sgfSBmcm9tICcuL2hvb2sudHlwZSc7XG5pbXBvcnQgeyBEQUZGX0FVVEhfVU5BVVRIRU5USUNBVEVEX0hPT0tTIH0gZnJvbSAnLi9ob29rcy50b2tlbic7XG5cbi8qKlxuICogQW4gaW50ZXJuYWwgdG9rZW4gdG8gaG9sZCB0aGUgdW5hdXRoZW50aWNhdGVkIGhvb2suXG4gKiBDb21iaW5lcyB0aGUgbXVsdGkgcHJvdmlkZWQgaG9va3MgaW50byBhIHNpbmdsZSBmdW5jdGlvbi5cbiAqXG4gKiBAZG9jcy1wcml2YXRlXG4gKi9cbmV4cG9ydCBjb25zdCBEQUZGX0FVVEhfVU5BVVRIRU5USUNBVEVEX0hPT0sgPSBuZXcgSW5qZWN0aW9uVG9rZW48RGFmZkF1dGhVbmF1dGhlbnRpY2F0ZWRIb29rPihcbiAgJ0RBRkZfQVVUSF9VTkFVVEhFTlRJQ0FURURfSE9PSycsXG4gIHtcbiAgICBmYWN0b3J5OiAoKSA9PiB7XG4gICAgICBjb25zdCBob29rcyA9IGluamVjdChEQUZGX0FVVEhfVU5BVVRIRU5USUNBVEVEX0hPT0tTKTtcbiAgICAgIHJldHVybiAoYWN0aW9uKSA9PiBjb21iaW5lTGF0ZXN0KGhvb2tzLm1hcCgoaG9vaykgPT4gaG9vayhhY3Rpb24pKSk7XG4gICAgfSxcbiAgfSxcbik7XG4iXX0=
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export {};
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9vay50eXBlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vbGlicy9hdXRoL3N0YXRlL3NyYy9pbmplY3Rpb24tdG9rZW5zL3VuYXV0aGVudGljYXRlZC9ob29rLnR5cGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFjdGlvbiB9IGZyb20gJ0BuZ3J4L3N0b3JlJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcblxuLyoqXG4gKiBBIGZ1bmN0aW9uIHRoYXQgaXMgY2FsbGVkIHdoZW4gdGhlIHVzZXIgaXMgdW5hdXRoZW50aWNhdGVkLlxuICogV2hlbiBhIGxvZ2dlZC1pbiB1c2VyIGlzIHVuYXV0aGVudGljYXRlZCwgdmFyaW91cyBwYWNrYWdlcyBtYXkgcGVyZm9ybSBjbGVhbnVwIHRhc2tzLlxuICogVGhlc2UgaG9va3Mgd2lsbCBiZSBjYWxsZWQgaW4gbm8gcGFydGljdWxhciBvcmRlciBiZWZvcmUgdGhlIGNsaWVudCBkcml2ZXIgc3RhdGUgaXMgcmVzZXQuXG4gKiBEYWZmb2RpbCB3aWxsIHdhaXQgZm9yIGF0IGxlYXN0IG9uZSBlbWlzc2lvbiBmcm9tIGVhY2ggaG9vayBiZWZvcmUgcHJvY2VlZGluZy5cbiAqL1xuZXhwb3J0IHR5cGUgRGFmZkF1dGhVbmF1dGhlbnRpY2F0ZWRIb29rID0gKHRyaWdnZXI6IEFjdGlvblsndHlwZSddKSA9PiBPYnNlcnZhYmxlPHVua25vd24+O1xuIl19
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { InjectionToken, } from '@angular/core';
|
|
2
2
|
/**
|
|
3
3
|
* A token to hold the unauthenticated hooks.
|
|
4
|
-
*
|
|
5
|
-
* These are guaranteed to run synchronously before the client driver state is fully reset.
|
|
4
|
+
* See {@link DaffAuthUnauthenticatedHook}.
|
|
6
5
|
*
|
|
7
6
|
* Prefer using {@link daffAuthProvideUnauthenticatedHooks}.
|
|
8
7
|
*/
|
|
@@ -26,4 +25,4 @@ export function daffAuthProvideUnauthenticatedHooks(...hooks) {
|
|
|
26
25
|
multi: true,
|
|
27
26
|
}));
|
|
28
27
|
}
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9va3MudG9rZW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9saWJzL2F1dGgvc3RhdGUvc3JjL2luamVjdGlvbi10b2tlbnMvdW5hdXRoZW50aWNhdGVkL2hvb2tzLnRva2VuLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxjQUFjLEdBRWYsTUFBTSxlQUFlLENBQUM7QUFJdkI7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsTUFBTSwrQkFBK0IsR0FBRyxJQUFJLGNBQWMsQ0FDL0QsaUNBQWlDLEVBQ2pDLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDLEVBQUUsRUFBQyxDQUNyQixDQUFDO0FBRUY7Ozs7Ozs7Ozs7O0dBV0c7QUFDSCxNQUFNLFVBQVUsbUNBQW1DLENBQ2pELEdBQUcsS0FBb0M7SUFFdkMsT0FBTyxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN4QixPQUFPLEVBQUUsK0JBQStCO1FBQ3hDLFFBQVEsRUFBRSxJQUFJO1FBQ2QsS0FBSyxFQUFFLElBQUk7S0FDWixDQUFDLENBQUMsQ0FBQztBQUNOLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBJbmplY3Rpb25Ub2tlbixcbiAgUHJvdmlkZXIsXG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5pbXBvcnQgeyBEYWZmQXV0aFVuYXV0aGVudGljYXRlZEhvb2sgfSBmcm9tICcuL2hvb2sudHlwZSc7XG5cbi8qKlxuICogQSB0b2tlbiB0byBob2xkIHRoZSB1bmF1dGhlbnRpY2F0ZWQgaG9va3MuXG4gKiBTZWUge0BsaW5rIERhZmZBdXRoVW5hdXRoZW50aWNhdGVkSG9va30uXG4gKlxuICogUHJlZmVyIHVzaW5nIHtAbGluayBkYWZmQXV0aFByb3ZpZGVVbmF1dGhlbnRpY2F0ZWRIb29rc30uXG4gKi9cbmV4cG9ydCBjb25zdCBEQUZGX0FVVEhfVU5BVVRIRU5USUNBVEVEX0hPT0tTID0gbmV3IEluamVjdGlvblRva2VuPERhZmZBdXRoVW5hdXRoZW50aWNhdGVkSG9va1tdPihcbiAgJ0RBRkZfQVVUSF9VTkFVVEhFTlRJQ0FURURfSE9PS1MnLFxuICB7IGZhY3Rvcnk6ICgpID0+IFtdfSxcbik7XG5cbi8qKlxuICogUHJvdmlkZXMge0BsaW5rIERBRkZfQVVUSF9VTkFVVEhFTlRJQ0FURURfSE9PS1N9LlxuICpcbiAqIGBgYHRzXG4gKiBwcm92aWRlcnM6IFtcbiAqICAgLi4uZGFmZkF1dGhQcm92aWRlVW5hdXRoZW50aWNhdGVkSG9va3MoXG4gKiAgICAgbXlSZWR1Y2VyMSxcbiAqICAgICBteVJlZHVjZXIyXG4gKiAgIClcbiAqIF1cbiAqIGBgYFxuICovXG5leHBvcnQgZnVuY3Rpb24gZGFmZkF1dGhQcm92aWRlVW5hdXRoZW50aWNhdGVkSG9va3MoXG4gIC4uLmhvb2tzOiBEYWZmQXV0aFVuYXV0aGVudGljYXRlZEhvb2tbXVxuKTogUHJvdmlkZXJbXSB7XG4gIHJldHVybiBob29rcy5tYXAoaG9vayA9PiAoe1xuICAgIHByb3ZpZGU6IERBRkZfQVVUSF9VTkFVVEhFTlRJQ0FURURfSE9PS1MsXG4gICAgdXNlVmFsdWU6IGhvb2ssXG4gICAgbXVsdGk6IHRydWUsXG4gIH0pKTtcbn1cbiJdfQ==
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export { daffAuthProvideUnauthenticatedHooks, DAFF_AUTH_UNAUTHENTICATED_HOOKS, } from './hooks.token';
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2FwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9zdGF0ZS9zcmMvaW5qZWN0aW9uLXRva2Vucy91bmF1dGhlbnRpY2F0ZWQvcHVibGljX2FwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsbUNBQW1DLEVBQ25DLCtCQUErQixHQUNoQyxNQUFNLGVBQWUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCB7XG4gIGRhZmZBdXRoUHJvdmlkZVVuYXV0aGVudGljYXRlZEhvb2tzLFxuICBEQUZGX0FVVEhfVU5BVVRIRU5USUNBVEVEX0hPT0tTLFxufSBmcm9tICcuL2hvb2tzLnRva2VuJztcbmV4cG9ydCB7IERhZmZBdXRoVW5hdXRoZW50aWNhdGVkSG9vayB9IGZyb20gJy4vaG9vay50eXBlJztcbiJdfQ==
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
|
-
import { InjectionToken, Injectable, Inject, NgModule } from '@angular/core';
|
|
3
|
-
import { of, EMPTY } from 'rxjs';
|
|
2
|
+
import { InjectionToken, Injectable, Inject, NgModule, inject } from '@angular/core';
|
|
3
|
+
import { of, from, EMPTY } from 'rxjs';
|
|
4
4
|
import { tap, map, catchError, filter, switchMap } from 'rxjs/operators';
|
|
5
5
|
import * as i2 from '@daffodil/auth';
|
|
6
6
|
import { DAFF_AUTH_ERROR_MATCHER } from '@daffodil/auth';
|
|
7
7
|
import * as i1 from '@daffodil/auth/driver';
|
|
8
8
|
import { DaffAuthDriverErrorCodes } from '@daffodil/auth/driver';
|
|
9
9
|
import * as i1$1 from '@daffodil/auth/state';
|
|
10
|
-
import { DaffAuthGuardLogout, DaffResetPasswordLanding, DaffAuthLoginActionTypes, DaffAuthRegisterActionTypes, DaffAuthResetPasswordActionTypes,
|
|
10
|
+
import { DaffAuthGuardLogout, DaffResetPasswordLanding, DaffAuthActionTypes, DaffAuthLoginActionTypes, DaffAuthRegisterActionTypes, DaffAuthResetPasswordActionTypes, DAFF_AUTH_UNAUTHENTICATED_HOOKS } from '@daffodil/auth/state';
|
|
11
11
|
import * as i3 from '@angular/router';
|
|
12
|
+
import { Router, ActivatedRoute } from '@angular/router';
|
|
12
13
|
import * as i4 from '@ngrx/store';
|
|
13
14
|
import * as i1$2 from '@ngrx/effects';
|
|
14
15
|
import { createEffect, ofType, EffectsModule } from '@ngrx/effects';
|
|
@@ -33,7 +34,7 @@ class MemberOnlyGuard {
|
|
|
33
34
|
}
|
|
34
35
|
isAuthenticated() {
|
|
35
36
|
return this.tokenCheck.check().pipe(map(() => true), catchError((error) => {
|
|
36
|
-
if (error.code === DaffAuthDriverErrorCodes.UNAUTHORIZED) {
|
|
37
|
+
if (error.code === DaffAuthDriverErrorCodes.UNAUTHORIZED || error.code === DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED) {
|
|
37
38
|
this.storage.removeAuthToken();
|
|
38
39
|
this.store.dispatch(new DaffAuthGuardLogout(this.errorMatcher(error)));
|
|
39
40
|
}
|
|
@@ -78,7 +79,7 @@ class GuestOnlyGuard {
|
|
|
78
79
|
}
|
|
79
80
|
isUnauthenticated() {
|
|
80
81
|
return this.tokenCheck.check().pipe(map(() => false), catchError((error) => {
|
|
81
|
-
if (error.code === DaffAuthDriverErrorCodes.UNAUTHORIZED) {
|
|
82
|
+
if (error.code === DaffAuthDriverErrorCodes.UNAUTHORIZED || error.code === DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED) {
|
|
82
83
|
this.storage.removeAuthToken();
|
|
83
84
|
this.store.dispatch(new DaffAuthGuardLogout(this.errorMatcher(error)));
|
|
84
85
|
}
|
|
@@ -153,6 +154,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
153
154
|
}] }];
|
|
154
155
|
} });
|
|
155
156
|
|
|
157
|
+
function daffAuthRoutingRedirectUnauthenticatedHookFactory(router, route, config) {
|
|
158
|
+
return (trigger) => {
|
|
159
|
+
switch (trigger) {
|
|
160
|
+
case DaffAuthLoginActionTypes.LogoutSuccessAction:
|
|
161
|
+
return from(router.navigateByUrl(route.snapshot.queryParamMap.get(config.redirectUrlParam) || config.logoutRedirectPath));
|
|
162
|
+
case DaffAuthActionTypes.AuthCheckFailureAction:
|
|
163
|
+
case DaffAuthActionTypes.AuthGuardLogoutAction:
|
|
164
|
+
return from(router.navigateByUrl(route.snapshot.queryParamMap.get(config.redirectUrlParam) || config.tokenExpirationRedirectPath));
|
|
165
|
+
default:
|
|
166
|
+
return of(null);
|
|
167
|
+
}
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
|
|
156
171
|
class DaffAuthRoutingModule {
|
|
157
172
|
static withConfig(config) {
|
|
158
173
|
return {
|
|
@@ -198,12 +213,6 @@ class DaffAuthRedirectEffects {
|
|
|
198
213
|
}), tap((action) => {
|
|
199
214
|
this.router.navigateByUrl(this.route.snapshot.queryParamMap.get(this.config.redirectUrlParam) || this.config.authCompleteRedirectPath);
|
|
200
215
|
}), switchMap(() => EMPTY)), { dispatch: false });
|
|
201
|
-
this.redirectAfterLogout$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthLoginActionTypes.LogoutSuccessAction), tap((action) => {
|
|
202
|
-
this.router.navigateByUrl(this.route.snapshot.queryParamMap.get(this.config.redirectUrlParam) || this.config.logoutRedirectPath);
|
|
203
|
-
}), switchMap(() => EMPTY)), { dispatch: false });
|
|
204
|
-
this.redirectAfterExpiration$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.AuthCheckFailureAction, DaffAuthActionTypes.AuthGuardLogoutAction), tap(() => {
|
|
205
|
-
this.router.navigateByUrl(this.route.snapshot.queryParamMap.get(this.config.redirectUrlParam) || this.config.tokenExpirationRedirectPath);
|
|
206
|
-
}), switchMap(() => EMPTY)), { dispatch: false });
|
|
207
216
|
}
|
|
208
217
|
}
|
|
209
218
|
/** @nocollapse */ DaffAuthRedirectEffects.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRedirectEffects, deps: [{ token: i1$2.Actions }, { token: i3.Router }, { token: i3.ActivatedRoute }, { token: DAFF_AUTH_ROUTING_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -221,7 +230,13 @@ class DaffAuthRoutingRedirectModule {
|
|
|
221
230
|
}
|
|
222
231
|
/** @nocollapse */ DaffAuthRoutingRedirectModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRoutingRedirectModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
223
232
|
/** @nocollapse */ DaffAuthRoutingRedirectModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRoutingRedirectModule, imports: [i1$2.EffectsFeatureModule] });
|
|
224
|
-
/** @nocollapse */ DaffAuthRoutingRedirectModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRoutingRedirectModule,
|
|
233
|
+
/** @nocollapse */ DaffAuthRoutingRedirectModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRoutingRedirectModule, providers: [
|
|
234
|
+
{
|
|
235
|
+
provide: DAFF_AUTH_UNAUTHENTICATED_HOOKS,
|
|
236
|
+
multi: true,
|
|
237
|
+
useFactory: (() => daffAuthRoutingRedirectUnauthenticatedHookFactory(inject(Router), inject(ActivatedRoute), inject(DAFF_AUTH_ROUTING_CONFIG))),
|
|
238
|
+
},
|
|
239
|
+
], imports: [[
|
|
225
240
|
EffectsModule.forFeature([
|
|
226
241
|
DaffAuthRedirectEffects,
|
|
227
242
|
]),
|
|
@@ -234,6 +249,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
234
249
|
DaffAuthRedirectEffects,
|
|
235
250
|
]),
|
|
236
251
|
],
|
|
252
|
+
providers: [
|
|
253
|
+
{
|
|
254
|
+
provide: DAFF_AUTH_UNAUTHENTICATED_HOOKS,
|
|
255
|
+
multi: true,
|
|
256
|
+
useFactory: (() => daffAuthRoutingRedirectUnauthenticatedHookFactory(inject(Router), inject(ActivatedRoute), inject(DAFF_AUTH_ROUTING_CONFIG))),
|
|
257
|
+
},
|
|
258
|
+
],
|
|
237
259
|
}]
|
|
238
260
|
}] });
|
|
239
261
|
|
|
@@ -241,5 +263,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
241
263
|
* Generated bundle index. Do not edit.
|
|
242
264
|
*/
|
|
243
265
|
|
|
244
|
-
export { DAFF_AUTH_ROUTING_CONFIG, DAFF_AUTH_ROUTING_CONFIG_DEFAULT, DaffAuthGuestOnlyGuardRedirectUrl, DaffAuthMemberOnlyGuardRedirectUrl, DaffAuthResetPasswordGuard, DaffAuthRoutingModule, DaffAuthRoutingRedirectModule, GuestOnlyGuard, MemberOnlyGuard, provideDaffAuthRoutingConfig };
|
|
266
|
+
export { DAFF_AUTH_ROUTING_CONFIG, DAFF_AUTH_ROUTING_CONFIG_DEFAULT, DaffAuthGuestOnlyGuardRedirectUrl, DaffAuthMemberOnlyGuardRedirectUrl, DaffAuthResetPasswordGuard, DaffAuthRoutingModule, DaffAuthRoutingRedirectModule, GuestOnlyGuard, MemberOnlyGuard, daffAuthRoutingRedirectUnauthenticatedHookFactory, provideDaffAuthRoutingConfig };
|
|
245
267
|
//# sourceMappingURL=daffodil-auth-routing.mjs.map
|