@daffodil/auth 0.62.0 → 0.62.1
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/constants/public_api.d.ts +1 -0
- package/driver/constants/unauthenticated-error-codes.d.ts +11 -0
- package/driver/in-memory/package.json +1 -1
- package/driver/magento/package.json +1 -1
- package/driver/package.json +1 -1
- package/driver/public_api.d.ts +1 -0
- package/driver/testing/package.json +1 -1
- package/esm2020/driver/constants/public_api.mjs +2 -0
- package/esm2020/driver/constants/unauthenticated-error-codes.mjs +14 -0
- package/esm2020/driver/public_api.mjs +2 -1
- package/esm2020/routing/guards/guest-only.guard.mjs +3 -4
- package/esm2020/routing/guards/member-only.guard.mjs +3 -4
- package/esm2020/state/auth-state.module.mjs +41 -3
- package/esm2020/state/effects/auth.effects.mjs +5 -16
- package/esm2020/state/effects/login.effects.mjs +2 -2
- package/fesm2015/daffodil-auth-driver.mjs +14 -2
- package/fesm2015/daffodil-auth-driver.mjs.map +1 -1
- package/fesm2015/daffodil-auth-routing.mjs +3 -5
- package/fesm2015/daffodil-auth-routing.mjs.map +1 -1
- package/fesm2015/daffodil-auth-state.mjs +43 -19
- package/fesm2015/daffodil-auth-state.mjs.map +1 -1
- package/fesm2020/daffodil-auth-driver.mjs +14 -2
- package/fesm2020/daffodil-auth-driver.mjs.map +1 -1
- package/fesm2020/daffodil-auth-routing.mjs +3 -5
- package/fesm2020/daffodil-auth-routing.mjs.map +1 -1
- package/fesm2020/daffodil-auth-state.mjs +43 -19
- package/fesm2020/daffodil-auth-state.mjs.map +1 -1
- package/package.json +1 -1
- package/routing/package.json +1 -1
- package/state/effects/auth.effects.d.ts +0 -1
- package/state/package.json +1 -1
- package/state/testing/package.json +1 -1
- package/testing/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './unauthenticated-error-codes';
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The error codes that indicate that the user definitely should not be in an unauthenticated state
|
|
3
|
+
* and if an auth token exists in storage, it is invalid.
|
|
4
|
+
* These are contrasted to network failures and other sporadic and generic errors that aren't
|
|
5
|
+
* a guarantee of the token's invalidity.
|
|
6
|
+
*/
|
|
7
|
+
export declare const DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES: {
|
|
8
|
+
DAFF_AUTH_UNAUTHORIZED: boolean;
|
|
9
|
+
DAFF_AUTH_AUTHENTICATION_FAILED: boolean;
|
|
10
|
+
DAFF_AUTH_MISSING_TOKEN: boolean;
|
|
11
|
+
};
|
|
@@ -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.62.
|
|
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.1"}
|
|
@@ -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.62.
|
|
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.1"}
|
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.62.
|
|
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.1"}
|
package/driver/public_api.d.ts
CHANGED
|
@@ -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.62.
|
|
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.1"}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export * from './unauthenticated-error-codes';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2FwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9kcml2ZXIvc3JjL2NvbnN0YW50cy9wdWJsaWNfYXBpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsK0JBQStCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tICcuL3VuYXV0aGVudGljYXRlZC1lcnJvci1jb2Rlcyc7XG4iXX0=
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { DaffAuthErrorCodes } from '@daffodil/auth';
|
|
2
|
+
import { DaffAuthDriverErrorCodes } from '../errors/public_api';
|
|
3
|
+
/**
|
|
4
|
+
* The error codes that indicate that the user definitely should not be in an unauthenticated state
|
|
5
|
+
* and if an auth token exists in storage, it is invalid.
|
|
6
|
+
* These are contrasted to network failures and other sporadic and generic errors that aren't
|
|
7
|
+
* a guarantee of the token's invalidity.
|
|
8
|
+
*/
|
|
9
|
+
export const DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES = {
|
|
10
|
+
[DaffAuthDriverErrorCodes.UNAUTHORIZED]: true,
|
|
11
|
+
[DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED]: true,
|
|
12
|
+
[DaffAuthErrorCodes.MISSING_TOKEN]: true,
|
|
13
|
+
};
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5hdXRoZW50aWNhdGVkLWVycm9yLWNvZGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGlicy9hdXRoL2RyaXZlci9zcmMvY29uc3RhbnRzL3VuYXV0aGVudGljYXRlZC1lcnJvci1jb2Rlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVwRCxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVoRTs7Ozs7R0FLRztBQUNILE1BQU0sQ0FBQyxNQUFNLHFDQUFxQyxHQUFHO0lBQ25ELENBQUMsd0JBQXdCLENBQUMsWUFBWSxDQUFDLEVBQUUsSUFBSTtJQUM3QyxDQUFDLHdCQUF3QixDQUFDLHFCQUFxQixDQUFDLEVBQUUsSUFBSTtJQUN0RCxDQUFDLGtCQUFrQixDQUFDLGFBQWEsQ0FBQyxFQUFFLElBQUk7Q0FDekMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERhZmZBdXRoRXJyb3JDb2RlcyB9IGZyb20gJ0BkYWZmb2RpbC9hdXRoJztcblxuaW1wb3J0IHsgRGFmZkF1dGhEcml2ZXJFcnJvckNvZGVzIH0gZnJvbSAnLi4vZXJyb3JzL3B1YmxpY19hcGknO1xuXG4vKipcbiAqIFRoZSBlcnJvciBjb2RlcyB0aGF0IGluZGljYXRlIHRoYXQgdGhlIHVzZXIgZGVmaW5pdGVseSBzaG91bGQgbm90IGJlIGluIGFuIHVuYXV0aGVudGljYXRlZCBzdGF0ZVxuICogYW5kIGlmIGFuIGF1dGggdG9rZW4gZXhpc3RzIGluIHN0b3JhZ2UsIGl0IGlzIGludmFsaWQuXG4gKiBUaGVzZSBhcmUgY29udHJhc3RlZCB0byBuZXR3b3JrIGZhaWx1cmVzIGFuZCBvdGhlciBzcG9yYWRpYyBhbmQgZ2VuZXJpYyBlcnJvcnMgdGhhdCBhcmVuJ3RcbiAqIGEgZ3VhcmFudGVlIG9mIHRoZSB0b2tlbidzIGludmFsaWRpdHkuXG4gKi9cbmV4cG9ydCBjb25zdCBEQUZGX0FVVEhfVU5BVVRIRU5USUNBVEVEX0VSUk9SX0NPREVTID0ge1xuICBbRGFmZkF1dGhEcml2ZXJFcnJvckNvZGVzLlVOQVVUSE9SSVpFRF06IHRydWUsXG4gIFtEYWZmQXV0aERyaXZlckVycm9yQ29kZXMuQVVUSEVOVElDQVRJT05fRkFJTEVEXTogdHJ1ZSxcbiAgW0RhZmZBdXRoRXJyb3JDb2Rlcy5NSVNTSU5HX1RPS0VOXTogdHJ1ZSxcbn07XG4iXX0=
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export * from './interfaces/public_api';
|
|
2
2
|
export * from './errors/public_api';
|
|
3
3
|
export * from './services/public_api';
|
|
4
|
-
|
|
4
|
+
export * from './constants/public_api';
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2FwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYnMvYXV0aC9kcml2ZXIvc3JjL3B1YmxpY19hcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYyx3QkFBd0IsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCAqIGZyb20gJy4vaW50ZXJmYWNlcy9wdWJsaWNfYXBpJztcbmV4cG9ydCAqIGZyb20gJy4vZXJyb3JzL3B1YmxpY19hcGknO1xuZXhwb3J0ICogZnJvbSAnLi9zZXJ2aWNlcy9wdWJsaWNfYXBpJztcbmV4cG9ydCAqIGZyb20gJy4vY29uc3RhbnRzL3B1YmxpY19hcGknO1xuIl19
|
|
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
|
|
|
4
4
|
import { of, } from 'rxjs';
|
|
5
5
|
import { catchError, map, tap, } from 'rxjs/operators';
|
|
6
6
|
import { DAFF_AUTH_ERROR_MATCHER, DaffAuthStorageService, } from '@daffodil/auth';
|
|
7
|
-
import {
|
|
7
|
+
import { DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES, DaffAuthDriverTokenCheck, } from '@daffodil/auth/driver';
|
|
8
8
|
import { DaffAuthGuardLogout } from '@daffodil/auth/state';
|
|
9
9
|
import { DaffAuthGuestOnlyGuardRedirectUrl } from './guest-only-guard-redirect.token';
|
|
10
10
|
import * as i0 from "@angular/core";
|
|
@@ -30,8 +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
|
|
34
|
-
this.storage.removeAuthToken();
|
|
33
|
+
if (DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES[error.code]) {
|
|
35
34
|
this.store.dispatch(new DaffAuthGuardLogout(this.errorMatcher(error)));
|
|
36
35
|
}
|
|
37
36
|
return of(true);
|
|
@@ -52,4 +51,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
52
51
|
type: Inject,
|
|
53
52
|
args: [DaffAuthGuestOnlyGuardRedirectUrl]
|
|
54
53
|
}] }]; } });
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3Vlc3Qtb25seS5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9yb3V0aW5nL3NyYy9ndWFyZHMvZ3Vlc3Qtb25seS5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsTUFBTSxFQUNOLFVBQVUsR0FDWCxNQUFNLGVBQWUsQ0FBQztBQUN2QixPQUFPLEVBRUwsTUFBTSxHQUNQLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNwQyxPQUFPLEVBRUwsRUFBRSxHQUNILE1BQU0sTUFBTSxDQUFDO0FBQ2QsT0FBTyxFQUNMLFVBQVUsRUFDVixHQUFHLEVBQ0gsR0FBRyxHQUNKLE1BQU0sZ0JBQWdCLENBQUM7QUFFeEIsT0FBTyxFQUNMLHVCQUF1QixFQUN2QixzQkFBc0IsR0FDdkIsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QixPQUFPLEVBQ0wscUNBQXFDLEVBRXJDLHdCQUF3QixHQUN6QixNQUFNLHVCQUF1QixDQUFDO0FBQy9CLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBSTNELE9BQU8sRUFBRSxpQ0FBaUMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDOzs7Ozs7QUFLdEYsTUFBTSxPQUFPLGNBQWM7SUFDekIsWUFDVSxVQUFvQyxFQUNwQyxPQUErQixFQUMvQixNQUFjLEVBQ2QsS0FBWSxFQUNxQixZQUE4QixFQUNwQixXQUFtQjtRQUw5RCxlQUFVLEdBQVYsVUFBVSxDQUEwQjtRQUNwQyxZQUFPLEdBQVAsT0FBTyxDQUF3QjtRQUMvQixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2QsVUFBSyxHQUFMLEtBQUssQ0FBTztRQUNxQixpQkFBWSxHQUFaLFlBQVksQ0FBa0I7UUFDcEIsZ0JBQVcsR0FBWCxXQUFXLENBQVE7SUFDckUsQ0FBQztJQUVKLFdBQVc7UUFDVCxPQUFPLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLElBQUksQ0FDbEMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQ1gsSUFBSSxDQUFDLE1BQU0sRUFBRTtnQkFDWCxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7YUFDN0M7UUFDSCxDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVPLGlCQUFpQjtRQUN2QixPQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUNqQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLEVBQ2hCLFVBQVUsQ0FBQyxDQUFDLEtBQWdCLEVBQUUsRUFBRTtZQUM5QixJQUFJLHFDQUFxQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDckQsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBSSxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQzthQUN4RTtZQUNELE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xCLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOzs4SEE5QlUsY0FBYywySUFNZix1QkFBdUIsYUFDdkIsaUNBQWlDO2tJQVBoQyxjQUFjLGNBRmIsS0FBSzsyRkFFTixjQUFjO2tCQUgxQixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxLQUFLO2lCQUNsQjs7MEJBT0ksTUFBTTsyQkFBQyx1QkFBdUI7OzBCQUM5QixNQUFNOzJCQUFDLGlDQUFpQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEluamVjdCxcbiAgSW5qZWN0YWJsZSxcbn0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge1xuICBDYW5BY3RpdmF0ZSxcbiAgUm91dGVyLFxufSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgU3RvcmUgfSBmcm9tICdAbmdyeC9zdG9yZSc7XG5pbXBvcnQge1xuICBPYnNlcnZhYmxlLFxuICBvZixcbn0gZnJvbSAncnhqcyc7XG5pbXBvcnQge1xuICBjYXRjaEVycm9yLFxuICBtYXAsXG4gIHRhcCxcbn0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG5pbXBvcnQge1xuICBEQUZGX0FVVEhfRVJST1JfTUFUQ0hFUixcbiAgRGFmZkF1dGhTdG9yYWdlU2VydmljZSxcbn0gZnJvbSAnQGRhZmZvZGlsL2F1dGgnO1xuaW1wb3J0IHtcbiAgREFGRl9BVVRIX1VOQVVUSEVOVElDQVRFRF9FUlJPUl9DT0RFUyxcbiAgRGFmZkF1dGhEcml2ZXJFcnJvckNvZGVzLFxuICBEYWZmQXV0aERyaXZlclRva2VuQ2hlY2ssXG59IGZyb20gJ0BkYWZmb2RpbC9hdXRoL2RyaXZlcic7XG5pbXBvcnQgeyBEYWZmQXV0aEd1YXJkTG9nb3V0IH0gZnJvbSAnQGRhZmZvZGlsL2F1dGgvc3RhdGUnO1xuaW1wb3J0IHsgRGFmZkVycm9yIH0gZnJvbSAnQGRhZmZvZGlsL2NvcmUnO1xuaW1wb3J0IHsgRXJyb3JUcmFuc2Zvcm1lciB9IGZyb20gJ0BkYWZmb2RpbC9jb3JlL3N0YXRlJztcblxuaW1wb3J0IHsgRGFmZkF1dGhHdWVzdE9ubHlHdWFyZFJlZGlyZWN0VXJsIH0gZnJvbSAnLi9ndWVzdC1vbmx5LWd1YXJkLXJlZGlyZWN0LnRva2VuJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAnYW55Jyxcbn0pXG5leHBvcnQgY2xhc3MgR3Vlc3RPbmx5R3VhcmQgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgdG9rZW5DaGVjazogRGFmZkF1dGhEcml2ZXJUb2tlbkNoZWNrLFxuICAgIHByaXZhdGUgc3RvcmFnZTogRGFmZkF1dGhTdG9yYWdlU2VydmljZSxcbiAgICBwcml2YXRlIHJvdXRlcjogUm91dGVyLFxuICAgIHByaXZhdGUgc3RvcmU6IFN0b3JlLFxuICAgIEBJbmplY3QoREFGRl9BVVRIX0VSUk9SX01BVENIRVIpIHByaXZhdGUgZXJyb3JNYXRjaGVyOiBFcnJvclRyYW5zZm9ybWVyLFxuICAgIEBJbmplY3QoRGFmZkF1dGhHdWVzdE9ubHlHdWFyZFJlZGlyZWN0VXJsKSBwcml2YXRlIHJlZGlyZWN0VXJsOiBzdHJpbmcsXG4gICkge31cblxuICBjYW5BY3RpdmF0ZSgpOiBPYnNlcnZhYmxlPGJvb2xlYW4+IHtcbiAgICByZXR1cm4gdGhpcy5pc1VuYXV0aGVudGljYXRlZCgpLnBpcGUoXG4gICAgICB0YXAocmVzdWx0ID0+IHtcbiAgICAgICAgaWYgKCFyZXN1bHQpIHtcbiAgICAgICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZUJ5VXJsKHRoaXMucmVkaXJlY3RVcmwpO1xuICAgICAgICB9XG4gICAgICB9KSxcbiAgICApO1xuICB9XG5cbiAgcHJpdmF0ZSBpc1VuYXV0aGVudGljYXRlZCgpOiBPYnNlcnZhYmxlPGJvb2xlYW4+IHtcbiAgICByZXR1cm4gdGhpcy50b2tlbkNoZWNrLmNoZWNrKCkucGlwZShcbiAgICAgIG1hcCgoKSA9PiBmYWxzZSksXG4gICAgICBjYXRjaEVycm9yKChlcnJvcjogRGFmZkVycm9yKSA9PiB7XG4gICAgICAgIGlmIChEQUZGX0FVVEhfVU5BVVRIRU5USUNBVEVEX0VSUk9SX0NPREVTW2Vycm9yLmNvZGVdKSB7XG4gICAgICAgICAgdGhpcy5zdG9yZS5kaXNwYXRjaChuZXcgRGFmZkF1dGhHdWFyZExvZ291dCh0aGlzLmVycm9yTWF0Y2hlcihlcnJvcikpKTtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gb2YodHJ1ZSk7XG4gICAgICB9KSxcbiAgICApO1xuICB9XG59XG4iXX0=
|
|
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
|
|
|
4
4
|
import { of, } from 'rxjs';
|
|
5
5
|
import { catchError, map, tap, } from 'rxjs/operators';
|
|
6
6
|
import { DAFF_AUTH_ERROR_MATCHER, DaffAuthStorageService, } from '@daffodil/auth';
|
|
7
|
-
import {
|
|
7
|
+
import { DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES, DaffAuthDriverTokenCheck, } from '@daffodil/auth/driver';
|
|
8
8
|
import { DaffAuthGuardLogout } from '@daffodil/auth/state';
|
|
9
9
|
import { DaffAuthMemberOnlyGuardRedirectUrl } from './member-only-guard-redirect.token';
|
|
10
10
|
import * as i0 from "@angular/core";
|
|
@@ -30,8 +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
|
|
34
|
-
this.storage.removeAuthToken();
|
|
33
|
+
if (DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES[error.code]) {
|
|
35
34
|
this.store.dispatch(new DaffAuthGuardLogout(this.errorMatcher(error)));
|
|
36
35
|
}
|
|
37
36
|
return of(false);
|
|
@@ -52,4 +51,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
52
51
|
type: Inject,
|
|
53
52
|
args: [DaffAuthMemberOnlyGuardRedirectUrl]
|
|
54
53
|
}] }]; } });
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtYmVyLW9ubHkuZ3VhcmQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWJzL2F1dGgvcm91dGluZy9zcmMvZ3VhcmRzL21lbWJlci1vbmx5Lmd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxNQUFNLEVBQ04sVUFBVSxHQUNYLE1BQU0sZUFBZSxDQUFDO0FBQ3ZCLE9BQU8sRUFFTCxNQUFNLEdBQ1AsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3BDLE9BQU8sRUFFTCxFQUFFLEdBQ0gsTUFBTSxNQUFNLENBQUM7QUFDZCxPQUFPLEVBQ0wsVUFBVSxFQUNWLEdBQUcsRUFDSCxHQUFHLEdBQ0osTUFBTSxnQkFBZ0IsQ0FBQztBQUV4QixPQUFPLEVBQ0wsdUJBQXVCLEVBQ3ZCLHNCQUFzQixHQUN2QixNQUFNLGdCQUFnQixDQUFDO0FBQ3hCLE9BQU8sRUFDTCxxQ0FBcUMsRUFFckMsd0JBQXdCLEdBQ3pCLE1BQU0sdUJBQXVCLENBQUM7QUFDL0IsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFJM0QsT0FBTyxFQUFFLGtDQUFrQyxFQUFFLE1BQU0sb0NBQW9DLENBQUM7Ozs7OztBQU14RixNQUFNLE9BQU8sZUFBZTtJQUMxQixZQUNVLFVBQW9DLEVBQ3BDLE9BQStCLEVBQy9CLE1BQWMsRUFDZCxLQUFZLEVBQ3FCLFlBQThCLEVBQ25CLFdBQW1CO1FBTC9ELGVBQVUsR0FBVixVQUFVLENBQTBCO1FBQ3BDLFlBQU8sR0FBUCxPQUFPLENBQXdCO1FBQy9CLFdBQU0sR0FBTixNQUFNLENBQVE7UUFDZCxVQUFLLEdBQUwsS0FBSyxDQUFPO1FBQ3FCLGlCQUFZLEdBQVosWUFBWSxDQUFrQjtRQUNuQixnQkFBVyxHQUFYLFdBQVcsQ0FBUTtJQUN0RSxDQUFDO0lBRUosV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDLElBQUksQ0FDaEMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQ1gsSUFBSSxDQUFDLE1BQU0sRUFBRTtnQkFDWCxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7YUFDN0M7UUFDSCxDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVPLGVBQWU7UUFDckIsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDLElBQUksQ0FDakMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUNmLFVBQVUsQ0FBQyxDQUFDLEtBQWdCLEVBQUUsRUFBRTtZQUM5QixJQUFJLHFDQUFxQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDckQsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBSSxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQzthQUN4RTtZQUNELE9BQU8sRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ25CLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOzsrSEE5QlUsZUFBZSwySUFNaEIsdUJBQXVCLGFBQ3ZCLGtDQUFrQzttSUFQakMsZUFBZSxjQUZkLEtBQUs7MkZBRU4sZUFBZTtrQkFIM0IsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsS0FBSztpQkFDbEI7OzBCQU9JLE1BQU07MkJBQUMsdUJBQXVCOzswQkFDOUIsTUFBTTsyQkFBQyxrQ0FBa0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBJbmplY3QsXG4gIEluamVjdGFibGUsXG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtcbiAgQ2FuQWN0aXZhdGUsXG4gIFJvdXRlcixcbn0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IFN0b3JlIH0gZnJvbSAnQG5ncngvc3RvcmUnO1xuaW1wb3J0IHtcbiAgT2JzZXJ2YWJsZSxcbiAgb2YsXG59IGZyb20gJ3J4anMnO1xuaW1wb3J0IHtcbiAgY2F0Y2hFcnJvcixcbiAgbWFwLFxuICB0YXAsXG59IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcblxuaW1wb3J0IHtcbiAgREFGRl9BVVRIX0VSUk9SX01BVENIRVIsXG4gIERhZmZBdXRoU3RvcmFnZVNlcnZpY2UsXG59IGZyb20gJ0BkYWZmb2RpbC9hdXRoJztcbmltcG9ydCB7XG4gIERBRkZfQVVUSF9VTkFVVEhFTlRJQ0FURURfRVJST1JfQ09ERVMsXG4gIERhZmZBdXRoRHJpdmVyRXJyb3JDb2RlcyxcbiAgRGFmZkF1dGhEcml2ZXJUb2tlbkNoZWNrLFxufSBmcm9tICdAZGFmZm9kaWwvYXV0aC9kcml2ZXInO1xuaW1wb3J0IHsgRGFmZkF1dGhHdWFyZExvZ291dCB9IGZyb20gJ0BkYWZmb2RpbC9hdXRoL3N0YXRlJztcbmltcG9ydCB7IERhZmZFcnJvciB9IGZyb20gJ0BkYWZmb2RpbC9jb3JlJztcbmltcG9ydCB7IEVycm9yVHJhbnNmb3JtZXIgfSBmcm9tICdAZGFmZm9kaWwvY29yZS9zdGF0ZSc7XG5cbmltcG9ydCB7IERhZmZBdXRoTWVtYmVyT25seUd1YXJkUmVkaXJlY3RVcmwgfSBmcm9tICcuL21lbWJlci1vbmx5LWd1YXJkLXJlZGlyZWN0LnRva2VuJztcblxuXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdhbnknLFxufSlcbmV4cG9ydCBjbGFzcyBNZW1iZXJPbmx5R3VhcmQgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgdG9rZW5DaGVjazogRGFmZkF1dGhEcml2ZXJUb2tlbkNoZWNrLFxuICAgIHByaXZhdGUgc3RvcmFnZTogRGFmZkF1dGhTdG9yYWdlU2VydmljZSxcbiAgICBwcml2YXRlIHJvdXRlcjogUm91dGVyLFxuICAgIHByaXZhdGUgc3RvcmU6IFN0b3JlLFxuICAgIEBJbmplY3QoREFGRl9BVVRIX0VSUk9SX01BVENIRVIpIHByaXZhdGUgZXJyb3JNYXRjaGVyOiBFcnJvclRyYW5zZm9ybWVyLFxuICAgIEBJbmplY3QoRGFmZkF1dGhNZW1iZXJPbmx5R3VhcmRSZWRpcmVjdFVybCkgcHJpdmF0ZSByZWRpcmVjdFVybDogc3RyaW5nLFxuICApIHt9XG5cbiAgY2FuQWN0aXZhdGUoKTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XG4gICAgcmV0dXJuIHRoaXMuaXNBdXRoZW50aWNhdGVkKCkucGlwZShcbiAgICAgIHRhcChyZXN1bHQgPT4ge1xuICAgICAgICBpZiAoIXJlc3VsdCkge1xuICAgICAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlQnlVcmwodGhpcy5yZWRpcmVjdFVybCk7XG4gICAgICAgIH1cbiAgICAgIH0pLFxuICAgICk7XG4gIH1cblxuICBwcml2YXRlIGlzQXV0aGVudGljYXRlZCgpOiBPYnNlcnZhYmxlPGJvb2xlYW4+IHtcbiAgICByZXR1cm4gdGhpcy50b2tlbkNoZWNrLmNoZWNrKCkucGlwZShcbiAgICAgIG1hcCgoKSA9PiB0cnVlKSxcbiAgICAgIGNhdGNoRXJyb3IoKGVycm9yOiBEYWZmRXJyb3IpID0+IHtcbiAgICAgICAgaWYgKERBRkZfQVVUSF9VTkFVVEhFTlRJQ0FURURfRVJST1JfQ09ERVNbZXJyb3IuY29kZV0pIHtcbiAgICAgICAgICB0aGlzLnN0b3JlLmRpc3BhdGNoKG5ldyBEYWZmQXV0aEd1YXJkTG9nb3V0KHRoaXMuZXJyb3JNYXRjaGVyKGVycm9yKSkpO1xuICAgICAgICB9XG4gICAgICAgIHJldHVybiBvZihmYWxzZSk7XG4gICAgICB9KSxcbiAgICApO1xuICB9XG59XG4iXX0=
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
-
import { NgModule, } from '@angular/core';
|
|
1
|
+
import { NgModule, inject, } from '@angular/core';
|
|
2
2
|
import { EffectsModule } from '@ngrx/effects';
|
|
3
3
|
import { StoreModule } from '@ngrx/store';
|
|
4
|
+
import { of } from 'rxjs';
|
|
5
|
+
import { DaffAuthStorageService } from '@daffodil/auth';
|
|
4
6
|
import { daffAuthStateDefaultConfig, provideDaffAuthStateConfig, } from './config/public_api';
|
|
5
7
|
import { DaffAuthEffects } from './effects/auth.effects';
|
|
6
8
|
import { DaffAuthLoginEffects } from './effects/login.effects';
|
|
7
9
|
import { DaffAuthRegisterEffects } from './effects/register.effects';
|
|
8
10
|
import { DaffAuthResetPasswordEffects } from './effects/reset-password.effects';
|
|
11
|
+
import { DAFF_AUTH_UNAUTHENTICATED_HOOKS, } from './injection-tokens/public_api';
|
|
9
12
|
import { DAFF_AUTH_STORE_FEATURE_KEY } from './reducers/public_api';
|
|
10
13
|
import { DAFF_AUTH_REDUCERS } from './reducers/token/reducers.token';
|
|
11
14
|
import * as i0 from "@angular/core";
|
|
@@ -26,7 +29,24 @@ export class DaffAuthStateModule {
|
|
|
26
29
|
}
|
|
27
30
|
/** @nocollapse */ DaffAuthStateModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthStateModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
28
31
|
/** @nocollapse */ DaffAuthStateModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthStateModule, imports: [i1.StoreFeatureModule, i2.EffectsFeatureModule] });
|
|
29
|
-
/** @nocollapse */ DaffAuthStateModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthStateModule,
|
|
32
|
+
/** @nocollapse */ DaffAuthStateModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthStateModule, providers: [
|
|
33
|
+
{
|
|
34
|
+
provide: DAFF_AUTH_UNAUTHENTICATED_HOOKS,
|
|
35
|
+
useFactory: (() => {
|
|
36
|
+
const storage = inject(DaffAuthStorageService);
|
|
37
|
+
const hook = (() => {
|
|
38
|
+
try {
|
|
39
|
+
return of(storage.removeAuthToken());
|
|
40
|
+
}
|
|
41
|
+
catch {
|
|
42
|
+
return of(null);
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
return hook;
|
|
46
|
+
}),
|
|
47
|
+
multi: true,
|
|
48
|
+
},
|
|
49
|
+
], imports: [[
|
|
30
50
|
StoreModule.forFeature(DAFF_AUTH_STORE_FEATURE_KEY, DAFF_AUTH_REDUCERS),
|
|
31
51
|
EffectsModule.forFeature([
|
|
32
52
|
DaffAuthEffects,
|
|
@@ -47,6 +67,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
47
67
|
DaffAuthResetPasswordEffects,
|
|
48
68
|
]),
|
|
49
69
|
],
|
|
70
|
+
providers: [
|
|
71
|
+
{
|
|
72
|
+
provide: DAFF_AUTH_UNAUTHENTICATED_HOOKS,
|
|
73
|
+
useFactory: (() => {
|
|
74
|
+
const storage = inject(DaffAuthStorageService);
|
|
75
|
+
const hook = (() => {
|
|
76
|
+
try {
|
|
77
|
+
return of(storage.removeAuthToken());
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
return of(null);
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
return hook;
|
|
84
|
+
}),
|
|
85
|
+
multi: true,
|
|
86
|
+
},
|
|
87
|
+
],
|
|
50
88
|
}]
|
|
51
89
|
}] });
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1zdGF0ZS5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9saWJzL2F1dGgvc3RhdGUvc3JjL2F1dGgtc3RhdGUubW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFFTCxRQUFRLEVBQ1IsTUFBTSxHQUNQLE1BQU0sZUFBZSxDQUFDO0FBQ3ZCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDOUMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUMxQyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRTFCLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRXhELE9BQU8sRUFFTCwwQkFBMEIsRUFDMUIsMEJBQTBCLEdBQzNCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3JFLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2hGLE9BQU8sRUFDTCwrQkFBK0IsR0FFaEMsTUFBTSwrQkFBK0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQzs7OztBQWdDckUsTUFBTSxPQUFPLG1CQUFtQjtJQUM5QixNQUFNLENBQUMsVUFBVSxDQUFDLFNBQXVDLEVBQUU7UUFDekQsT0FBTztZQUNMLFFBQVEsRUFBRSxtQkFBbUI7WUFDN0IsU0FBUyxFQUFFO2dCQUNULDBCQUEwQixDQUFDO29CQUN6QixHQUFHLDBCQUEwQjtvQkFDN0IsR0FBRyxNQUFNO2lCQUNWLENBQUM7YUFDSDtTQUNGLENBQUM7SUFDSixDQUFDOzttSUFYVSxtQkFBbUI7b0lBQW5CLG1CQUFtQjtvSUFBbkIsbUJBQW1CLGFBbkJuQjtRQUNUO1lBQ0UsT0FBTyxFQUFFLCtCQUErQjtZQUN4QyxVQUFVLEdBQUUsR0FBRyxFQUFFO2dCQUNmLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO2dCQUMvQyxNQUFNLElBQUksSUFBZ0MsR0FBRyxFQUFFO29CQUM3QyxJQUFJO3dCQUNGLE9BQU8sRUFBRSxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQyxDQUFDO3FCQUN0QztvQkFBQyxNQUFNO3dCQUNOLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO3FCQUNqQjtnQkFDSCxDQUFDLENBQUEsQ0FBQztnQkFFRixPQUFPLElBQUksQ0FBQztZQUNkLENBQUMsQ0FBQTtZQUNELEtBQUssRUFBRSxJQUFJO1NBQ1o7S0FDRixZQTFCUTtZQUNQLFdBQVcsQ0FBQyxVQUFVLENBQUMsMkJBQTJCLEVBQUUsa0JBQWtCLENBQUM7WUFDdkUsYUFBYSxDQUFDLFVBQVUsQ0FBQztnQkFDdkIsZUFBZTtnQkFDZixvQkFBb0I7Z0JBQ3BCLHVCQUF1QjtnQkFDdkIsNEJBQTRCO2FBQzdCLENBQUM7U0FDSDsyRkFvQlUsbUJBQW1CO2tCQTdCL0IsUUFBUTttQkFBQztvQkFDUixPQUFPLEVBQUU7d0JBQ1AsV0FBVyxDQUFDLFVBQVUsQ0FBQywyQkFBMkIsRUFBRSxrQkFBa0IsQ0FBQzt3QkFDdkUsYUFBYSxDQUFDLFVBQVUsQ0FBQzs0QkFDdkIsZUFBZTs0QkFDZixvQkFBb0I7NEJBQ3BCLHVCQUF1Qjs0QkFDdkIsNEJBQTRCO3lCQUM3QixDQUFDO3FCQUNIO29CQUNELFNBQVMsRUFBRTt3QkFDVDs0QkFDRSxPQUFPLEVBQUUsK0JBQStCOzRCQUN4QyxVQUFVLEdBQUUsR0FBRyxFQUFFO2dDQUNmLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO2dDQUMvQyxNQUFNLElBQUksSUFBZ0MsR0FBRyxFQUFFO29DQUM3QyxJQUFJO3dDQUNGLE9BQU8sRUFBRSxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQyxDQUFDO3FDQUN0QztvQ0FBQyxNQUFNO3dDQUNOLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO3FDQUNqQjtnQ0FDSCxDQUFDLENBQUEsQ0FBQztnQ0FFRixPQUFPLElBQUksQ0FBQzs0QkFDZCxDQUFDLENBQUE7NEJBQ0QsS0FBSyxFQUFFLElBQUk7eUJBQ1o7cUJBQ0Y7aUJBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBNb2R1bGVXaXRoUHJvdmlkZXJzLFxuICBOZ01vZHVsZSxcbiAgaW5qZWN0LFxufSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEVmZmVjdHNNb2R1bGUgfSBmcm9tICdAbmdyeC9lZmZlY3RzJztcbmltcG9ydCB7IFN0b3JlTW9kdWxlIH0gZnJvbSAnQG5ncngvc3RvcmUnO1xuaW1wb3J0IHsgb2YgfSBmcm9tICdyeGpzJztcblxuaW1wb3J0IHsgRGFmZkF1dGhTdG9yYWdlU2VydmljZSB9IGZyb20gJ0BkYWZmb2RpbC9hdXRoJztcblxuaW1wb3J0IHtcbiAgRGFmZkF1dGhTdGF0ZUNvbmZpZyxcbiAgZGFmZkF1dGhTdGF0ZURlZmF1bHRDb25maWcsXG4gIHByb3ZpZGVEYWZmQXV0aFN0YXRlQ29uZmlnLFxufSBmcm9tICcuL2NvbmZpZy9wdWJsaWNfYXBpJztcbmltcG9ydCB7IERhZmZBdXRoRWZmZWN0cyB9IGZyb20gJy4vZWZmZWN0cy9hdXRoLmVmZmVjdHMnO1xuaW1wb3J0IHsgRGFmZkF1dGhMb2dpbkVmZmVjdHMgfSBmcm9tICcuL2VmZmVjdHMvbG9naW4uZWZmZWN0cyc7XG5pbXBvcnQgeyBEYWZmQXV0aFJlZ2lzdGVyRWZmZWN0cyB9IGZyb20gJy4vZWZmZWN0cy9yZWdpc3Rlci5lZmZlY3RzJztcbmltcG9ydCB7IERhZmZBdXRoUmVzZXRQYXNzd29yZEVmZmVjdHMgfSBmcm9tICcuL2VmZmVjdHMvcmVzZXQtcGFzc3dvcmQuZWZmZWN0cyc7XG5pbXBvcnQge1xuICBEQUZGX0FVVEhfVU5BVVRIRU5USUNBVEVEX0hPT0tTLFxuICBEYWZmQXV0aFVuYXV0aGVudGljYXRlZEhvb2ssXG59IGZyb20gJy4vaW5qZWN0aW9uLXRva2Vucy9wdWJsaWNfYXBpJztcbmltcG9ydCB7IERBRkZfQVVUSF9TVE9SRV9GRUFUVVJFX0tFWSB9IGZyb20gJy4vcmVkdWNlcnMvcHVibGljX2FwaSc7XG5pbXBvcnQgeyBEQUZGX0FVVEhfUkVEVUNFUlMgfSBmcm9tICcuL3JlZHVjZXJzL3Rva2VuL3JlZHVjZXJzLnRva2VuJztcblxuXG5ATmdNb2R1bGUoe1xuICBpbXBvcnRzOiBbXG4gICAgU3RvcmVNb2R1bGUuZm9yRmVhdHVyZShEQUZGX0FVVEhfU1RPUkVfRkVBVFVSRV9LRVksIERBRkZfQVVUSF9SRURVQ0VSUyksXG4gICAgRWZmZWN0c01vZHVsZS5mb3JGZWF0dXJlKFtcbiAgICAgIERhZmZBdXRoRWZmZWN0cyxcbiAgICAgIERhZmZBdXRoTG9naW5FZmZlY3RzLFxuICAgICAgRGFmZkF1dGhSZWdpc3RlckVmZmVjdHMsXG4gICAgICBEYWZmQXV0aFJlc2V0UGFzc3dvcmRFZmZlY3RzLFxuICAgIF0pLFxuICBdLFxuICBwcm92aWRlcnM6IFtcbiAgICB7XG4gICAgICBwcm92aWRlOiBEQUZGX0FVVEhfVU5BVVRIRU5USUNBVEVEX0hPT0tTLFxuICAgICAgdXNlRmFjdG9yeTogKCkgPT4ge1xuICAgICAgICBjb25zdCBzdG9yYWdlID0gaW5qZWN0KERhZmZBdXRoU3RvcmFnZVNlcnZpY2UpO1xuICAgICAgICBjb25zdCBob29rOiBEYWZmQXV0aFVuYXV0aGVudGljYXRlZEhvb2sgPSAoKSA9PiB7XG4gICAgICAgICAgdHJ5IHtcbiAgICAgICAgICAgIHJldHVybiBvZihzdG9yYWdlLnJlbW92ZUF1dGhUb2tlbigpKTtcbiAgICAgICAgICB9IGNhdGNoIHtcbiAgICAgICAgICAgIHJldHVybiBvZihudWxsKTtcbiAgICAgICAgICB9XG4gICAgICAgIH07XG5cbiAgICAgICAgcmV0dXJuIGhvb2s7XG4gICAgICB9LFxuICAgICAgbXVsdGk6IHRydWUsXG4gICAgfSxcbiAgXSxcbn0pXG5leHBvcnQgY2xhc3MgRGFmZkF1dGhTdGF0ZU1vZHVsZSB7XG4gIHN0YXRpYyB3aXRoQ29uZmlnKGNvbmZpZzogUGFydGlhbDxEYWZmQXV0aFN0YXRlQ29uZmlnPiA9IHt9KTogTW9kdWxlV2l0aFByb3ZpZGVyczxEYWZmQXV0aFN0YXRlTW9kdWxlPiB7XG4gICAgcmV0dXJuIHtcbiAgICAgIG5nTW9kdWxlOiBEYWZmQXV0aFN0YXRlTW9kdWxlLFxuICAgICAgcHJvdmlkZXJzOiBbXG4gICAgICAgIHByb3ZpZGVEYWZmQXV0aFN0YXRlQ29uZmlnKHtcbiAgICAgICAgICAuLi5kYWZmQXV0aFN0YXRlRGVmYXVsdENvbmZpZyxcbiAgICAgICAgICAuLi5jb25maWcsXG4gICAgICAgIH0pLFxuICAgICAgXSxcbiAgICB9O1xuICB9XG59XG4iXX0=
|
|
@@ -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 {
|
|
6
|
+
import { DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES, 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';
|
|
@@ -23,17 +23,6 @@ export class DaffAuthEffects {
|
|
|
23
23
|
this.clientCache = clientCache;
|
|
24
24
|
this.unauthenticatedHook = unauthenticatedHook;
|
|
25
25
|
this.check$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.AuthCheckAction), switchMap((action) => this.tokenCheck.check().pipe(map(() => new DaffAuthCheckSuccess()), catchError((error) => of(new DaffAuthCheckFailure(this.errorMatcher(error))))))));
|
|
26
|
-
this.removeAuthToken$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.AuthCheckFailureAction), tap(() => {
|
|
27
|
-
this.storage.removeAuthToken();
|
|
28
|
-
}), switchMap(() => EMPTY), catchError((error) => {
|
|
29
|
-
switch (true) {
|
|
30
|
-
case error instanceof DaffServerSideStorageError:
|
|
31
|
-
return of(new DaffAuthServerSide(this.errorMatcher(error)));
|
|
32
|
-
case error instanceof DaffStorageServiceError:
|
|
33
|
-
default:
|
|
34
|
-
return of(new DaffAuthStorageFailure(this.errorMatcher(error)));
|
|
35
|
-
}
|
|
36
|
-
})), { dispatch: false });
|
|
37
26
|
// this needs to be defined after `check$` or else the driver call won't be run
|
|
38
27
|
this.authCheckInterval$ = createEffect(() => of(new DaffAuthCheck()).pipe(repeat({ delay: this.config.checkInterval }), filter(() => !!this.storage.getAuthToken()), catchError((error) => {
|
|
39
28
|
switch (true) {
|
|
@@ -46,10 +35,10 @@ export class DaffAuthEffects {
|
|
|
46
35
|
}
|
|
47
36
|
})));
|
|
48
37
|
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,
|
|
38
|
+
// if the auth check failure is for any reason other than auth failure,
|
|
39
|
+
// such as a network failure, don't reset
|
|
50
40
|
if (action.type === DaffAuthActionTypes.AuthCheckFailureAction
|
|
51
|
-
&& action.errorMessage.code
|
|
52
|
-
&& action.errorMessage.code !== DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED) {
|
|
41
|
+
&& !DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES[action.errorMessage.code]) {
|
|
53
42
|
return false;
|
|
54
43
|
}
|
|
55
44
|
return true;
|
|
@@ -76,4 +65,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
76
65
|
type: Inject,
|
|
77
66
|
args: [DAFF_AUTH_UNAUTHENTICATED_HOOK]
|
|
78
67
|
}] }]; } });
|
|
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"]}
|
|
68
|
+
//# 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} from 'rxjs';\nimport {\n  switchMap,\n  catchError,\n  map,\n  repeat,\n  filter,\n  tap,\n} from 'rxjs/operators';\n\nimport {\n  DaffAuthStorageService,\n  DAFF_AUTH_ERROR_MATCHER,\n} from '@daffodil/auth';\nimport {\n  DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES,\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  // 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,\n      // such as a network failure, don't reset\n      if (\n        action.type === DaffAuthActionTypes.AuthCheckFailureAction\n          && !DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES[action.errorMessage.code]\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"]}
|
|
@@ -25,7 +25,7 @@ export class DaffAuthLoginEffects {
|
|
|
25
25
|
return of(new DaffAuthLoginFailure(this.errorMatcher(error)));
|
|
26
26
|
}
|
|
27
27
|
})))));
|
|
28
|
-
this.logout$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthLoginActionTypes.LogoutAction), switchMap((action) => this.loginDriver.logout().pipe(map(() => new DaffAuthLogoutSuccess()),
|
|
28
|
+
this.logout$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthLoginActionTypes.LogoutAction), switchMap((action) => this.loginDriver.logout().pipe(map(() => new DaffAuthLogoutSuccess()), catchError((error) => {
|
|
29
29
|
switch (true) {
|
|
30
30
|
case error instanceof DaffServerSideStorageError:
|
|
31
31
|
return of(new DaffAuthServerSide(this.errorMatcher(error)));
|
|
@@ -48,4 +48,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
48
48
|
type: Inject,
|
|
49
49
|
args: [DAFF_AUTH_ERROR_MATCHER]
|
|
50
50
|
}] }, { type: i2.DaffAuthStorageService }]; } });
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW4uZWZmZWN0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9zdGF0ZS9zcmMvZWZmZWN0cy9sb2dpbi5lZmZlY3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxVQUFVLEVBQ1YsTUFBTSxHQUNQLE1BQU0sZUFBZSxDQUFDO0FBQ3ZCLE9BQU8sRUFDTCxPQUFPLEVBQ1AsWUFBWSxFQUNaLE1BQU0sR0FDUCxNQUFNLGVBQWUsQ0FBQztBQUN2QixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQzFCLE9BQU8sRUFDTCxTQUFTLEVBQ1QsR0FBRyxFQUNILFVBQVUsRUFDVixHQUFHLEdBQ0osTUFBTSxnQkFBZ0IsQ0FBQztBQUV4QixPQUFPLEVBR0wsdUJBQXVCLEVBQ3ZCLHNCQUFzQixHQUN2QixNQUFNLGdCQUFnQixDQUFDO0FBQ3hCLE9BQU8sRUFDTCxlQUFlLEdBRWhCLE1BQU0sdUJBQXVCLENBQUM7QUFDL0IsT0FBTyxFQUVMLDBCQUEwQixFQUMxQix1QkFBdUIsR0FDeEIsTUFBTSxnQkFBZ0IsQ0FBQztBQUd4QixPQUFPLEVBQ0wsd0JBQXdCLEVBQ3hCLG9CQUFvQixFQUNwQixvQkFBb0IsRUFDcEIscUJBQXFCLEVBQ3JCLHFCQUFxQixFQUVyQixrQkFBa0IsRUFFbEIsc0JBQXNCLEdBQ3ZCLE1BQU0sdUJBQXVCLENBQUM7Ozs7QUFHL0IsTUFBTSxPQUFPLG9CQUFvQjtJQUkvQixZQUNVLFFBQTZDLEVBQ3BCLFdBQTRDLEVBQ3BDLFlBQThCLEVBQy9ELE9BQStCO1FBSC9CLGFBQVEsR0FBUixRQUFRLENBQXFDO1FBQ3BCLGdCQUFXLEdBQVgsV0FBVyxDQUFpQztRQUNwQyxpQkFBWSxHQUFaLFlBQVksQ0FBa0I7UUFDL0QsWUFBTyxHQUFQLE9BQU8sQ0FBd0I7UUFHekMsV0FBTSxHQUFHLFlBQVksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FDNUMsTUFBTSxDQUFDLHdCQUF3QixDQUFDLFdBQVcsQ0FBQyxFQUM1QyxTQUFTLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUNuQixJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDO2FBQ3JDLElBQUksQ0FDSCxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksb0JBQW9CLENBQUksSUFBSSxDQUFDLENBQUMsRUFDaEQsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQy9ELFVBQVUsQ0FBQyxDQUFDLEtBQWdCLEVBQUUsRUFBRTtZQUM5QixRQUFRLElBQUksRUFBRTtnQkFDWixLQUFLLEtBQUssWUFBWSwwQkFBMEI7b0JBQzlDLE9BQU8sRUFBRSxDQUFDLElBQUksa0JBQWtCLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQzlELEtBQUssS0FBSyxZQUFZLHVCQUF1QixDQUFDO2dCQUM5QztvQkFDRSxPQUFPLEVBQUUsQ0FBQyxJQUFJLG9CQUFvQixDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ2pFO1FBQ0gsQ0FBQyxDQUFDLENBQ0gsQ0FDSixDQUNGLENBQUMsQ0FBQztRQUVILFlBQU8sR0FBRyxZQUFZLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQzdDLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyxZQUFZLENBQUMsRUFDN0MsU0FBUyxDQUFDLENBQUMsTUFBc0IsRUFBRSxFQUFFLENBQ25DLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBSSxDQUM1QixHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxxQkFBcUIsRUFBRSxDQUFDLEVBQ3RDLFVBQVUsQ0FBQyxDQUFDLEtBQWdCLEVBQUUsRUFBRTtZQUM5QixRQUFRLElBQUksRUFBRTtnQkFDWixLQUFLLEtBQUssWUFBWSwwQkFBMEI7b0JBQzlDLE9BQU8sRUFBRSxDQUFDLElBQUksa0JBQWtCLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQzlELEtBQUssS0FBSyxZQUFZLHVCQUF1QjtvQkFDM0MsT0FBTyxFQUFFLENBQUMsSUFBSSxzQkFBc0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDbEU7b0JBQ0UsT0FBTyxFQUFFLENBQUMsSUFBSSxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQzthQUNsRTtRQUNILENBQUMsQ0FBQyxDQUNILENBQ0YsQ0FDRixDQUFDLENBQUM7SUF2Q0EsQ0FBQzs7b0lBVE8sb0JBQW9CLHlDQU1yQixlQUFlLGFBQ2YsdUJBQXVCO3dJQVB0QixvQkFBb0I7MkZBQXBCLG9CQUFvQjtrQkFEaEMsVUFBVTs7MEJBT04sTUFBTTsyQkFBQyxlQUFlOzswQkFDdEIsTUFBTTsyQkFBQyx1QkFBdUIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBJbmplY3RhYmxlLFxuICBJbmplY3QsXG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtcbiAgQWN0aW9ucyxcbiAgY3JlYXRlRWZmZWN0LFxuICBvZlR5cGUsXG59IGZyb20gJ0BuZ3J4L2VmZmVjdHMnO1xuaW1wb3J0IHsgb2YgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7XG4gIHN3aXRjaE1hcCxcbiAgbWFwLFxuICBjYXRjaEVycm9yLFxuICB0YXAsXG59IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcblxuaW1wb3J0IHtcbiAgRGFmZkxvZ2luSW5mbyxcbiAgRGFmZkF1dGhUb2tlbixcbiAgREFGRl9BVVRIX0VSUk9SX01BVENIRVIsXG4gIERhZmZBdXRoU3RvcmFnZVNlcnZpY2UsXG59IGZyb20gJ0BkYWZmb2RpbC9hdXRoJztcbmltcG9ydCB7XG4gIERhZmZMb2dpbkRyaXZlcixcbiAgRGFmZkxvZ2luU2VydmljZUludGVyZmFjZSxcbn0gZnJvbSAnQGRhZmZvZGlsL2F1dGgvZHJpdmVyJztcbmltcG9ydCB7XG4gIERhZmZFcnJvcixcbiAgRGFmZlNlcnZlclNpZGVTdG9yYWdlRXJyb3IsXG4gIERhZmZTdG9yYWdlU2VydmljZUVycm9yLFxufSBmcm9tICdAZGFmZm9kaWwvY29yZSc7XG5pbXBvcnQgeyBFcnJvclRyYW5zZm9ybWVyIH0gZnJvbSAnQGRhZmZvZGlsL2NvcmUvc3RhdGUnO1xuXG5pbXBvcnQge1xuICBEYWZmQXV0aExvZ2luQWN0aW9uVHlwZXMsXG4gIERhZmZBdXRoTG9naW5TdWNjZXNzLFxuICBEYWZmQXV0aExvZ2luRmFpbHVyZSxcbiAgRGFmZkF1dGhMb2dvdXRTdWNjZXNzLFxuICBEYWZmQXV0aExvZ291dEZhaWx1cmUsXG4gIERhZmZBdXRoTG9nb3V0LFxuICBEYWZmQXV0aFNlcnZlclNpZGUsXG4gIERhZmZBdXRoTG9naW5BY3Rpb25zLFxuICBEYWZmQXV0aFN0b3JhZ2VGYWlsdXJlLFxufSBmcm9tICcuLi9hY3Rpb25zL3B1YmxpY19hcGknO1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgRGFmZkF1dGhMb2dpbkVmZmVjdHM8XG4gIFQgZXh0ZW5kcyBEYWZmTG9naW5JbmZvID0gRGFmZkxvZ2luSW5mbyxcbiAgVSBleHRlbmRzIERhZmZBdXRoVG9rZW4gPSBEYWZmQXV0aFRva2VuLFxuPiB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgYWN0aW9ucyQ6IEFjdGlvbnM8RGFmZkF1dGhMb2dpbkFjdGlvbnM8VCwgVT4+LFxuICAgIEBJbmplY3QoRGFmZkxvZ2luRHJpdmVyKSBwcml2YXRlIGxvZ2luRHJpdmVyOiBEYWZmTG9naW5TZXJ2aWNlSW50ZXJmYWNlPFQsIFU+LFxuICAgIEBJbmplY3QoREFGRl9BVVRIX0VSUk9SX01BVENIRVIpIHByaXZhdGUgZXJyb3JNYXRjaGVyOiBFcnJvclRyYW5zZm9ybWVyLFxuICAgIHByaXZhdGUgc3RvcmFnZTogRGFmZkF1dGhTdG9yYWdlU2VydmljZSxcbiAgKSB7fVxuXG4gIGxvZ2luJCA9IGNyZWF0ZUVmZmVjdCgoKSA9PiB0aGlzLmFjdGlvbnMkLnBpcGUoXG4gICAgb2ZUeXBlKERhZmZBdXRoTG9naW5BY3Rpb25UeXBlcy5Mb2dpbkFjdGlvbiksXG4gICAgc3dpdGNoTWFwKChhY3Rpb24pID0+XG4gICAgICB0aGlzLmxvZ2luRHJpdmVyLmxvZ2luKGFjdGlvbi5sb2dpbkluZm8pXG4gICAgICAgIC5waXBlKFxuICAgICAgICAgIG1hcCgocmVzcCkgPT4gbmV3IERhZmZBdXRoTG9naW5TdWNjZXNzPFU+KHJlc3ApKSxcbiAgICAgICAgICB0YXAoKHN1Y2Nlc3MpID0+IHRoaXMuc3RvcmFnZS5zZXRBdXRoVG9rZW4oc3VjY2Vzcy5hdXRoLnRva2VuKSksXG4gICAgICAgICAgY2F0Y2hFcnJvcigoZXJyb3I6IERhZmZFcnJvcikgPT4ge1xuICAgICAgICAgICAgc3dpdGNoICh0cnVlKSB7XG4gICAgICAgICAgICAgIGNhc2UgZXJyb3IgaW5zdGFuY2VvZiBEYWZmU2VydmVyU2lkZVN0b3JhZ2VFcnJvcjpcbiAgICAgICAgICAgICAgICByZXR1cm4gb2YobmV3IERhZmZBdXRoU2VydmVyU2lkZSh0aGlzLmVycm9yTWF0Y2hlcihlcnJvcikpKTtcbiAgICAgICAgICAgICAgY2FzZSBlcnJvciBpbnN0YW5jZW9mIERhZmZTdG9yYWdlU2VydmljZUVycm9yOlxuICAgICAgICAgICAgICBkZWZhdWx0OlxuICAgICAgICAgICAgICAgIHJldHVybiBvZihuZXcgRGFmZkF1dGhMb2dpbkZhaWx1cmUodGhpcy5lcnJvck1hdGNoZXIoZXJyb3IpKSk7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgfSksXG4gICAgICAgICksXG4gICAgKSxcbiAgKSk7XG5cbiAgbG9nb3V0JCA9IGNyZWF0ZUVmZmVjdCgoKSA9PiB0aGlzLmFjdGlvbnMkLnBpcGUoXG4gICAgb2ZUeXBlKERhZmZBdXRoTG9naW5BY3Rpb25UeXBlcy5Mb2dvdXRBY3Rpb24pLFxuICAgIHN3aXRjaE1hcCgoYWN0aW9uOiBEYWZmQXV0aExvZ291dCkgPT5cbiAgICAgIHRoaXMubG9naW5Ecml2ZXIubG9nb3V0KCkucGlwZShcbiAgICAgICAgbWFwKCgpID0+IG5ldyBEYWZmQXV0aExvZ291dFN1Y2Nlc3MoKSksXG4gICAgICAgIGNhdGNoRXJyb3IoKGVycm9yOiBEYWZmRXJyb3IpID0+IHtcbiAgICAgICAgICBzd2l0Y2ggKHRydWUpIHtcbiAgICAgICAgICAgIGNhc2UgZXJyb3IgaW5zdGFuY2VvZiBEYWZmU2VydmVyU2lkZVN0b3JhZ2VFcnJvcjpcbiAgICAgICAgICAgICAgcmV0dXJuIG9mKG5ldyBEYWZmQXV0aFNlcnZlclNpZGUodGhpcy5lcnJvck1hdGNoZXIoZXJyb3IpKSk7XG4gICAgICAgICAgICBjYXNlIGVycm9yIGluc3RhbmNlb2YgRGFmZlN0b3JhZ2VTZXJ2aWNlRXJyb3I6XG4gICAgICAgICAgICAgIHJldHVybiBvZihuZXcgRGFmZkF1dGhTdG9yYWdlRmFpbHVyZSh0aGlzLmVycm9yTWF0Y2hlcihlcnJvcikpKTtcbiAgICAgICAgICAgIGRlZmF1bHQ6XG4gICAgICAgICAgICAgIHJldHVybiBvZihuZXcgRGFmZkF1dGhMb2dvdXRGYWlsdXJlKHRoaXMuZXJyb3JNYXRjaGVyKGVycm9yKSkpO1xuICAgICAgICAgIH1cbiAgICAgICAgfSksXG4gICAgICApLFxuICAgICksXG4gICkpO1xufVxuIl19
|
|
@@ -3,7 +3,7 @@ import { InjectionToken, Injectable, Inject } from '@angular/core';
|
|
|
3
3
|
import { DaffInheritableError } from '@daffodil/core';
|
|
4
4
|
import { of, switchMap, throwError } from 'rxjs';
|
|
5
5
|
import * as i1 from '@daffodil/auth';
|
|
6
|
-
import { DaffAuthMissingTokenError } from '@daffodil/auth';
|
|
6
|
+
import { DaffAuthMissingTokenError, DaffAuthErrorCodes } from '@daffodil/auth';
|
|
7
7
|
|
|
8
8
|
const DaffAuthDriver = new InjectionToken('DaffAuthDriver');
|
|
9
9
|
|
|
@@ -100,9 +100,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
100
100
|
}] }];
|
|
101
101
|
} });
|
|
102
102
|
|
|
103
|
+
/**
|
|
104
|
+
* The error codes that indicate that the user definitely should not be in an unauthenticated state
|
|
105
|
+
* and if an auth token exists in storage, it is invalid.
|
|
106
|
+
* These are contrasted to network failures and other sporadic and generic errors that aren't
|
|
107
|
+
* a guarantee of the token's invalidity.
|
|
108
|
+
*/
|
|
109
|
+
const DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES = {
|
|
110
|
+
[DaffAuthDriverErrorCodes.UNAUTHORIZED]: true,
|
|
111
|
+
[DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED]: true,
|
|
112
|
+
[DaffAuthErrorCodes.MISSING_TOKEN]: true,
|
|
113
|
+
};
|
|
114
|
+
|
|
103
115
|
/**
|
|
104
116
|
* Generated bundle index. Do not edit.
|
|
105
117
|
*/
|
|
106
118
|
|
|
107
|
-
export { DaffAuthDriver, DaffAuthDriverErrorCodes, DaffAuthDriverErrorMap, DaffAuthDriverTokenCheck, DaffAuthInvalidAPIResponseError, DaffAuthenticationFailedError, DaffLoginDriver, DaffRegisterDriver, DaffRegistrationFailedError, DaffResetPasswordDriver, DaffUnauthorizedError };
|
|
119
|
+
export { DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES, DaffAuthDriver, DaffAuthDriverErrorCodes, DaffAuthDriverErrorMap, DaffAuthDriverTokenCheck, DaffAuthInvalidAPIResponseError, DaffAuthenticationFailedError, DaffLoginDriver, DaffRegisterDriver, DaffRegistrationFailedError, DaffResetPasswordDriver, DaffUnauthorizedError };
|
|
108
120
|
//# sourceMappingURL=daffodil-auth-driver.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daffodil-auth-driver.mjs","sources":["../../../libs/auth/driver/src/interfaces/auth-service.interface.ts","../../../libs/auth/driver/src/interfaces/login-service.interface.ts","../../../libs/auth/driver/src/interfaces/register-service.interface.ts","../../../libs/auth/driver/src/interfaces/reset-password-service.interface.ts","../../../libs/auth/driver/src/errors/codes.enum.ts","../../../libs/auth/driver/src/errors/unauthorized.ts","../../../libs/auth/driver/src/errors/authentication-failed.ts","../../../libs/auth/driver/src/errors/registration-failed.ts","../../../libs/auth/driver/src/errors/invalid-api-response.ts","../../../libs/auth/driver/src/errors/map.ts","../../../libs/auth/driver/src/services/auth-check.service.ts","../../../libs/auth/driver/src/daffodil-auth-driver.ts"],"sourcesContent":["import { InjectionToken } from '@angular/core';\nimport { Observable } from 'rxjs';\n\nexport interface DaffAuthServiceInterface {\n /**\n * Checks the validity of an auth token.\n */\n check(): Observable<void>;\n}\n\nexport const DaffAuthDriver = new InjectionToken<DaffAuthServiceInterface>('DaffAuthDriver');\n","import { InjectionToken } from '@angular/core';\nimport { Observable } from 'rxjs';\n\nimport {\n DaffLoginInfo,\n DaffAuthToken,\n} from '@daffodil/auth';\n\nexport interface DaffLoginServiceInterface<\n TRequest extends DaffLoginInfo = DaffLoginInfo,\n TResponse extends DaffAuthToken = DaffAuthToken\n> {\n /**\n * Logs the user in.\n *\n * @returns An access token.\n */\n login(loginInfo: TRequest): Observable<TResponse>;\n\n /**\n * Logs the user out by revoking their access token.\n */\n logout(): Observable<void>;\n}\n\nexport const DaffLoginDriver = new InjectionToken<DaffLoginServiceInterface>('DaffLoginDriver');\n","import { InjectionToken } from '@angular/core';\nimport { Observable } from 'rxjs';\n\nimport { DaffAccountRegistration } from '@daffodil/auth';\n\nexport interface DaffRegisterServiceInterface<\n TRequest extends DaffAccountRegistration = DaffAccountRegistration,\n> {\n\n /**\n * Registers an account for the specified customer and logs the customer in.\n *\n * @param registration The account registration info.\n * @return The authentication token.\n */\n register(registration: TRequest): Observable<string>;\n\n /**\n * Registers an account for the specified customer but does not log the customer in.\n *\n * @param registration The account registration info.\n */\n registerOnly(registration: TRequest): Observable<void>;\n}\n\nexport const DaffRegisterDriver = new InjectionToken<DaffRegisterServiceInterface>('DaffRegisterDriver');\n","import { InjectionToken } from '@angular/core';\nimport { Observable } from 'rxjs';\n\nimport { DaffAuthResetPasswordInfo } from '@daffodil/auth';\n\nexport interface DaffResetPasswordServiceInterface<\n T extends DaffAuthResetPasswordInfo = DaffAuthResetPasswordInfo,\n> {\n\n /**\n * Resets password for the specified customer and logs in.\n */\n resetPassword(info: T): Observable<string>;\n\n /**\n * Resets password for the specified customer.\n */\n resetPasswordOnly(info: T): Observable<void>;\n\n /**\n * Send a password reset email to the specified email address.\n */\n sendResetEmail(email: string): Observable<void>;\n}\n\nexport const DaffResetPasswordDriver = new InjectionToken<DaffResetPasswordServiceInterface>('DaffResetPasswordDriver');\n","export enum DaffAuthDriverErrorCodes {\n AUTHENTICATION_FAILED = 'DAFF_AUTH_AUTHENTICATION_FAILED',\n INVALID_API_RESPONSE = 'DAFF_AUTH_INVALID_API_RESPONSE',\n REGISTRATION_FAILED = 'DAFF_AUTH_REGISTRATION_FAILED',\n UNAUTHORIZED = 'DAFF_AUTH_UNAUTHORIZED',\n}\n","import {\n DaffError,\n DaffInheritableError,\n} from '@daffodil/core';\n\nimport { DaffAuthDriverErrorCodes } from './codes.enum';\n\nexport class DaffUnauthorizedError extends DaffInheritableError implements DaffError {\n public readonly code: string = DaffAuthDriverErrorCodes.UNAUTHORIZED;\n\n constructor(public message: string) {\n\t super(message);\n }\n}\n","import {\n DaffError,\n DaffInheritableError,\n} from '@daffodil/core';\n\nimport { DaffAuthDriverErrorCodes } from './codes.enum';\n\nexport class DaffAuthenticationFailedError extends DaffInheritableError implements DaffError {\n public readonly code: string = DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED;\n\n constructor(public message: string) {\n\t super(message);\n }\n}\n","import {\n DaffError,\n DaffInheritableError,\n} from '@daffodil/core';\n\nimport { DaffAuthDriverErrorCodes } from './codes.enum';\n\n/**\n * An error thrown when registration failed.\n */\nexport class DaffRegistrationFailedError extends DaffInheritableError implements DaffError {\n public readonly code: string = DaffAuthDriverErrorCodes.REGISTRATION_FAILED;\n\n constructor(public message: string) {\n\t super(message);\n }\n}\n","import {\n DaffError,\n DaffInheritableError,\n} from '@daffodil/core';\n\nimport { DaffAuthDriverErrorCodes } from './codes.enum';\n\nexport class DaffAuthInvalidAPIResponseError extends DaffInheritableError implements DaffError {\n public readonly code: string = DaffAuthDriverErrorCodes.INVALID_API_RESPONSE;\n\n constructor(public message: string) {\n super(message);\n }\n}\n","import { DaffAuthenticationFailedError } from './authentication-failed';\nimport { DaffAuthDriverErrorCodes } from './codes.enum';\nimport { DaffAuthInvalidAPIResponseError } from './invalid-api-response';\nimport { DaffRegistrationFailedError } from './registration-failed';\nimport { DaffUnauthorizedError } from './unauthorized';\n\n/**\n * A mapping from error codes to error class constructors.\n */\nexport const DaffAuthDriverErrorMap = {\n [DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED]: DaffAuthenticationFailedError,\n [DaffAuthDriverErrorCodes.INVALID_API_RESPONSE]: DaffAuthInvalidAPIResponseError,\n [DaffAuthDriverErrorCodes.REGISTRATION_FAILED]: DaffRegistrationFailedError,\n [DaffAuthDriverErrorCodes.UNAUTHORIZED]: DaffUnauthorizedError,\n};\n","import {\n Inject,\n Injectable,\n} from '@angular/core';\nimport {\n Observable,\n map,\n of,\n switchMap,\n throwError,\n} from 'rxjs';\n\nimport {\n DaffAuthStorageService,\n DaffAuthMissingTokenError,\n} from '@daffodil/auth';\n\nimport {\n DaffAuthDriver,\n DaffAuthServiceInterface,\n} from '../interfaces/public_api';\n\n@Injectable({\n providedIn: 'root',\n})\nexport class DaffAuthDriverTokenCheck {\n constructor(\n private storage: DaffAuthStorageService,\n @Inject(DaffAuthDriver) private driver: DaffAuthServiceInterface,\n ) {}\n\n /**\n * Checks if the auth token in storage is valid.\n * If there is not an auth token in storage, the driver is not called\n * and an error is immediately thrown.\n */\n check(): Observable<void> {\n return of(null).pipe(\n switchMap(() => {\n const token = this.storage.getAuthToken();\n\n if (!token) {\n return throwError(() => new DaffAuthMissingTokenError('There is not an auth token in storage'));\n }\n\n return this.driver.check();\n }),\n );\n }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;;;;;MAUa,cAAc,GAAG,IAAI,cAAc,CAA2B,gBAAgB;;MCe9E,eAAe,GAAG,IAAI,cAAc,CAA4B,iBAAiB;;MCAjF,kBAAkB,GAAG,IAAI,cAAc,CAA+B,oBAAoB;;MCA1F,uBAAuB,GAAG,IAAI,cAAc,CAAoC,yBAAyB;;ACzB1G,IAAA,yBAKX;AALD,CAAA,UAAY,wBAAwB,EAAA;AAClC,IAAA,wBAAA,CAAA,uBAAA,CAAA,GAAA,iCAAyD,CAAA;AACzD,IAAA,wBAAA,CAAA,sBAAA,CAAA,GAAA,gCAAuD,CAAA;AACvD,IAAA,wBAAA,CAAA,qBAAA,CAAA,GAAA,+BAAqD,CAAA;AACrD,IAAA,wBAAA,CAAA,cAAA,CAAA,GAAA,wBAAuC,CAAA;AACzC,CAAC,EALW,wBAAwB,KAAxB,wBAAwB,GAKnC,EAAA,CAAA,CAAA;;ACEK,MAAO,qBAAsB,SAAQ,oBAAoB,CAAA;AAG7D,IAAA,WAAA,CAAmB,OAAe,EAAA;QACjC,KAAK,CAAC,OAAO,CAAC,CAAC;AADG,QAAA,IAAO,CAAA,OAAA,GAAP,OAAO,CAAQ;AAFlB,QAAA,IAAA,CAAA,IAAI,GAAW,wBAAwB,CAAC,YAAY,CAAC;KAIpE;AACF;;ACNK,MAAO,6BAA8B,SAAQ,oBAAoB,CAAA;AAGrE,IAAA,WAAA,CAAmB,OAAe,EAAA;QACjC,KAAK,CAAC,OAAO,CAAC,CAAC;AADG,QAAA,IAAO,CAAA,OAAA,GAAP,OAAO,CAAQ;AAFlB,QAAA,IAAA,CAAA,IAAI,GAAW,wBAAwB,CAAC,qBAAqB,CAAC;KAI7E;AACF;;ACND;;AAEG;AACG,MAAO,2BAA4B,SAAQ,oBAAoB,CAAA;AAGnE,IAAA,WAAA,CAAmB,OAAe,EAAA;QACjC,KAAK,CAAC,OAAO,CAAC,CAAC;AADG,QAAA,IAAO,CAAA,OAAA,GAAP,OAAO,CAAQ;AAFlB,QAAA,IAAA,CAAA,IAAI,GAAW,wBAAwB,CAAC,mBAAmB,CAAC;KAI3E;AACF;;ACTK,MAAO,+BAAgC,SAAQ,oBAAoB,CAAA;AAGvE,IAAA,WAAA,CAAmB,OAAe,EAAA;QAChC,KAAK,CAAC,OAAO,CAAC,CAAC;AADE,QAAA,IAAO,CAAA,OAAA,GAAP,OAAO,CAAQ;AAFlB,QAAA,IAAA,CAAA,IAAI,GAAW,wBAAwB,CAAC,oBAAoB,CAAC;KAI5E;AACF;;ACPD;;AAEG;AACU,MAAA,sBAAsB,GAAG;AACpC,IAAA,CAAC,wBAAwB,CAAC,qBAAqB,GAAG,6BAA6B;AAC/E,IAAA,CAAC,wBAAwB,CAAC,oBAAoB,GAAG,+BAA+B;AAChF,IAAA,CAAC,wBAAwB,CAAC,mBAAmB,GAAG,2BAA2B;AAC3E,IAAA,CAAC,wBAAwB,CAAC,YAAY,GAAG,qBAAqB;;;MCYnD,wBAAwB,CAAA;IACnC,WACU,CAAA,OAA+B,EACP,MAAgC,EAAA;AADxD,QAAA,IAAO,CAAA,OAAA,GAAP,OAAO,CAAwB;AACP,QAAA,IAAM,CAAA,MAAA,GAAN,MAAM,CAA0B;KAC9D;AAEJ;;;;AAIG;IACH,KAAK,GAAA;QACH,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAClB,SAAS,CAAC,MAAK;YACb,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAE1C,IAAI,CAAC,KAAK,EAAE;gBACV,OAAO,UAAU,CAAC,MAAM,IAAI,yBAAyB,CAAC,uCAAuC,CAAC,CAAC,CAAC;AACjG,aAAA;AAED,YAAA,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;SAC5B,CAAC,CACH,CAAC;KACH;;AAvBU,mBAAA,wBAAA,CAAA,IAAA,GAAA,EAAA,CAAA,kBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,wBAAwB,wDAGzB,cAAc,EAAA,CAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;AAHb,mBAAA,wBAAA,CAAA,KAAA,GAAA,EAAA,CAAA,qBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,wBAAwB,cAFvB,MAAM,EAAA,CAAA,CAAA;2FAEP,wBAAwB,EAAA,UAAA,EAAA,CAAA;kBAHpC,UAAU;AAAC,YAAA,IAAA,EAAA,CAAA;AACV,oBAAA,UAAU,EAAE,MAAM;iBACnB,CAAA;;;8BAII,MAAM;+BAAC,cAAc,CAAA;;;;AC5B1B;;AAEG;;;;"}
|
|
1
|
+
{"version":3,"file":"daffodil-auth-driver.mjs","sources":["../../../libs/auth/driver/src/interfaces/auth-service.interface.ts","../../../libs/auth/driver/src/interfaces/login-service.interface.ts","../../../libs/auth/driver/src/interfaces/register-service.interface.ts","../../../libs/auth/driver/src/interfaces/reset-password-service.interface.ts","../../../libs/auth/driver/src/errors/codes.enum.ts","../../../libs/auth/driver/src/errors/unauthorized.ts","../../../libs/auth/driver/src/errors/authentication-failed.ts","../../../libs/auth/driver/src/errors/registration-failed.ts","../../../libs/auth/driver/src/errors/invalid-api-response.ts","../../../libs/auth/driver/src/errors/map.ts","../../../libs/auth/driver/src/services/auth-check.service.ts","../../../libs/auth/driver/src/constants/unauthenticated-error-codes.ts","../../../libs/auth/driver/src/daffodil-auth-driver.ts"],"sourcesContent":["import { InjectionToken } from '@angular/core';\nimport { Observable } from 'rxjs';\n\nexport interface DaffAuthServiceInterface {\n /**\n * Checks the validity of an auth token.\n */\n check(): Observable<void>;\n}\n\nexport const DaffAuthDriver = new InjectionToken<DaffAuthServiceInterface>('DaffAuthDriver');\n","import { InjectionToken } from '@angular/core';\nimport { Observable } from 'rxjs';\n\nimport {\n DaffLoginInfo,\n DaffAuthToken,\n} from '@daffodil/auth';\n\nexport interface DaffLoginServiceInterface<\n TRequest extends DaffLoginInfo = DaffLoginInfo,\n TResponse extends DaffAuthToken = DaffAuthToken\n> {\n /**\n * Logs the user in.\n *\n * @returns An access token.\n */\n login(loginInfo: TRequest): Observable<TResponse>;\n\n /**\n * Logs the user out by revoking their access token.\n */\n logout(): Observable<void>;\n}\n\nexport const DaffLoginDriver = new InjectionToken<DaffLoginServiceInterface>('DaffLoginDriver');\n","import { InjectionToken } from '@angular/core';\nimport { Observable } from 'rxjs';\n\nimport { DaffAccountRegistration } from '@daffodil/auth';\n\nexport interface DaffRegisterServiceInterface<\n TRequest extends DaffAccountRegistration = DaffAccountRegistration,\n> {\n\n /**\n * Registers an account for the specified customer and logs the customer in.\n *\n * @param registration The account registration info.\n * @return The authentication token.\n */\n register(registration: TRequest): Observable<string>;\n\n /**\n * Registers an account for the specified customer but does not log the customer in.\n *\n * @param registration The account registration info.\n */\n registerOnly(registration: TRequest): Observable<void>;\n}\n\nexport const DaffRegisterDriver = new InjectionToken<DaffRegisterServiceInterface>('DaffRegisterDriver');\n","import { InjectionToken } from '@angular/core';\nimport { Observable } from 'rxjs';\n\nimport { DaffAuthResetPasswordInfo } from '@daffodil/auth';\n\nexport interface DaffResetPasswordServiceInterface<\n T extends DaffAuthResetPasswordInfo = DaffAuthResetPasswordInfo,\n> {\n\n /**\n * Resets password for the specified customer and logs in.\n */\n resetPassword(info: T): Observable<string>;\n\n /**\n * Resets password for the specified customer.\n */\n resetPasswordOnly(info: T): Observable<void>;\n\n /**\n * Send a password reset email to the specified email address.\n */\n sendResetEmail(email: string): Observable<void>;\n}\n\nexport const DaffResetPasswordDriver = new InjectionToken<DaffResetPasswordServiceInterface>('DaffResetPasswordDriver');\n","export enum DaffAuthDriverErrorCodes {\n AUTHENTICATION_FAILED = 'DAFF_AUTH_AUTHENTICATION_FAILED',\n INVALID_API_RESPONSE = 'DAFF_AUTH_INVALID_API_RESPONSE',\n REGISTRATION_FAILED = 'DAFF_AUTH_REGISTRATION_FAILED',\n UNAUTHORIZED = 'DAFF_AUTH_UNAUTHORIZED',\n}\n","import {\n DaffError,\n DaffInheritableError,\n} from '@daffodil/core';\n\nimport { DaffAuthDriverErrorCodes } from './codes.enum';\n\nexport class DaffUnauthorizedError extends DaffInheritableError implements DaffError {\n public readonly code: string = DaffAuthDriverErrorCodes.UNAUTHORIZED;\n\n constructor(public message: string) {\n\t super(message);\n }\n}\n","import {\n DaffError,\n DaffInheritableError,\n} from '@daffodil/core';\n\nimport { DaffAuthDriverErrorCodes } from './codes.enum';\n\nexport class DaffAuthenticationFailedError extends DaffInheritableError implements DaffError {\n public readonly code: string = DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED;\n\n constructor(public message: string) {\n\t super(message);\n }\n}\n","import {\n DaffError,\n DaffInheritableError,\n} from '@daffodil/core';\n\nimport { DaffAuthDriverErrorCodes } from './codes.enum';\n\n/**\n * An error thrown when registration failed.\n */\nexport class DaffRegistrationFailedError extends DaffInheritableError implements DaffError {\n public readonly code: string = DaffAuthDriverErrorCodes.REGISTRATION_FAILED;\n\n constructor(public message: string) {\n\t super(message);\n }\n}\n","import {\n DaffError,\n DaffInheritableError,\n} from '@daffodil/core';\n\nimport { DaffAuthDriverErrorCodes } from './codes.enum';\n\nexport class DaffAuthInvalidAPIResponseError extends DaffInheritableError implements DaffError {\n public readonly code: string = DaffAuthDriverErrorCodes.INVALID_API_RESPONSE;\n\n constructor(public message: string) {\n super(message);\n }\n}\n","import { DaffAuthenticationFailedError } from './authentication-failed';\nimport { DaffAuthDriverErrorCodes } from './codes.enum';\nimport { DaffAuthInvalidAPIResponseError } from './invalid-api-response';\nimport { DaffRegistrationFailedError } from './registration-failed';\nimport { DaffUnauthorizedError } from './unauthorized';\n\n/**\n * A mapping from error codes to error class constructors.\n */\nexport const DaffAuthDriverErrorMap = {\n [DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED]: DaffAuthenticationFailedError,\n [DaffAuthDriverErrorCodes.INVALID_API_RESPONSE]: DaffAuthInvalidAPIResponseError,\n [DaffAuthDriverErrorCodes.REGISTRATION_FAILED]: DaffRegistrationFailedError,\n [DaffAuthDriverErrorCodes.UNAUTHORIZED]: DaffUnauthorizedError,\n};\n","import {\n Inject,\n Injectable,\n} from '@angular/core';\nimport {\n Observable,\n map,\n of,\n switchMap,\n throwError,\n} from 'rxjs';\n\nimport {\n DaffAuthStorageService,\n DaffAuthMissingTokenError,\n} from '@daffodil/auth';\n\nimport {\n DaffAuthDriver,\n DaffAuthServiceInterface,\n} from '../interfaces/public_api';\n\n@Injectable({\n providedIn: 'root',\n})\nexport class DaffAuthDriverTokenCheck {\n constructor(\n private storage: DaffAuthStorageService,\n @Inject(DaffAuthDriver) private driver: DaffAuthServiceInterface,\n ) {}\n\n /**\n * Checks if the auth token in storage is valid.\n * If there is not an auth token in storage, the driver is not called\n * and an error is immediately thrown.\n */\n check(): Observable<void> {\n return of(null).pipe(\n switchMap(() => {\n const token = this.storage.getAuthToken();\n\n if (!token) {\n return throwError(() => new DaffAuthMissingTokenError('There is not an auth token in storage'));\n }\n\n return this.driver.check();\n }),\n );\n }\n}\n","import { DaffAuthErrorCodes } from '@daffodil/auth';\n\nimport { DaffAuthDriverErrorCodes } from '../errors/public_api';\n\n/**\n * The error codes that indicate that the user definitely should not be in an unauthenticated state\n * and if an auth token exists in storage, it is invalid.\n * These are contrasted to network failures and other sporadic and generic errors that aren't\n * a guarantee of the token's invalidity.\n */\nexport const DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES = {\n [DaffAuthDriverErrorCodes.UNAUTHORIZED]: true,\n [DaffAuthDriverErrorCodes.AUTHENTICATION_FAILED]: true,\n [DaffAuthErrorCodes.MISSING_TOKEN]: true,\n};\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ 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
|
-
import {
|
|
8
|
+
import { DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES } from '@daffodil/auth/driver';
|
|
9
9
|
import * as i1$1 from '@daffodil/auth/state';
|
|
10
10
|
import { DaffAuthGuardLogout, DaffResetPasswordLanding, DaffAuthActionTypes, DaffAuthLoginActionTypes, DaffAuthRegisterActionTypes, DaffAuthResetPasswordActionTypes, DAFF_AUTH_UNAUTHENTICATED_HOOKS } from '@daffodil/auth/state';
|
|
11
11
|
import * as i3 from '@angular/router';
|
|
@@ -34,8 +34,7 @@ class MemberOnlyGuard {
|
|
|
34
34
|
}
|
|
35
35
|
isAuthenticated() {
|
|
36
36
|
return this.tokenCheck.check().pipe(map(() => true), catchError((error) => {
|
|
37
|
-
if (error.code
|
|
38
|
-
this.storage.removeAuthToken();
|
|
37
|
+
if (DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES[error.code]) {
|
|
39
38
|
this.store.dispatch(new DaffAuthGuardLogout(this.errorMatcher(error)));
|
|
40
39
|
}
|
|
41
40
|
return of(false);
|
|
@@ -79,8 +78,7 @@ class GuestOnlyGuard {
|
|
|
79
78
|
}
|
|
80
79
|
isUnauthenticated() {
|
|
81
80
|
return this.tokenCheck.check().pipe(map(() => false), catchError((error) => {
|
|
82
|
-
if (error.code
|
|
83
|
-
this.storage.removeAuthToken();
|
|
81
|
+
if (DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES[error.code]) {
|
|
84
82
|
this.store.dispatch(new DaffAuthGuardLogout(this.errorMatcher(error)));
|
|
85
83
|
}
|
|
86
84
|
return of(true);
|