@daffodil/auth 0.48.1 → 0.49.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/esm2020/driver/magento/apollo-bearer-token-link-generator.mjs +6 -2
- package/esm2020/state/actions/auth.actions.mjs +12 -1
- package/esm2020/state/auth-state.module.mjs +10 -4
- package/esm2020/state/config/default.mjs +3 -1
- package/esm2020/state/config/type.mjs +1 -1
- package/esm2020/state/effects/auth.effects.mjs +33 -12
- package/esm2020/state/effects/login.effects.mjs +24 -6
- package/esm2020/state/effects/redirect.effects.mjs +35 -0
- package/esm2020/state/effects/register.effects.mjs +13 -3
- package/esm2020/state/effects/reset-password.effects.mjs +13 -3
- package/esm2020/state/reducers/auth/auth.reducer.mjs +3 -1
- package/fesm2015/daffodil-auth-driver-magento.mjs +5 -1
- package/fesm2015/daffodil-auth-driver-magento.mjs.map +1 -1
- package/fesm2015/daffodil-auth-state.mjs +119 -18
- package/fesm2015/daffodil-auth-state.mjs.map +1 -1
- package/fesm2020/daffodil-auth-driver-magento.mjs +5 -1
- package/fesm2020/daffodil-auth-driver-magento.mjs.map +1 -1
- package/fesm2020/daffodil-auth-state.mjs +120 -18
- package/fesm2020/daffodil-auth-state.mjs.map +1 -1
- package/package.json +3 -3
- package/state/actions/auth.actions.d.ts +7 -1
- package/state/auth-state.module.d.ts +1 -1
- package/state/config/type.d.ts +10 -0
- package/state/effects/auth.effects.d.ts +5 -4
- package/state/effects/login.effects.d.ts +5 -4
- package/state/effects/redirect.effects.d.ts +17 -0
- package/state/effects/reset-password.effects.d.ts +2 -2
|
@@ -14,7 +14,11 @@ export class MagentoAuthApolloBearerTokenLinkGenerator {
|
|
|
14
14
|
}
|
|
15
15
|
getLink() {
|
|
16
16
|
return new ApolloLink((operation, forward) => {
|
|
17
|
-
|
|
17
|
+
let token = null;
|
|
18
|
+
try {
|
|
19
|
+
token = this.storage.getAuthToken();
|
|
20
|
+
}
|
|
21
|
+
catch (e) { }
|
|
18
22
|
if (token) {
|
|
19
23
|
operation.setContext({
|
|
20
24
|
headers: {
|
|
@@ -35,4 +39,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
35
39
|
providedIn: 'root',
|
|
36
40
|
}]
|
|
37
41
|
}], ctorParameters: function () { return [{ type: i1.DaffAuthStorageService }]; } });
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBvbGxvLWJlYXJlci10b2tlbi1saW5rLWdlbmVyYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9kcml2ZXIvbWFnZW50by9zcmMvYXBvbGxvLWJlYXJlci10b2tlbi1saW5rLWdlbmVyYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVqRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7O0FBR3hEOzs7O0dBSUc7QUFJSCxNQUFNLE9BQU8seUNBQXlDO0lBQ3BELFlBQ1UsT0FBK0I7UUFBL0IsWUFBTyxHQUFQLE9BQU8sQ0FBd0I7SUFDdEMsQ0FBQztJQUVKLE9BQU87UUFDTCxPQUFPLElBQUksVUFBVSxDQUFDLENBQUMsU0FBUyxFQUFFLE9BQU8sRUFBRSxFQUFFO1lBQzNDLElBQUksS0FBSyxHQUFHLElBQUksQ0FBQztZQUVqQixJQUFJO2dCQUNGLEtBQUssR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxDQUFDO2FBQ3JDO1lBQUMsT0FBTSxDQUFDLEVBQUMsR0FBRTtZQUVaLElBQUksS0FBSyxFQUFFO2dCQUNULFNBQVMsQ0FBQyxVQUFVLENBQUM7b0JBQ25CLE9BQU8sRUFBRTt3QkFDUCxHQUFHLFNBQVMsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxPQUFPO3dCQUNqQyxhQUFhLEVBQUUsVUFBVSxLQUFLLEVBQUU7cUJBQ2pDO2lCQUNGLENBQUMsQ0FBQzthQUNKO1lBQ0QsT0FBTyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDNUIsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDOzt5SkF2QlUseUNBQXlDOzZKQUF6Qyx5Q0FBeUMsY0FGeEMsTUFBTTsyRkFFUCx5Q0FBeUM7a0JBSHJELFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQXBvbGxvTGluayB9IGZyb20gJ0BhcG9sbG8vY2xpZW50L2NvcmUnO1xuXG5pbXBvcnQgeyBEYWZmQXV0aFN0b3JhZ2VTZXJ2aWNlIH0gZnJvbSAnQGRhZmZvZGlsL2F1dGgnO1xuaW1wb3J0IHsgRGFmZkFwb2xsb0xpbmtHZW5lcmF0b3IgfSBmcm9tICdAZGFmZm9kaWwvY29yZS9ncmFwaHFsJztcblxuLyoqXG4gKiBBIHNlcnZpY2UgdGhhdCB3aWxsIGNvbnZlcnQgY2FjaGVhYmxlIGFwb2xsbyBvcGVyYXRpb25zIGludG8gYSBmb3JtYXQgdGhhdCBNYWdlbnRvIHdpbGwgdW5kZXJzdGFuZCBhcyBjYWNoZWFibGUuXG4gKlxuICogQGluaGVyaXRkb2NcbiAqL1xuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCcsXG59KVxuZXhwb3J0IGNsYXNzIE1hZ2VudG9BdXRoQXBvbGxvQmVhcmVyVG9rZW5MaW5rR2VuZXJhdG9yIGltcGxlbWVudHMgRGFmZkFwb2xsb0xpbmtHZW5lcmF0b3Ige1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIHN0b3JhZ2U6IERhZmZBdXRoU3RvcmFnZVNlcnZpY2UsXG4gICkge31cblxuICBnZXRMaW5rKCk6IEFwb2xsb0xpbmsge1xuICAgIHJldHVybiBuZXcgQXBvbGxvTGluaygob3BlcmF0aW9uLCBmb3J3YXJkKSA9PiB7XG4gICAgICBsZXQgdG9rZW4gPSBudWxsO1xuXG4gICAgICB0cnkge1xuICAgICAgICB0b2tlbiA9IHRoaXMuc3RvcmFnZS5nZXRBdXRoVG9rZW4oKTtcbiAgICAgIH0gY2F0Y2goZSl7fVxuXG4gICAgICBpZiAodG9rZW4pIHtcbiAgICAgICAgb3BlcmF0aW9uLnNldENvbnRleHQoe1xuICAgICAgICAgIGhlYWRlcnM6IHtcbiAgICAgICAgICAgIC4uLm9wZXJhdGlvbi5nZXRDb250ZXh0KCkuaGVhZGVycyxcbiAgICAgICAgICAgIGF1dGhvcml6YXRpb246IGBCZWFyZXIgJHt0b2tlbn1gLFxuICAgICAgICAgIH0sXG4gICAgICAgIH0pO1xuICAgICAgfVxuICAgICAgcmV0dXJuIGZvcndhcmQob3BlcmF0aW9uKTtcbiAgICB9KTtcbiAgfVxufVxuIl19
|
|
@@ -3,6 +3,7 @@ export var DaffAuthActionTypes;
|
|
|
3
3
|
DaffAuthActionTypes["AuthGuardCheckAction"] = "[@daffodil/auth] Auth Guard Check Action";
|
|
4
4
|
DaffAuthActionTypes["AuthGuardCheckCompletionAction"] = "[@daffodil/auth] Auth Guard Check Completion Action";
|
|
5
5
|
DaffAuthActionTypes["AuthStorageFailureAction"] = "[@daffodil/auth] Auth Storage Failure Action";
|
|
6
|
+
DaffAuthActionTypes["AuthServerSideAction"] = "[@daffodil/auth] Auth Server Side Action";
|
|
6
7
|
DaffAuthActionTypes["AuthCheckAction"] = "[@daffodil/auth] Auth Check Action";
|
|
7
8
|
DaffAuthActionTypes["AuthCheckSuccessAction"] = "[@daffodil/auth] Auth Check Success Action";
|
|
8
9
|
DaffAuthActionTypes["AuthCheckFailureAction"] = "[@daffodil/auth] Auth Check Failure Action";
|
|
@@ -34,6 +35,16 @@ export class DaffAuthStorageFailure {
|
|
|
34
35
|
this.type = DaffAuthActionTypes.AuthStorageFailureAction;
|
|
35
36
|
}
|
|
36
37
|
}
|
|
38
|
+
/*
|
|
39
|
+
* An action triggered when an invalid operation is performed in the server environment.
|
|
40
|
+
* A common example is trying to access the auth token from storage.
|
|
41
|
+
*/
|
|
42
|
+
export class DaffAuthServerSide {
|
|
43
|
+
constructor(errorMessage) {
|
|
44
|
+
this.errorMessage = errorMessage;
|
|
45
|
+
this.type = DaffAuthActionTypes.AuthServerSideAction;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
37
48
|
/**
|
|
38
49
|
* An action triggered to initialize an auth check request.
|
|
39
50
|
*/
|
|
@@ -72,4 +83,4 @@ export class DaffAuthComplete {
|
|
|
72
83
|
this.type = DaffAuthActionTypes.AuthCompleteAction;
|
|
73
84
|
}
|
|
74
85
|
}
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5hY3Rpb25zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGlicy9hdXRoL3N0YXRlL3NyYy9hY3Rpb25zL2F1dGguYWN0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxNQUFNLENBQU4sSUFBWSxtQkFTWDtBQVRELFdBQVksbUJBQW1CO0lBQzdCLHdGQUFpRSxDQUFBO0lBQ2pFLDZHQUFzRixDQUFBO0lBQ3RGLGdHQUF5RSxDQUFBO0lBQ3pFLHdGQUFpRSxDQUFBO0lBQ2pFLDZFQUFzRCxDQUFBO0lBQ3RELDRGQUFxRSxDQUFBO0lBQ3JFLDRGQUFxRSxDQUFBO0lBQ3JFLG1GQUE0RCxDQUFBO0FBQzlELENBQUMsRUFUVyxtQkFBbUIsS0FBbkIsbUJBQW1CLFFBUzlCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sa0JBQWtCO0lBQS9CO1FBQ1csU0FBSSxHQUFHLG1CQUFtQixDQUFDLG9CQUFvQixDQUFDO0lBQzNELENBQUM7Q0FBQTtBQUVEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLDRCQUE0QjtJQUd2QyxZQUFtQixNQUFlO1FBQWYsV0FBTSxHQUFOLE1BQU0sQ0FBUztRQUZ6QixTQUFJLEdBQUcsbUJBQW1CLENBQUMsOEJBQThCLENBQUM7SUFFOUIsQ0FBQztDQUN2QztBQUVEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHNCQUFzQjtJQUdqQyxZQUFtQixZQUE0QjtRQUE1QixpQkFBWSxHQUFaLFlBQVksQ0FBZ0I7UUFGdEMsU0FBSSxHQUFHLG1CQUFtQixDQUFDLHdCQUF3QixDQUFDO0lBRVgsQ0FBQztDQUNwRDtBQUVEOzs7R0FHRztBQUNILE1BQU0sT0FBTyxrQkFBa0I7SUFHN0IsWUFBbUIsWUFBNEI7UUFBNUIsaUJBQVksR0FBWixZQUFZLENBQWdCO1FBRnRDLFNBQUksR0FBRyxtQkFBbUIsQ0FBQyxvQkFBb0IsQ0FBQztJQUVQLENBQUM7Q0FDcEQ7QUFFRDs7R0FFRztBQUNILE1BQU0sT0FBTyxhQUFhO0lBQTFCO1FBQ1csU0FBSSxHQUFHLG1CQUFtQixDQUFDLGVBQWUsQ0FBQztJQUN0RCxDQUFDO0NBQUE7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxPQUFPLG9CQUFvQjtJQUFqQztRQUNXLFNBQUksR0FBRyxtQkFBbUIsQ0FBQyxzQkFBc0IsQ0FBQztJQUM3RCxDQUFDO0NBQUE7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxPQUFPLG9CQUFvQjtJQUcvQixZQUFtQixZQUE0QjtRQUE1QixpQkFBWSxHQUFaLFlBQVksQ0FBZ0I7UUFGdEMsU0FBSSxHQUFHLG1CQUFtQixDQUFDLHNCQUFzQixDQUFDO0lBRVQsQ0FBQztDQUNwRDtBQUVEOzs7R0FHRztBQUNILE1BQU0sT0FBTyxnQkFBZ0I7SUFBN0I7UUFDVyxTQUFJLEdBQUcsbUJBQW1CLENBQUMsa0JBQWtCLENBQUM7SUFDekQsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQWN0aW9uIH0gZnJvbSAnQG5ncngvc3RvcmUnO1xuXG5pbXBvcnQgeyBEYWZmU3RhdGVFcnJvciB9IGZyb20gJ0BkYWZmb2RpbC9jb3JlL3N0YXRlJztcblxuZXhwb3J0IGVudW0gRGFmZkF1dGhBY3Rpb25UeXBlcyB7XG4gIEF1dGhHdWFyZENoZWNrQWN0aW9uID0gJ1tAZGFmZm9kaWwvYXV0aF0gQXV0aCBHdWFyZCBDaGVjayBBY3Rpb24nLFxuICBBdXRoR3VhcmRDaGVja0NvbXBsZXRpb25BY3Rpb24gPSAnW0BkYWZmb2RpbC9hdXRoXSBBdXRoIEd1YXJkIENoZWNrIENvbXBsZXRpb24gQWN0aW9uJyxcbiAgQXV0aFN0b3JhZ2VGYWlsdXJlQWN0aW9uID0gJ1tAZGFmZm9kaWwvYXV0aF0gQXV0aCBTdG9yYWdlIEZhaWx1cmUgQWN0aW9uJyxcbiAgQXV0aFNlcnZlclNpZGVBY3Rpb24gPSAnW0BkYWZmb2RpbC9hdXRoXSBBdXRoIFNlcnZlciBTaWRlIEFjdGlvbicsXG4gIEF1dGhDaGVja0FjdGlvbiA9ICdbQGRhZmZvZGlsL2F1dGhdIEF1dGggQ2hlY2sgQWN0aW9uJyxcbiAgQXV0aENoZWNrU3VjY2Vzc0FjdGlvbiA9ICdbQGRhZmZvZGlsL2F1dGhdIEF1dGggQ2hlY2sgU3VjY2VzcyBBY3Rpb24nLFxuICBBdXRoQ2hlY2tGYWlsdXJlQWN0aW9uID0gJ1tAZGFmZm9kaWwvYXV0aF0gQXV0aCBDaGVjayBGYWlsdXJlIEFjdGlvbicsXG4gIEF1dGhDb21wbGV0ZUFjdGlvbiA9ICdbQGRhZmZvZGlsL2F1dGhdIEF1dGggQ29tcGxldGUgQWN0aW9uJyxcbn1cblxuLyoqXG4gKiBBbiBhY3Rpb24gdHJpZ2dlcmVkIGJ5IGd1YXJkcyB0byBpbml0aWFsaXplIGFuIGF1dGggY2hlY2sgcmVxdWVzdC5cbiAqL1xuZXhwb3J0IGNsYXNzIERhZmZBdXRoR3VhcmRDaGVjayBpbXBsZW1lbnRzIEFjdGlvbiB7XG4gIHJlYWRvbmx5IHR5cGUgPSBEYWZmQXV0aEFjdGlvblR5cGVzLkF1dGhHdWFyZENoZWNrQWN0aW9uO1xufVxuXG4vKipcbiAqIEFuIGFjdGlvbiB0cmlnZ2VyZWQgb24gdGhlIGNvbXBsZXRpb24gb2YgYSBndWFyZCB0b2tlbiBjaGVjay5cbiAqL1xuZXhwb3J0IGNsYXNzIERhZmZBdXRoR3VhcmRDaGVja0NvbXBsZXRpb24gaW1wbGVtZW50cyBBY3Rpb24ge1xuICByZWFkb25seSB0eXBlID0gRGFmZkF1dGhBY3Rpb25UeXBlcy5BdXRoR3VhcmRDaGVja0NvbXBsZXRpb25BY3Rpb247XG5cbiAgY29uc3RydWN0b3IocHVibGljIHJlc3VsdDogYm9vbGVhbikge31cbn1cblxuLypcbiAqIEFuIGFjdGlvbiB0cmlnZ2VyZWQgdXBvbiBhIGZhaWxlZCBhdXRoIHN0b3JhZ2Ugb3BlcmF0aW9uLlxuICovXG5leHBvcnQgY2xhc3MgRGFmZkF1dGhTdG9yYWdlRmFpbHVyZSBpbXBsZW1lbnRzIEFjdGlvbiB7XG4gIHJlYWRvbmx5IHR5cGUgPSBEYWZmQXV0aEFjdGlvblR5cGVzLkF1dGhTdG9yYWdlRmFpbHVyZUFjdGlvbjtcblxuICBjb25zdHJ1Y3RvcihwdWJsaWMgZXJyb3JNZXNzYWdlOiBEYWZmU3RhdGVFcnJvcikge31cbn1cblxuLypcbiAqIEFuIGFjdGlvbiB0cmlnZ2VyZWQgd2hlbiBhbiBpbnZhbGlkIG9wZXJhdGlvbiBpcyBwZXJmb3JtZWQgaW4gdGhlIHNlcnZlciBlbnZpcm9ubWVudC5cbiAqIEEgY29tbW9uIGV4YW1wbGUgaXMgdHJ5aW5nIHRvIGFjY2VzcyB0aGUgYXV0aCB0b2tlbiBmcm9tIHN0b3JhZ2UuXG4gKi9cbmV4cG9ydCBjbGFzcyBEYWZmQXV0aFNlcnZlclNpZGUgaW1wbGVtZW50cyBBY3Rpb24ge1xuICByZWFkb25seSB0eXBlID0gRGFmZkF1dGhBY3Rpb25UeXBlcy5BdXRoU2VydmVyU2lkZUFjdGlvbjtcblxuICBjb25zdHJ1Y3RvcihwdWJsaWMgZXJyb3JNZXNzYWdlOiBEYWZmU3RhdGVFcnJvcikge31cbn1cblxuLyoqXG4gKiBBbiBhY3Rpb24gdHJpZ2dlcmVkIHRvIGluaXRpYWxpemUgYW4gYXV0aCBjaGVjayByZXF1ZXN0LlxuICovXG5leHBvcnQgY2xhc3MgRGFmZkF1dGhDaGVjayBpbXBsZW1lbnRzIEFjdGlvbiB7XG4gIHJlYWRvbmx5IHR5cGUgPSBEYWZmQXV0aEFjdGlvblR5cGVzLkF1dGhDaGVja0FjdGlvbjtcbn1cblxuLyoqXG4gKiBBbiBhY3Rpb24gdHJpZ2dlcmVkIHVwb24gYSBzdWNjZXNzZnVsIGF1dGggY2hlY2suXG4gKlxuICogQHBhcmFtIHRva2VuIC0gdGhlIGN1c3RvbWVyIGFjY2VzcyB0b2tlblxuICovXG5leHBvcnQgY2xhc3MgRGFmZkF1dGhDaGVja1N1Y2Nlc3MgaW1wbGVtZW50cyBBY3Rpb24ge1xuICByZWFkb25seSB0eXBlID0gRGFmZkF1dGhBY3Rpb25UeXBlcy5BdXRoQ2hlY2tTdWNjZXNzQWN0aW9uO1xufVxuXG4vKipcbiAqIEFuIGFjdGlvbiB0cmlnZ2VyZWQgdXBvbiBhIGZhaWxlZCBhdXRoIGNoZWNrIHJlcXVlc3QuXG4gKlxuICogQHBhcmFtIGVycm9yTWVzc2FnZSAtIGFuIGVycm9yIG1lc3NhZ2VcbiAqL1xuZXhwb3J0IGNsYXNzIERhZmZBdXRoQ2hlY2tGYWlsdXJlIGltcGxlbWVudHMgQWN0aW9uIHtcbiAgcmVhZG9ubHkgdHlwZSA9IERhZmZBdXRoQWN0aW9uVHlwZXMuQXV0aENoZWNrRmFpbHVyZUFjdGlvbjtcblxuICBjb25zdHJ1Y3RvcihwdWJsaWMgZXJyb3JNZXNzYWdlOiBEYWZmU3RhdGVFcnJvcikge31cbn1cblxuLyoqXG4gKiBBbiBhY3Rpb24gdHJpZ2dlcmVkIHdoZW4gdGhlIHVzZXIgYXV0aGVudGljYXRpb24gZmxvdyBpcyBjb21wbGV0ZWQuXG4gKiBUaGUgYXV0aCB0b2tlbiBpcyBpbiBzdG9yYWdlIGF0IHRoaXMgcG9pbnQuXG4gKi9cbmV4cG9ydCBjbGFzcyBEYWZmQXV0aENvbXBsZXRlIGltcGxlbWVudHMgQWN0aW9uIHtcbiAgcmVhZG9ubHkgdHlwZSA9IERhZmZBdXRoQWN0aW9uVHlwZXMuQXV0aENvbXBsZXRlQWN0aW9uO1xufVxuXG5leHBvcnQgdHlwZSBEYWZmQXV0aEFjdGlvbnMgPVxuICB8IERhZmZBdXRoR3VhcmRDaGVja0NvbXBsZXRpb25cbiAgfCBEYWZmQXV0aEd1YXJkQ2hlY2tcbiAgfCBEYWZmQXV0aFN0b3JhZ2VGYWlsdXJlXG4gIHwgRGFmZkF1dGhTZXJ2ZXJTaWRlXG4gIHwgRGFmZkF1dGhDaGVja1xuICB8IERhZmZBdXRoQ2hlY2tTdWNjZXNzXG4gIHwgRGFmZkF1dGhDaGVja0ZhaWx1cmVcbiAgfCBEYWZmQXV0aENvbXBsZXRlO1xuIl19
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { NgModule, } from '@angular/core';
|
|
2
2
|
import { EffectsModule } from '@ngrx/effects';
|
|
3
3
|
import { StoreModule } from '@ngrx/store';
|
|
4
|
-
import { provideDaffAuthStateConfig, } from './config/public_api';
|
|
4
|
+
import { daffAuthStateDefaultConfig, provideDaffAuthStateConfig, } from './config/public_api';
|
|
5
5
|
import { DaffAuthEffects } from './effects/auth.effects';
|
|
6
6
|
import { DaffAuthLoginEffects } from './effects/login.effects';
|
|
7
|
+
import { DaffAuthRedirectEffects } from './effects/redirect.effects';
|
|
7
8
|
import { DaffAuthRegisterEffects } from './effects/register.effects';
|
|
8
9
|
import { DaffAuthResetPasswordEffects } from './effects/reset-password.effects';
|
|
9
10
|
import { DAFF_AUTH_STORE_FEATURE_KEY, daffAuthReducers, } from './reducers/public_api';
|
|
@@ -11,11 +12,14 @@ import * as i0 from "@angular/core";
|
|
|
11
12
|
import * as i1 from "@ngrx/store";
|
|
12
13
|
import * as i2 from "@ngrx/effects";
|
|
13
14
|
export class DaffAuthStateModule {
|
|
14
|
-
static withConfig(config) {
|
|
15
|
+
static withConfig(config = {}) {
|
|
15
16
|
return {
|
|
16
17
|
ngModule: DaffAuthStateModule,
|
|
17
18
|
providers: [
|
|
18
|
-
provideDaffAuthStateConfig(
|
|
19
|
+
provideDaffAuthStateConfig({
|
|
20
|
+
...daffAuthStateDefaultConfig,
|
|
21
|
+
...config,
|
|
22
|
+
}),
|
|
19
23
|
],
|
|
20
24
|
};
|
|
21
25
|
}
|
|
@@ -29,6 +33,7 @@ export class DaffAuthStateModule {
|
|
|
29
33
|
DaffAuthLoginEffects,
|
|
30
34
|
DaffAuthRegisterEffects,
|
|
31
35
|
DaffAuthResetPasswordEffects,
|
|
36
|
+
DaffAuthRedirectEffects,
|
|
32
37
|
]),
|
|
33
38
|
]] });
|
|
34
39
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthStateModule, decorators: [{
|
|
@@ -41,8 +46,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
41
46
|
DaffAuthLoginEffects,
|
|
42
47
|
DaffAuthRegisterEffects,
|
|
43
48
|
DaffAuthResetPasswordEffects,
|
|
49
|
+
DaffAuthRedirectEffects,
|
|
44
50
|
]),
|
|
45
51
|
],
|
|
46
52
|
}]
|
|
47
53
|
}] });
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1zdGF0ZS5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9saWJzL2F1dGgvc3RhdGUvc3JjL2F1dGgtc3RhdGUubW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFFTCxRQUFRLEdBQ1QsTUFBTSxlQUFlLENBQUM7QUFDdkIsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUM5QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTFDLE9BQU8sRUFFTCwwQkFBMEIsRUFDMUIsMEJBQTBCLEdBQzNCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3JFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3JFLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2hGLE9BQU8sRUFDTCwyQkFBMkIsRUFDM0IsZ0JBQWdCLEdBQ2pCLE1BQU0sdUJBQXVCLENBQUM7Ozs7QUFjL0IsTUFBTSxPQUFPLG1CQUFtQjtJQUM5QixNQUFNLENBQUMsVUFBVSxDQUFDLFNBQXVDLEVBQUU7UUFDekQsT0FBTztZQUNMLFFBQVEsRUFBRSxtQkFBbUI7WUFDN0IsU0FBUyxFQUFFO2dCQUNULDBCQUEwQixDQUFDO29CQUN6QixHQUFHLDBCQUEwQjtvQkFDN0IsR0FBRyxNQUFNO2lCQUNWLENBQUM7YUFDSDtTQUNGLENBQUM7SUFDSixDQUFDOzttSUFYVSxtQkFBbUI7b0lBQW5CLG1CQUFtQjtvSUFBbkIsbUJBQW1CLFlBWHJCO1lBQ1AsV0FBVyxDQUFDLFVBQVUsQ0FBQywyQkFBMkIsRUFBRSxnQkFBZ0IsQ0FBQztZQUNyRSxhQUFhLENBQUMsVUFBVSxDQUFDO2dCQUN2QixlQUFlO2dCQUNmLG9CQUFvQjtnQkFDcEIsdUJBQXVCO2dCQUN2Qiw0QkFBNEI7Z0JBQzVCLHVCQUF1QjthQUN4QixDQUFDO1NBQ0g7MkZBRVUsbUJBQW1CO2tCQVovQixRQUFRO21CQUFDO29CQUNSLE9BQU8sRUFBRTt3QkFDUCxXQUFXLENBQUMsVUFBVSxDQUFDLDJCQUEyQixFQUFFLGdCQUFnQixDQUFDO3dCQUNyRSxhQUFhLENBQUMsVUFBVSxDQUFDOzRCQUN2QixlQUFlOzRCQUNmLG9CQUFvQjs0QkFDcEIsdUJBQXVCOzRCQUN2Qiw0QkFBNEI7NEJBQzVCLHVCQUF1Qjt5QkFDeEIsQ0FBQztxQkFDSDtpQkFDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIE1vZHVsZVdpdGhQcm92aWRlcnMsXG4gIE5nTW9kdWxlLFxufSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEVmZmVjdHNNb2R1bGUgfSBmcm9tICdAbmdyeC9lZmZlY3RzJztcbmltcG9ydCB7IFN0b3JlTW9kdWxlIH0gZnJvbSAnQG5ncngvc3RvcmUnO1xuXG5pbXBvcnQge1xuICBEYWZmQXV0aFN0YXRlQ29uZmlnLFxuICBkYWZmQXV0aFN0YXRlRGVmYXVsdENvbmZpZyxcbiAgcHJvdmlkZURhZmZBdXRoU3RhdGVDb25maWcsXG59IGZyb20gJy4vY29uZmlnL3B1YmxpY19hcGknO1xuaW1wb3J0IHsgRGFmZkF1dGhFZmZlY3RzIH0gZnJvbSAnLi9lZmZlY3RzL2F1dGguZWZmZWN0cyc7XG5pbXBvcnQgeyBEYWZmQXV0aExvZ2luRWZmZWN0cyB9IGZyb20gJy4vZWZmZWN0cy9sb2dpbi5lZmZlY3RzJztcbmltcG9ydCB7IERhZmZBdXRoUmVkaXJlY3RFZmZlY3RzIH0gZnJvbSAnLi9lZmZlY3RzL3JlZGlyZWN0LmVmZmVjdHMnO1xuaW1wb3J0IHsgRGFmZkF1dGhSZWdpc3RlckVmZmVjdHMgfSBmcm9tICcuL2VmZmVjdHMvcmVnaXN0ZXIuZWZmZWN0cyc7XG5pbXBvcnQgeyBEYWZmQXV0aFJlc2V0UGFzc3dvcmRFZmZlY3RzIH0gZnJvbSAnLi9lZmZlY3RzL3Jlc2V0LXBhc3N3b3JkLmVmZmVjdHMnO1xuaW1wb3J0IHtcbiAgREFGRl9BVVRIX1NUT1JFX0ZFQVRVUkVfS0VZLFxuICBkYWZmQXV0aFJlZHVjZXJzLFxufSBmcm9tICcuL3JlZHVjZXJzL3B1YmxpY19hcGknO1xuXG5ATmdNb2R1bGUoe1xuICBpbXBvcnRzOiBbXG4gICAgU3RvcmVNb2R1bGUuZm9yRmVhdHVyZShEQUZGX0FVVEhfU1RPUkVfRkVBVFVSRV9LRVksIGRhZmZBdXRoUmVkdWNlcnMpLFxuICAgIEVmZmVjdHNNb2R1bGUuZm9yRmVhdHVyZShbXG4gICAgICBEYWZmQXV0aEVmZmVjdHMsXG4gICAgICBEYWZmQXV0aExvZ2luRWZmZWN0cyxcbiAgICAgIERhZmZBdXRoUmVnaXN0ZXJFZmZlY3RzLFxuICAgICAgRGFmZkF1dGhSZXNldFBhc3N3b3JkRWZmZWN0cyxcbiAgICAgIERhZmZBdXRoUmVkaXJlY3RFZmZlY3RzLFxuICAgIF0pLFxuICBdLFxufSlcbmV4cG9ydCBjbGFzcyBEYWZmQXV0aFN0YXRlTW9kdWxlIHtcbiAgc3RhdGljIHdpdGhDb25maWcoY29uZmlnOiBQYXJ0aWFsPERhZmZBdXRoU3RhdGVDb25maWc+ID0ge30pOiBNb2R1bGVXaXRoUHJvdmlkZXJzPERhZmZBdXRoU3RhdGVNb2R1bGU+IHtcbiAgICByZXR1cm4ge1xuICAgICAgbmdNb2R1bGU6IERhZmZBdXRoU3RhdGVNb2R1bGUsXG4gICAgICBwcm92aWRlcnM6IFtcbiAgICAgICAgcHJvdmlkZURhZmZBdXRoU3RhdGVDb25maWcoe1xuICAgICAgICAgIC4uLmRhZmZBdXRoU3RhdGVEZWZhdWx0Q29uZmlnLFxuICAgICAgICAgIC4uLmNvbmZpZyxcbiAgICAgICAgfSksXG4gICAgICBdLFxuICAgIH07XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
const TWENTY_MINUTES = 1.2e6;
|
|
2
2
|
export const daffAuthStateDefaultConfig = {
|
|
3
3
|
checkInterval: TWENTY_MINUTES,
|
|
4
|
+
authCompleteRedirectPath: '/',
|
|
5
|
+
logoutRedirectPath: '/',
|
|
4
6
|
};
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9zdGF0ZS9zcmMvY29uZmlnL2RlZmF1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsTUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDO0FBRTdCLE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUF3QjtJQUM3RCxhQUFhLEVBQUUsY0FBYztJQUM3Qix3QkFBd0IsRUFBRSxHQUFHO0lBQzdCLGtCQUFrQixFQUFFLEdBQUc7Q0FDeEIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERhZmZBdXRoU3RhdGVDb25maWcgfSBmcm9tICcuL3R5cGUnO1xuXG5jb25zdCBUV0VOVFlfTUlOVVRFUyA9IDEuMmU2O1xuXG5leHBvcnQgY29uc3QgZGFmZkF1dGhTdGF0ZURlZmF1bHRDb25maWc6IERhZmZBdXRoU3RhdGVDb25maWcgPSB7XG4gIGNoZWNrSW50ZXJ2YWw6IFRXRU5UWV9NSU5VVEVTLFxuICBhdXRoQ29tcGxldGVSZWRpcmVjdFBhdGg6ICcvJyxcbiAgbG9nb3V0UmVkaXJlY3RQYXRoOiAnLycsXG59O1xuIl19
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9zdGF0ZS9zcmMvY29uZmlnL3R5cGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgRGFmZkF1dGhTdGF0ZUNvbmZpZyB7XG4gIC8qKlxuICAgKiBIb3cgb2Z0ZW4gRGFmZm9kaWwgd2lsbCBydW4gdGhlIGF1dGggY2hlY2suXG4gICAqIERlZmF1bHRzIHRvIHR3ZW50eSBtaW51dGVzLlxuICAgKi9cbiAgY2hlY2tJbnRlcnZhbDogbnVtYmVyO1xuXG4gIC8qKlxuICAgKiBUaGUgcGF0aCB0byB3aGljaCB0aGUgdXNlciB3aWxsIGJlIHJlZGlyZWN0ZWQgd2hlbiB0aGV5IGFyZSBsb2dnZWQgaW4gYW5kIHRoZSBhdXRoIHRva2VuIGlzIHN0b3JlZC5cbiAgICogRGVmYXVsdHMgdG8gYCcvJ2AuXG4gICAqL1xuICBhdXRoQ29tcGxldGVSZWRpcmVjdFBhdGg6IHN0cmluZztcblxuICAvKipcbiAgICogVGhlIHBhdGggdG8gd2hpY2ggdGhlIHVzZXIgd2lsbCBiZSByZWRpcmVjdGVkIHdoZW4gdGhleSBhcmUgbG9nZ2VkIG91dC5cbiAgICogRGVmYXVsdHMgdG8gYCcvJ2AuXG4gICAqL1xuICBsb2dvdXRSZWRpcmVjdFBhdGg6IHN0cmluZztcbn1cbiJdfQ==
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Injectable, Inject, } from '@angular/core';
|
|
2
2
|
import { Actions, createEffect, ofType, } from '@ngrx/effects';
|
|
3
|
-
import { of, } from 'rxjs';
|
|
4
|
-
import { switchMap, catchError, map, repeat, filter, } from 'rxjs/operators';
|
|
3
|
+
import { of, EMPTY, } from 'rxjs';
|
|
4
|
+
import { switchMap, catchError, map, repeat, filter, tap, } from 'rxjs/operators';
|
|
5
5
|
import { DaffAuthStorageService, DAFF_AUTH_ERROR_MATCHER, } from '@daffodil/auth';
|
|
6
6
|
import { DaffAuthDriver, } from '@daffodil/auth/driver';
|
|
7
|
-
import {
|
|
7
|
+
import { DaffServerSideStorageError, DaffStorageServiceError, } from '@daffodil/core';
|
|
8
|
+
import { DaffAuthActionTypes, DaffAuthCheckSuccess, DaffAuthCheckFailure, DaffAuthCheck, DaffAuthGuardCheckCompletion, DaffAuthStorageFailure, DaffAuthServerSide, } from '../actions/public_api';
|
|
8
9
|
import { DAFF_AUTH_STATE_CONFIG, } from '../config/public_api';
|
|
9
10
|
import * as i0 from "@angular/core";
|
|
10
11
|
import * as i1 from "@ngrx/effects";
|
|
@@ -16,16 +17,36 @@ export class DaffAuthEffects {
|
|
|
16
17
|
this.errorMatcher = errorMatcher;
|
|
17
18
|
this.storage = storage;
|
|
18
19
|
this.config = config;
|
|
19
|
-
this.check$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.AuthCheckAction), switchMap((action) => this.authDriver.check().pipe(map(() => new DaffAuthCheckSuccess()), catchError((error) =>
|
|
20
|
+
this.check$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.AuthCheckAction), switchMap((action) => this.authDriver.check().pipe(map(() => new DaffAuthCheckSuccess()), catchError((error) => of(new DaffAuthCheckFailure(this.errorMatcher(error))))))));
|
|
21
|
+
this.guardCheck$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.AuthGuardCheckAction), switchMap((action) => this.authDriver.check().pipe(map(() => new DaffAuthGuardCheckCompletion(true)), catchError((error) => of(new DaffAuthGuardCheckCompletion(false)))))));
|
|
22
|
+
this.removeAuthToken$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.AuthGuardCheckCompletionAction, DaffAuthActionTypes.AuthCheckFailureAction), filter(action => {
|
|
23
|
+
// don't remove token when guard check completes with true result
|
|
24
|
+
if (action.type === DaffAuthActionTypes.AuthGuardCheckCompletionAction && action.result) {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
return true;
|
|
28
|
+
}), tap(() => {
|
|
20
29
|
this.storage.removeAuthToken();
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
30
|
+
}), switchMap(() => EMPTY), catchError((error) => {
|
|
31
|
+
switch (true) {
|
|
32
|
+
case error instanceof DaffServerSideStorageError:
|
|
33
|
+
return of(new DaffAuthServerSide(this.errorMatcher(error)));
|
|
34
|
+
case error instanceof DaffStorageServiceError:
|
|
35
|
+
default:
|
|
36
|
+
return of(new DaffAuthStorageFailure(this.errorMatcher(error)));
|
|
37
|
+
}
|
|
38
|
+
})));
|
|
27
39
|
// this needs to be defined after `check$` or else the driver call won't be run
|
|
28
|
-
this.authCheckInterval$ = createEffect(() => of(new DaffAuthCheck()).pipe(repeat({ delay: this.config.checkInterval }), filter(() => !!this.storage.getAuthToken()))
|
|
40
|
+
this.authCheckInterval$ = createEffect(() => of(new DaffAuthCheck()).pipe(repeat({ delay: this.config.checkInterval }), filter(() => !!this.storage.getAuthToken()), catchError((error) => {
|
|
41
|
+
switch (true) {
|
|
42
|
+
case error instanceof DaffServerSideStorageError:
|
|
43
|
+
return of(new DaffAuthServerSide(this.errorMatcher(error)));
|
|
44
|
+
case error instanceof DaffStorageServiceError:
|
|
45
|
+
return of(new DaffAuthStorageFailure(this.errorMatcher(error)));
|
|
46
|
+
default:
|
|
47
|
+
return EMPTY;
|
|
48
|
+
}
|
|
49
|
+
})));
|
|
29
50
|
}
|
|
30
51
|
}
|
|
31
52
|
/** @nocollapse */ DaffAuthEffects.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthEffects, deps: [{ token: i1.Actions }, { token: DaffAuthDriver }, { token: DAFF_AUTH_ERROR_MATCHER }, { token: i2.DaffAuthStorageService }, { token: DAFF_AUTH_STATE_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -42,4 +63,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
42
63
|
type: Inject,
|
|
43
64
|
args: [DAFF_AUTH_STATE_CONFIG]
|
|
44
65
|
}] }]; } });
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# 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  Observable,\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  DaffAuthDriver,\n  DaffAuthServiceInterface,\n} from '@daffodil/auth/driver';\nimport {\n  DaffError,\n  DaffServerSideStorageError,\n  DaffStorageServiceError,\n} from '@daffodil/core';\nimport { ErrorTransformer } from '@daffodil/core/state';\n\nimport {\n  DaffAuthActionTypes,\n  DaffAuthCheckSuccess,\n  DaffAuthCheckFailure,\n  DaffAuthCheck,\n  DaffAuthGuardCheckCompletion,\n  DaffAuthGuardCheck,\n  DaffAuthStorageFailure,\n  DaffAuthServerSide,\n} from '../actions/public_api';\nimport {\n  DaffAuthStateConfig,\n  DAFF_AUTH_STATE_CONFIG,\n} from '../config/public_api';\n\n@Injectable()\nexport class DaffAuthEffects {\n  constructor(\n    private actions$: Actions,\n    @Inject(DaffAuthDriver) private authDriver: DaffAuthServiceInterface,\n    @Inject(DAFF_AUTH_ERROR_MATCHER) private errorMatcher: ErrorTransformer,\n    private storage: DaffAuthStorageService,\n    @Inject(DAFF_AUTH_STATE_CONFIG) private config: DaffAuthStateConfig,\n  ) {}\n\n  check$ = createEffect(() => this.actions$.pipe(\n    ofType(DaffAuthActionTypes.AuthCheckAction),\n    switchMap((action: DaffAuthCheck) =>\n      this.authDriver.check().pipe(\n        map(() => new DaffAuthCheckSuccess()),\n        catchError((error: DaffError) => of(new DaffAuthCheckFailure(this.errorMatcher(error)))),\n      ),\n    ),\n  ));\n\n  guardCheck$ = createEffect(() => this.actions$.pipe(\n    ofType(DaffAuthActionTypes.AuthGuardCheckAction),\n    switchMap((action: DaffAuthGuardCheck) =>\n      this.authDriver.check().pipe(\n        map(() => new DaffAuthGuardCheckCompletion(true)),\n        catchError((error: DaffError) => of(new DaffAuthGuardCheckCompletion(false))),\n      ),\n    ),\n  ));\n\n  removeAuthToken$ = createEffect(() => this.actions$.pipe(\n    ofType<DaffAuthCheckFailure | DaffAuthGuardCheckCompletion>(\n      DaffAuthActionTypes.AuthGuardCheckCompletionAction,\n      DaffAuthActionTypes.AuthCheckFailureAction,\n    ),\n    filter(action => {\n      // don't remove token when guard check completes with true result\n      if (action.type === DaffAuthActionTypes.AuthGuardCheckCompletionAction && action.result) {\n        return false;\n      }\n\n      return true;\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  ));\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"]}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Injectable, Inject, } from '@angular/core';
|
|
2
2
|
import { Actions, createEffect, ofType, } from '@ngrx/effects';
|
|
3
|
-
import { of, } from 'rxjs';
|
|
3
|
+
import { of, EMPTY, } from 'rxjs';
|
|
4
4
|
import { switchMap, map, catchError, tap, } from 'rxjs/operators';
|
|
5
5
|
import { DAFF_AUTH_ERROR_MATCHER, DaffAuthStorageService, } from '@daffodil/auth';
|
|
6
6
|
import { DaffLoginDriver, } from '@daffodil/auth/driver';
|
|
7
|
-
import {
|
|
7
|
+
import { DaffServerSideStorageError, DaffStorageServiceError, } from '@daffodil/core';
|
|
8
|
+
import { DaffAuthLoginActionTypes, DaffAuthLoginSuccess, DaffAuthLoginFailure, DaffAuthLogoutSuccess, DaffAuthLogoutFailure, DaffAuthStorageFailure, DaffAuthComplete, DaffAuthServerSide, } from '../actions/public_api';
|
|
8
9
|
import * as i0 from "@angular/core";
|
|
9
10
|
import * as i1 from "@ngrx/effects";
|
|
10
11
|
import * as i2 from "@daffodil/auth";
|
|
@@ -15,12 +16,29 @@ export class DaffAuthLoginEffects {
|
|
|
15
16
|
this.errorMatcher = errorMatcher;
|
|
16
17
|
this.storage = storage;
|
|
17
18
|
this.login$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthLoginActionTypes.LoginAction), switchMap((action) => this.loginDriver.login(action.loginInfo).pipe(map((resp) => new DaffAuthLoginSuccess(resp)), catchError((error) => of(new DaffAuthLoginFailure(this.errorMatcher(error))))))));
|
|
18
|
-
this.logout$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthLoginActionTypes.LogoutAction), switchMap((action) => this.loginDriver.logout().pipe(map(() => new DaffAuthLogoutSuccess()),
|
|
19
|
+
this.logout$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthLoginActionTypes.LogoutAction), switchMap((action) => this.loginDriver.logout().pipe(map(() => new DaffAuthLogoutSuccess()), catchError((error) => of(new DaffAuthLogoutFailure(this.errorMatcher(error))))))));
|
|
20
|
+
this.removeAuthToken$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthLoginActionTypes.LogoutSuccessAction), tap(() => {
|
|
19
21
|
this.storage.removeAuthToken();
|
|
20
|
-
}),
|
|
22
|
+
}), switchMap(() => EMPTY), catchError((error) => {
|
|
23
|
+
switch (true) {
|
|
24
|
+
case error instanceof DaffServerSideStorageError:
|
|
25
|
+
return of(new DaffAuthServerSide(this.errorMatcher(error)));
|
|
26
|
+
case error instanceof DaffStorageServiceError:
|
|
27
|
+
default:
|
|
28
|
+
return of(new DaffAuthStorageFailure(this.errorMatcher(error)));
|
|
29
|
+
}
|
|
30
|
+
})));
|
|
21
31
|
this.storeAuthToken$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthLoginActionTypes.LoginSuccessAction), tap((action) => {
|
|
22
32
|
this.storage.setAuthToken(action.auth.token);
|
|
23
|
-
}), map(() => new DaffAuthComplete()), catchError((error) =>
|
|
33
|
+
}), map(() => new DaffAuthComplete()), catchError((error) => {
|
|
34
|
+
switch (true) {
|
|
35
|
+
case error instanceof DaffServerSideStorageError:
|
|
36
|
+
return of(new DaffAuthServerSide(this.errorMatcher(error)));
|
|
37
|
+
case error instanceof DaffStorageServiceError:
|
|
38
|
+
default:
|
|
39
|
+
return of(new DaffAuthStorageFailure(this.errorMatcher(error)));
|
|
40
|
+
}
|
|
41
|
+
})));
|
|
24
42
|
}
|
|
25
43
|
}
|
|
26
44
|
/** @nocollapse */ DaffAuthLoginEffects.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthLoginEffects, deps: [{ token: i1.Actions }, { token: DaffLoginDriver }, { token: DAFF_AUTH_ERROR_MATCHER }, { token: i2.DaffAuthStorageService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -34,4 +52,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
34
52
|
type: Inject,
|
|
35
53
|
args: [DAFF_AUTH_ERROR_MATCHER]
|
|
36
54
|
}] }, { type: i2.DaffAuthStorageService }]; } });
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"login.effects.js","sourceRoot":"","sources":["../../../../../libs/auth/state/src/effects/login.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  Observable,\n  EMPTY,\n} from 'rxjs';\nimport {\n  switchMap,\n  map,\n  catchError,\n  tap,\n} from 'rxjs/operators';\n\nimport {\n  DaffLoginInfo,\n  DaffAuthToken,\n  DAFF_AUTH_ERROR_MATCHER,\n  DaffAuthStorageService,\n} from '@daffodil/auth';\nimport {\n  DaffLoginDriver,\n  DaffLoginServiceInterface,\n} from '@daffodil/auth/driver';\nimport {\n  DaffError,\n  DaffServerSideStorageError,\n  DaffStorageServiceError,\n} from '@daffodil/core';\nimport { ErrorTransformer } from '@daffodil/core/state';\n\nimport {\n  DaffAuthLoginActionTypes,\n  DaffAuthLogin,\n  DaffAuthLoginSuccess,\n  DaffAuthLoginFailure,\n  DaffAuthLogoutSuccess,\n  DaffAuthLogoutFailure,\n  DaffAuthLogout,\n  DaffAuthStorageFailure,\n  DaffAuthComplete,\n  DaffAuthServerSide,\n} from '../actions/public_api';\n\n@Injectable()\nexport class DaffAuthLoginEffects<\n  T extends DaffLoginInfo = DaffLoginInfo,\n  U extends DaffAuthToken = DaffAuthToken,\n> {\n  constructor(\n    private actions$: Actions,\n    @Inject(DaffLoginDriver) private loginDriver: DaffLoginServiceInterface<T, U>,\n    @Inject(DAFF_AUTH_ERROR_MATCHER) private errorMatcher: ErrorTransformer,\n    private storage: DaffAuthStorageService,\n  ) {}\n\n  login$ = createEffect(() => this.actions$.pipe(\n    ofType(DaffAuthLoginActionTypes.LoginAction),\n    switchMap((action: DaffAuthLogin<T>) =>\n      this.loginDriver.login(action.loginInfo).pipe(\n        map((resp) =>\n          new DaffAuthLoginSuccess<U>(resp),\n        ),\n        catchError((error: DaffError) =>\n          of(new DaffAuthLoginFailure(this.errorMatcher(error))),\n        ),\n      ),\n    ),\n  ));\n\n  logout$ = createEffect(() => this.actions$.pipe(\n    ofType(DaffAuthLoginActionTypes.LogoutAction),\n    switchMap((action: DaffAuthLogout) =>\n      this.loginDriver.logout().pipe(\n        map(() => new DaffAuthLogoutSuccess()),\n        catchError((error: DaffError) =>\n          of(new DaffAuthLogoutFailure(this.errorMatcher(error))),\n        ),\n      ),\n    ),\n  ));\n\n  removeAuthToken$ = createEffect(() => this.actions$.pipe(\n    ofType<DaffAuthLogoutSuccess>(\n      DaffAuthLoginActionTypes.LogoutSuccessAction,\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  ));\n\n  storeAuthToken$ = createEffect(() => this.actions$.pipe(\n    ofType(DaffAuthLoginActionTypes.LoginSuccessAction),\n    tap((action: DaffAuthLoginSuccess<U>) => {\n      this.storage.setAuthToken(action.auth.token);\n    }),\n    map(() => new DaffAuthComplete()),\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  ));\n}\n"]}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { Inject, Injectable, } from '@angular/core';
|
|
2
|
+
import { Router } from '@angular/router';
|
|
3
|
+
import { Actions, createEffect, ofType, } from '@ngrx/effects';
|
|
4
|
+
import { EMPTY } from 'rxjs';
|
|
5
|
+
import { switchMap, tap, } from 'rxjs/operators';
|
|
6
|
+
import { DaffAuthActionTypes, DaffAuthLoginActionTypes, } from '../actions/public_api';
|
|
7
|
+
import { DAFF_AUTH_STATE_CONFIG, } from '../config/public_api';
|
|
8
|
+
import * as i0 from "@angular/core";
|
|
9
|
+
import * as i1 from "@ngrx/effects";
|
|
10
|
+
import * as i2 from "@angular/router";
|
|
11
|
+
/**
|
|
12
|
+
* Redirects the user to certain pages based on certain auth actions.
|
|
13
|
+
*/
|
|
14
|
+
export class DaffAuthRedirectEffects {
|
|
15
|
+
constructor(actions$, router, config) {
|
|
16
|
+
this.actions$ = actions$;
|
|
17
|
+
this.router = router;
|
|
18
|
+
this.config = config;
|
|
19
|
+
this.redirectAfterLoginOrRegister$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthActionTypes.AuthCompleteAction), tap(() => {
|
|
20
|
+
this.router.navigateByUrl(this.config.authCompleteRedirectPath);
|
|
21
|
+
}), switchMap(() => EMPTY)), { dispatch: false });
|
|
22
|
+
this.redirectAfterLogout$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthLoginActionTypes.LogoutSuccessAction), tap(() => {
|
|
23
|
+
this.router.navigateByUrl(this.config.logoutRedirectPath);
|
|
24
|
+
}), switchMap(() => EMPTY)), { dispatch: false });
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
/** @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: DAFF_AUTH_STATE_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
28
|
+
/** @nocollapse */ DaffAuthRedirectEffects.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRedirectEffects });
|
|
29
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRedirectEffects, decorators: [{
|
|
30
|
+
type: Injectable
|
|
31
|
+
}], ctorParameters: function () { return [{ type: i1.Actions }, { type: i2.Router }, { type: undefined, decorators: [{
|
|
32
|
+
type: Inject,
|
|
33
|
+
args: [DAFF_AUTH_STATE_CONFIG]
|
|
34
|
+
}] }]; } });
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXJlY3QuZWZmZWN0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9zdGF0ZS9zcmMvZWZmZWN0cy9yZWRpcmVjdC5lZmZlY3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxNQUFNLEVBQ04sVUFBVSxHQUNYLE1BQU0sZUFBZSxDQUFDO0FBQ3ZCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QyxPQUFPLEVBQ0wsT0FBTyxFQUNQLFlBQVksRUFDWixNQUFNLEdBQ1AsTUFBTSxlQUFlLENBQUM7QUFDdkIsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEVBQ0wsU0FBUyxFQUNULEdBQUcsR0FDSixNQUFNLGdCQUFnQixDQUFDO0FBRXhCLE9BQU8sRUFDTCxtQkFBbUIsRUFFbkIsd0JBQXdCLEdBQ3pCLE1BQU0sdUJBQXVCLENBQUM7QUFDL0IsT0FBTyxFQUVMLHNCQUFzQixHQUN2QixNQUFNLHNCQUFzQixDQUFDOzs7O0FBRTlCOztHQUVHO0FBRUgsTUFBTSxPQUFPLHVCQUF1QjtJQUNsQyxZQUNVLFFBQWlCLEVBQ2pCLE1BQWMsRUFDa0IsTUFBMkI7UUFGM0QsYUFBUSxHQUFSLFFBQVEsQ0FBUztRQUNqQixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2tCLFdBQU0sR0FBTixNQUFNLENBQXFCO1FBR3JFLGtDQUE2QixHQUFHLFlBQVksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FDbkUsTUFBTSxDQUFtQixtQkFBbUIsQ0FBQyxrQkFBa0IsQ0FBQyxFQUNoRSxHQUFHLENBQUMsR0FBRyxFQUFFO1lBQ1AsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO1FBQ2xFLENBQUMsQ0FBQyxFQUNGLFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FDdkIsRUFBRSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBRXhCLHlCQUFvQixHQUFHLFlBQVksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FDMUQsTUFBTSxDQUFDLHdCQUF3QixDQUFDLG1CQUFtQixDQUFDLEVBQ3BELEdBQUcsQ0FBQyxHQUFHLEVBQUU7WUFDUCxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUM7UUFDNUQsQ0FBQyxDQUFDLEVBQ0YsU0FBUyxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUN2QixFQUFFLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFoQnJCLENBQUM7O3VJQUxPLHVCQUF1QiwrREFJeEIsc0JBQXNCOzJJQUpyQix1QkFBdUI7MkZBQXZCLHVCQUF1QjtrQkFEbkMsVUFBVTs7MEJBS04sTUFBTTsyQkFBQyxzQkFBc0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBJbmplY3QsXG4gIEluamVjdGFibGUsXG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgUm91dGVyIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7XG4gIEFjdGlvbnMsXG4gIGNyZWF0ZUVmZmVjdCxcbiAgb2ZUeXBlLFxufSBmcm9tICdAbmdyeC9lZmZlY3RzJztcbmltcG9ydCB7IEVNUFRZIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQge1xuICBzd2l0Y2hNYXAsXG4gIHRhcCxcbn0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG5pbXBvcnQge1xuICBEYWZmQXV0aEFjdGlvblR5cGVzLFxuICBEYWZmQXV0aENvbXBsZXRlLFxuICBEYWZmQXV0aExvZ2luQWN0aW9uVHlwZXMsXG59IGZyb20gJy4uL2FjdGlvbnMvcHVibGljX2FwaSc7XG5pbXBvcnQge1xuICBEYWZmQXV0aFN0YXRlQ29uZmlnLFxuICBEQUZGX0FVVEhfU1RBVEVfQ09ORklHLFxufSBmcm9tICcuLi9jb25maWcvcHVibGljX2FwaSc7XG5cbi8qKlxuICogUmVkaXJlY3RzIHRoZSB1c2VyIHRvIGNlcnRhaW4gcGFnZXMgYmFzZWQgb24gY2VydGFpbiBhdXRoIGFjdGlvbnMuXG4gKi9cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBEYWZmQXV0aFJlZGlyZWN0RWZmZWN0cyB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgYWN0aW9ucyQ6IEFjdGlvbnMsXG4gICAgcHJpdmF0ZSByb3V0ZXI6IFJvdXRlcixcbiAgICBASW5qZWN0KERBRkZfQVVUSF9TVEFURV9DT05GSUcpIHByaXZhdGUgY29uZmlnOiBEYWZmQXV0aFN0YXRlQ29uZmlnLFxuICApIHt9XG5cbiAgcmVkaXJlY3RBZnRlckxvZ2luT3JSZWdpc3RlciQgPSBjcmVhdGVFZmZlY3QoKCkgPT4gdGhpcy5hY3Rpb25zJC5waXBlKFxuICAgIG9mVHlwZTxEYWZmQXV0aENvbXBsZXRlPihEYWZmQXV0aEFjdGlvblR5cGVzLkF1dGhDb21wbGV0ZUFjdGlvbiksXG4gICAgdGFwKCgpID0+IHtcbiAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlQnlVcmwodGhpcy5jb25maWcuYXV0aENvbXBsZXRlUmVkaXJlY3RQYXRoKTtcbiAgICB9KSxcbiAgICBzd2l0Y2hNYXAoKCkgPT4gRU1QVFkpLFxuICApLCB7IGRpc3BhdGNoOiBmYWxzZSB9KTtcblxuICByZWRpcmVjdEFmdGVyTG9nb3V0JCA9IGNyZWF0ZUVmZmVjdCgoKSA9PiB0aGlzLmFjdGlvbnMkLnBpcGUoXG4gICAgb2ZUeXBlKERhZmZBdXRoTG9naW5BY3Rpb25UeXBlcy5Mb2dvdXRTdWNjZXNzQWN0aW9uKSxcbiAgICB0YXAoKCkgPT4ge1xuICAgICAgdGhpcy5yb3V0ZXIubmF2aWdhdGVCeVVybCh0aGlzLmNvbmZpZy5sb2dvdXRSZWRpcmVjdFBhdGgpO1xuICAgIH0pLFxuICAgIHN3aXRjaE1hcCgoKSA9PiBFTVBUWSksXG4gICksIHsgZGlzcGF0Y2g6IGZhbHNlIH0pO1xufVxuIl19
|
|
@@ -4,7 +4,8 @@ import { of, iif, defer, } from 'rxjs';
|
|
|
4
4
|
import { switchMap, map, catchError, tap, } from 'rxjs/operators';
|
|
5
5
|
import { DaffAuthStorageService, DAFF_AUTH_ERROR_MATCHER, } from '@daffodil/auth';
|
|
6
6
|
import { DaffRegisterDriver, } from '@daffodil/auth/driver';
|
|
7
|
-
import {
|
|
7
|
+
import { DaffServerSideStorageError, DaffStorageServiceError, } from '@daffodil/core';
|
|
8
|
+
import { DaffAuthRegisterActionTypes, DaffAuthRegisterSuccess, DaffAuthRegisterFailure, DaffAuthComplete, DaffAuthServerSide, DaffAuthStorageFailure, } from '../actions/public_api';
|
|
8
9
|
import * as i0 from "@angular/core";
|
|
9
10
|
import * as i1 from "@ngrx/effects";
|
|
10
11
|
import * as i2 from "@daffodil/auth";
|
|
@@ -14,7 +15,16 @@ export class DaffAuthRegisterEffects {
|
|
|
14
15
|
this.registerDriver = registerDriver;
|
|
15
16
|
this.errorMatcher = errorMatcher;
|
|
16
17
|
this.storage = storage;
|
|
17
|
-
this.register$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthRegisterActionTypes.RegisterAction), switchMap((action) => iif(() => action.autoLogin, defer(() => this.registerDriver.register(action.registration).pipe(tap(token => this.storage.setAuthToken(token)), switchMap(() => of(new DaffAuthRegisterSuccess(), new DaffAuthComplete())))), defer(() => this.registerDriver.registerOnly(action.registration).pipe(map(() => new DaffAuthRegisterSuccess())))).pipe(catchError((error) =>
|
|
18
|
+
this.register$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthRegisterActionTypes.RegisterAction), switchMap((action) => iif(() => action.autoLogin, defer(() => this.registerDriver.register(action.registration).pipe(tap(token => this.storage.setAuthToken(token)), switchMap(() => of(new DaffAuthRegisterSuccess(), new DaffAuthComplete())))), defer(() => this.registerDriver.registerOnly(action.registration).pipe(map(() => new DaffAuthRegisterSuccess())))).pipe(catchError((error) => {
|
|
19
|
+
switch (true) {
|
|
20
|
+
case error instanceof DaffServerSideStorageError:
|
|
21
|
+
return of(new DaffAuthServerSide(this.errorMatcher(error)), new DaffAuthRegisterFailure(this.errorMatcher(error)));
|
|
22
|
+
case error instanceof DaffStorageServiceError:
|
|
23
|
+
return of(new DaffAuthStorageFailure(this.errorMatcher(error)), new DaffAuthRegisterFailure(this.errorMatcher(error)));
|
|
24
|
+
default:
|
|
25
|
+
return of(new DaffAuthRegisterFailure(this.errorMatcher(error)));
|
|
26
|
+
}
|
|
27
|
+
})))));
|
|
18
28
|
}
|
|
19
29
|
}
|
|
20
30
|
/** @nocollapse */ DaffAuthRegisterEffects.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthRegisterEffects, deps: [{ token: i1.Actions }, { token: DaffRegisterDriver }, { token: DAFF_AUTH_ERROR_MATCHER }, { token: i2.DaffAuthStorageService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -28,4 +38,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
28
38
|
type: Inject,
|
|
29
39
|
args: [DAFF_AUTH_ERROR_MATCHER]
|
|
30
40
|
}] }, { type: i2.DaffAuthStorageService }]; } });
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVnaXN0ZXIuZWZmZWN0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9zdGF0ZS9zcmMvZWZmZWN0cy9yZWdpc3Rlci5lZmZlY3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxVQUFVLEVBQ1YsTUFBTSxHQUNQLE1BQU0sZUFBZSxDQUFDO0FBQ3ZCLE9BQU8sRUFDTCxPQUFPLEVBQ1AsWUFBWSxFQUNaLE1BQU0sR0FDUCxNQUFNLGVBQWUsQ0FBQztBQUN2QixPQUFPLEVBQ0wsRUFBRSxFQUVGLEdBQUcsRUFDSCxLQUFLLEdBQ04sTUFBTSxNQUFNLENBQUM7QUFDZCxPQUFPLEVBQ0wsU0FBUyxFQUNULEdBQUcsRUFDSCxVQUFVLEVBQ1YsR0FBRyxHQUNKLE1BQU0sZ0JBQWdCLENBQUM7QUFFeEIsT0FBTyxFQUVMLHNCQUFzQixFQUN0Qix1QkFBdUIsR0FDeEIsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QixPQUFPLEVBQ0wsa0JBQWtCLEdBRW5CLE1BQU0sdUJBQXVCLENBQUM7QUFDL0IsT0FBTyxFQUVMLDBCQUEwQixFQUMxQix1QkFBdUIsR0FDeEIsTUFBTSxnQkFBZ0IsQ0FBQztBQUd4QixPQUFPLEVBQ0wsMkJBQTJCLEVBRTNCLHVCQUF1QixFQUN2Qix1QkFBdUIsRUFDdkIsZ0JBQWdCLEVBQ2hCLGtCQUFrQixFQUNsQixzQkFBc0IsR0FDdkIsTUFBTSx1QkFBdUIsQ0FBQzs7OztBQUcvQixNQUFNLE9BQU8sdUJBQXVCO0lBR2xDLFlBQ1UsUUFBaUIsRUFDVyxjQUErQyxFQUMxQyxZQUE4QixFQUMvRCxPQUErQjtRQUgvQixhQUFRLEdBQVIsUUFBUSxDQUFTO1FBQ1csbUJBQWMsR0FBZCxjQUFjLENBQWlDO1FBQzFDLGlCQUFZLEdBQVosWUFBWSxDQUFrQjtRQUMvRCxZQUFPLEdBQVAsT0FBTyxDQUF3QjtRQUd6QyxjQUFTLEdBQW9CLFlBQVksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FDaEUsTUFBTSxDQUFDLDJCQUEyQixDQUFDLGNBQWMsQ0FBQyxFQUNsRCxTQUFTLENBQUMsQ0FBQyxNQUEyQixFQUFFLEVBQUUsQ0FDeEMsR0FBRyxDQUNELEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQ3RCLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUMsSUFBSSxDQUNoRSxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUM5QyxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsRUFBRSxDQUFDLElBQUksdUJBQXVCLEVBQUUsRUFBRSxJQUFJLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUMzRSxDQUFDLEVBQ0YsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQyxJQUFJLENBQ3BFLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLHVCQUF1QixFQUFFLENBQUMsQ0FDekMsQ0FBQyxDQUNILENBQUMsSUFBSSxDQUNKLFVBQVUsQ0FBQyxDQUFDLEtBQWdCLEVBQUUsRUFBRTtZQUM5QixRQUFRLElBQUksRUFBRTtnQkFDWixLQUFLLEtBQUssWUFBWSwwQkFBMEI7b0JBQzlDLE9BQU8sRUFBRSxDQUNQLElBQUksa0JBQWtCLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUNoRCxJQUFJLHVCQUF1QixDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FDdEQsQ0FBQztnQkFFSixLQUFLLEtBQUssWUFBWSx1QkFBdUI7b0JBQzNDLE9BQU8sRUFBRSxDQUNQLElBQUksc0JBQXNCLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUNwRCxJQUFJLHVCQUF1QixDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FDdEQsQ0FBQztnQkFFSjtvQkFDRSxPQUFPLEVBQUUsQ0FBQyxJQUFJLHVCQUF1QixDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ3BFO1FBQ0gsQ0FBQyxDQUFDLENBQ0gsQ0FDRixDQUNGLENBQUMsQ0FBQztJQW5DQSxDQUFDOzt1SUFSTyx1QkFBdUIseUNBS3hCLGtCQUFrQixhQUNsQix1QkFBdUI7MklBTnRCLHVCQUF1QjsyRkFBdkIsdUJBQXVCO2tCQURuQyxVQUFVOzswQkFNTixNQUFNOzJCQUFDLGtCQUFrQjs7MEJBQ3pCLE1BQU07MkJBQUMsdUJBQXVCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgSW5qZWN0YWJsZSxcbiAgSW5qZWN0LFxufSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7XG4gIEFjdGlvbnMsXG4gIGNyZWF0ZUVmZmVjdCxcbiAgb2ZUeXBlLFxufSBmcm9tICdAbmdyeC9lZmZlY3RzJztcbmltcG9ydCB7XG4gIG9mLFxuICBPYnNlcnZhYmxlLFxuICBpaWYsXG4gIGRlZmVyLFxufSBmcm9tICdyeGpzJztcbmltcG9ydCB7XG4gIHN3aXRjaE1hcCxcbiAgbWFwLFxuICBjYXRjaEVycm9yLFxuICB0YXAsXG59IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcblxuaW1wb3J0IHtcbiAgRGFmZkFjY291bnRSZWdpc3RyYXRpb24sXG4gIERhZmZBdXRoU3RvcmFnZVNlcnZpY2UsXG4gIERBRkZfQVVUSF9FUlJPUl9NQVRDSEVSLFxufSBmcm9tICdAZGFmZm9kaWwvYXV0aCc7XG5pbXBvcnQge1xuICBEYWZmUmVnaXN0ZXJEcml2ZXIsXG4gIERhZmZSZWdpc3RlclNlcnZpY2VJbnRlcmZhY2UsXG59IGZyb20gJ0BkYWZmb2RpbC9hdXRoL2RyaXZlcic7XG5pbXBvcnQge1xuICBEYWZmRXJyb3IsXG4gIERhZmZTZXJ2ZXJTaWRlU3RvcmFnZUVycm9yLFxuICBEYWZmU3RvcmFnZVNlcnZpY2VFcnJvcixcbn0gZnJvbSAnQGRhZmZvZGlsL2NvcmUnO1xuaW1wb3J0IHsgRXJyb3JUcmFuc2Zvcm1lciB9IGZyb20gJ0BkYWZmb2RpbC9jb3JlL3N0YXRlJztcblxuaW1wb3J0IHtcbiAgRGFmZkF1dGhSZWdpc3RlckFjdGlvblR5cGVzLFxuICBEYWZmQXV0aFJlZ2lzdGVyLFxuICBEYWZmQXV0aFJlZ2lzdGVyU3VjY2VzcyxcbiAgRGFmZkF1dGhSZWdpc3RlckZhaWx1cmUsXG4gIERhZmZBdXRoQ29tcGxldGUsXG4gIERhZmZBdXRoU2VydmVyU2lkZSxcbiAgRGFmZkF1dGhTdG9yYWdlRmFpbHVyZSxcbn0gZnJvbSAnLi4vYWN0aW9ucy9wdWJsaWNfYXBpJztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIERhZmZBdXRoUmVnaXN0ZXJFZmZlY3RzPFxuICBUIGV4dGVuZHMgRGFmZkFjY291bnRSZWdpc3RyYXRpb24gPSBEYWZmQWNjb3VudFJlZ2lzdHJhdGlvbixcbj4ge1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGFjdGlvbnMkOiBBY3Rpb25zLFxuICAgIEBJbmplY3QoRGFmZlJlZ2lzdGVyRHJpdmVyKSBwcml2YXRlIHJlZ2lzdGVyRHJpdmVyOiBEYWZmUmVnaXN0ZXJTZXJ2aWNlSW50ZXJmYWNlPFQ+LFxuICAgIEBJbmplY3QoREFGRl9BVVRIX0VSUk9SX01BVENIRVIpIHByaXZhdGUgZXJyb3JNYXRjaGVyOiBFcnJvclRyYW5zZm9ybWVyLFxuICAgIHByaXZhdGUgc3RvcmFnZTogRGFmZkF1dGhTdG9yYWdlU2VydmljZSxcbiAgKSB7fVxuXG4gIHJlZ2lzdGVyJDogT2JzZXJ2YWJsZTxhbnk+ID0gY3JlYXRlRWZmZWN0KCgpID0+IHRoaXMuYWN0aW9ucyQucGlwZShcbiAgICBvZlR5cGUoRGFmZkF1dGhSZWdpc3RlckFjdGlvblR5cGVzLlJlZ2lzdGVyQWN0aW9uKSxcbiAgICBzd2l0Y2hNYXAoKGFjdGlvbjogRGFmZkF1dGhSZWdpc3RlcjxUPikgPT5cbiAgICAgIGlpZihcbiAgICAgICAgKCkgPT4gYWN0aW9uLmF1dG9Mb2dpbixcbiAgICAgICAgZGVmZXIoKCkgPT4gdGhpcy5yZWdpc3RlckRyaXZlci5yZWdpc3RlcihhY3Rpb24ucmVnaXN0cmF0aW9uKS5waXBlKFxuICAgICAgICAgIHRhcCh0b2tlbiA9PiB0aGlzLnN0b3JhZ2Uuc2V0QXV0aFRva2VuKHRva2VuKSksXG4gICAgICAgICAgc3dpdGNoTWFwKCgpID0+IG9mKG5ldyBEYWZmQXV0aFJlZ2lzdGVyU3VjY2VzcygpLCBuZXcgRGFmZkF1dGhDb21wbGV0ZSgpKSksXG4gICAgICAgICkpLFxuICAgICAgICBkZWZlcigoKSA9PiB0aGlzLnJlZ2lzdGVyRHJpdmVyLnJlZ2lzdGVyT25seShhY3Rpb24ucmVnaXN0cmF0aW9uKS5waXBlKFxuICAgICAgICAgIG1hcCgoKSA9PiBuZXcgRGFmZkF1dGhSZWdpc3RlclN1Y2Nlc3MoKSksXG4gICAgICAgICkpLFxuICAgICAgKS5waXBlKFxuICAgICAgICBjYXRjaEVycm9yKChlcnJvcjogRGFmZkVycm9yKSA9PiB7XG4gICAgICAgICAgc3dpdGNoICh0cnVlKSB7XG4gICAgICAgICAgICBjYXNlIGVycm9yIGluc3RhbmNlb2YgRGFmZlNlcnZlclNpZGVTdG9yYWdlRXJyb3I6XG4gICAgICAgICAgICAgIHJldHVybiBvZihcbiAgICAgICAgICAgICAgICBuZXcgRGFmZkF1dGhTZXJ2ZXJTaWRlKHRoaXMuZXJyb3JNYXRjaGVyKGVycm9yKSksXG4gICAgICAgICAgICAgICAgbmV3IERhZmZBdXRoUmVnaXN0ZXJGYWlsdXJlKHRoaXMuZXJyb3JNYXRjaGVyKGVycm9yKSksXG4gICAgICAgICAgICAgICk7XG5cbiAgICAgICAgICAgIGNhc2UgZXJyb3IgaW5zdGFuY2VvZiBEYWZmU3RvcmFnZVNlcnZpY2VFcnJvcjpcbiAgICAgICAgICAgICAgcmV0dXJuIG9mKFxuICAgICAgICAgICAgICAgIG5ldyBEYWZmQXV0aFN0b3JhZ2VGYWlsdXJlKHRoaXMuZXJyb3JNYXRjaGVyKGVycm9yKSksXG4gICAgICAgICAgICAgICAgbmV3IERhZmZBdXRoUmVnaXN0ZXJGYWlsdXJlKHRoaXMuZXJyb3JNYXRjaGVyKGVycm9yKSksXG4gICAgICAgICAgICAgICk7XG5cbiAgICAgICAgICAgIGRlZmF1bHQ6XG4gICAgICAgICAgICAgIHJldHVybiBvZihuZXcgRGFmZkF1dGhSZWdpc3RlckZhaWx1cmUodGhpcy5lcnJvck1hdGNoZXIoZXJyb3IpKSk7XG4gICAgICAgICAgfVxuICAgICAgICB9KSxcbiAgICAgICksXG4gICAgKSxcbiAgKSk7XG59XG4iXX0=
|
|
@@ -4,7 +4,8 @@ import { of, iif, defer, } from 'rxjs';
|
|
|
4
4
|
import { switchMap, map, catchError, tap, } from 'rxjs/operators';
|
|
5
5
|
import { DAFF_AUTH_ERROR_MATCHER, DaffAuthStorageService, } from '@daffodil/auth';
|
|
6
6
|
import { DaffResetPasswordDriver, } from '@daffodil/auth/driver';
|
|
7
|
-
import {
|
|
7
|
+
import { DaffServerSideStorageError, DaffStorageServiceError, } from '@daffodil/core';
|
|
8
|
+
import { DaffAuthResetPasswordActionTypes, DaffResetPasswordSuccess, DaffResetPasswordFailure, DaffSendResetEmailSuccess, DaffSendResetEmailFailure, DaffAuthComplete, DaffAuthServerSide, DaffAuthStorageFailure, } from '../actions/public_api';
|
|
8
9
|
import * as i0 from "@angular/core";
|
|
9
10
|
import * as i1 from "@ngrx/effects";
|
|
10
11
|
import * as i2 from "@daffodil/auth";
|
|
@@ -15,7 +16,16 @@ export class DaffAuthResetPasswordEffects {
|
|
|
15
16
|
this.errorMatcher = errorMatcher;
|
|
16
17
|
this.storage = storage;
|
|
17
18
|
this.sendResetEmail$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthResetPasswordActionTypes.SendResetEmailAction), switchMap((action) => this.driver.sendResetEmail(action.email).pipe(map(() => new DaffSendResetEmailSuccess()), catchError((error) => of(new DaffSendResetEmailFailure(this.errorMatcher(error))))))));
|
|
18
|
-
this.resetPassword$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthResetPasswordActionTypes.ResetPasswordAction), switchMap((action) => iif(() => action.autoLogin, defer(() => this.driver.resetPassword(action.info).pipe(tap(token => this.storage.setAuthToken(token)), switchMap(() => of(new DaffResetPasswordSuccess(), new DaffAuthComplete())))), defer(() => this.driver.resetPasswordOnly(action.info).pipe(map(() => new DaffResetPasswordSuccess())))).pipe(catchError((error) =>
|
|
19
|
+
this.resetPassword$ = createEffect(() => this.actions$.pipe(ofType(DaffAuthResetPasswordActionTypes.ResetPasswordAction), switchMap((action) => iif(() => action.autoLogin, defer(() => this.driver.resetPassword(action.info).pipe(tap(token => this.storage.setAuthToken(token)), switchMap(() => of(new DaffResetPasswordSuccess(), new DaffAuthComplete())))), defer(() => this.driver.resetPasswordOnly(action.info).pipe(map(() => new DaffResetPasswordSuccess())))).pipe(catchError((error) => {
|
|
20
|
+
switch (true) {
|
|
21
|
+
case error instanceof DaffServerSideStorageError:
|
|
22
|
+
return of(new DaffAuthServerSide(this.errorMatcher(error)), new DaffResetPasswordFailure(this.errorMatcher(error)));
|
|
23
|
+
case error instanceof DaffStorageServiceError:
|
|
24
|
+
return of(new DaffAuthStorageFailure(this.errorMatcher(error)), new DaffResetPasswordFailure(this.errorMatcher(error)));
|
|
25
|
+
default:
|
|
26
|
+
return of(new DaffResetPasswordFailure(this.errorMatcher(error)));
|
|
27
|
+
}
|
|
28
|
+
})))));
|
|
19
29
|
}
|
|
20
30
|
}
|
|
21
31
|
/** @nocollapse */ DaffAuthResetPasswordEffects.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffAuthResetPasswordEffects, deps: [{ token: i1.Actions }, { token: DaffResetPasswordDriver }, { token: DAFF_AUTH_ERROR_MATCHER }, { token: i2.DaffAuthStorageService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -29,4 +39,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
|
|
|
29
39
|
type: Inject,
|
|
30
40
|
args: [DAFF_AUTH_ERROR_MATCHER]
|
|
31
41
|
}] }, { type: i2.DaffAuthStorageService }]; } });
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzZXQtcGFzc3dvcmQuZWZmZWN0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYnMvYXV0aC9zdGF0ZS9zcmMvZWZmZWN0cy9yZXNldC1wYXNzd29yZC5lZmZlY3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxVQUFVLEVBQ1YsTUFBTSxHQUNQLE1BQU0sZUFBZSxDQUFDO0FBQ3ZCLE9BQU8sRUFDTCxPQUFPLEVBQ1AsWUFBWSxFQUNaLE1BQU0sR0FDUCxNQUFNLGVBQWUsQ0FBQztBQUN2QixPQUFPLEVBQ0wsRUFBRSxFQUVGLEdBQUcsRUFDSCxLQUFLLEdBQ04sTUFBTSxNQUFNLENBQUM7QUFDZCxPQUFPLEVBQ0wsU0FBUyxFQUNULEdBQUcsRUFDSCxVQUFVLEVBQ1YsR0FBRyxHQUNKLE1BQU0sZ0JBQWdCLENBQUM7QUFFeEIsT0FBTyxFQUNMLHVCQUF1QixFQUV2QixzQkFBc0IsR0FDdkIsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QixPQUFPLEVBQ0wsdUJBQXVCLEdBRXhCLE1BQU0sdUJBQXVCLENBQUM7QUFDL0IsT0FBTyxFQUVMLDBCQUEwQixFQUMxQix1QkFBdUIsR0FDeEIsTUFBTSxnQkFBZ0IsQ0FBQztBQUd4QixPQUFPLEVBQ0wsZ0NBQWdDLEVBRWhDLHdCQUF3QixFQUN4Qix3QkFBd0IsRUFFeEIseUJBQXlCLEVBQ3pCLHlCQUF5QixFQUN6QixnQkFBZ0IsRUFDaEIsa0JBQWtCLEVBQ2xCLHNCQUFzQixHQUN2QixNQUFNLHVCQUF1QixDQUFDOzs7O0FBRy9CLE1BQU0sT0FBTyw0QkFBNEI7SUFHdkMsWUFDVSxRQUFpQixFQUNnQixNQUE0QyxFQUM1QyxZQUE4QixFQUMvRCxPQUErQjtRQUgvQixhQUFRLEdBQVIsUUFBUSxDQUFTO1FBQ2dCLFdBQU0sR0FBTixNQUFNLENBQXNDO1FBQzVDLGlCQUFZLEdBQVosWUFBWSxDQUFrQjtRQUMvRCxZQUFPLEdBQVAsT0FBTyxDQUF3QjtRQUd6QyxvQkFBZSxHQUFvQixZQUFZLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQ3RFLE1BQU0sQ0FBQyxnQ0FBZ0MsQ0FBQyxvQkFBb0IsQ0FBQyxFQUM3RCxTQUFTLENBQUMsQ0FBQyxNQUEwQixFQUFFLEVBQUUsQ0FDdkMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FDM0MsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUNQLElBQUkseUJBQXlCLEVBQUUsQ0FDaEMsRUFDRCxVQUFVLENBQUMsQ0FBQyxLQUFnQixFQUFFLEVBQUUsQ0FDOUIsRUFBRSxDQUFDLElBQUkseUJBQXlCLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQzVELENBQ0YsQ0FDRixDQUNGLENBQUMsQ0FBQztRQUVILG1CQUFjLEdBQUcsWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUNwRCxNQUFNLENBQUMsZ0NBQWdDLENBQUMsbUJBQW1CLENBQUMsRUFDNUQsU0FBUyxDQUFDLENBQUMsTUFBNEIsRUFBRSxFQUFFLENBQ3pDLEdBQUcsQ0FDRCxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUN0QixLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FDckQsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUMsRUFDOUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxJQUFJLHdCQUF3QixFQUFFLEVBQUUsSUFBSSxnQkFBZ0IsRUFBRSxDQUFDLENBQUMsQ0FDNUUsQ0FBQyxFQUNGLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQ3pELEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLHdCQUF3QixFQUFFLENBQUMsQ0FDMUMsQ0FBQyxDQUNILENBQUMsSUFBSSxDQUNKLFVBQVUsQ0FBQyxDQUFDLEtBQWdCLEVBQUUsRUFBRTtZQUM5QixRQUFRLElBQUksRUFBRTtnQkFDWixLQUFLLEtBQUssWUFBWSwwQkFBMEI7b0JBQzlDLE9BQU8sRUFBRSxDQUNQLElBQUksa0JBQWtCLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUNoRCxJQUFJLHdCQUF3QixDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FDdkQsQ0FBQztnQkFFSixLQUFLLEtBQUssWUFBWSx1QkFBdUI7b0JBQzNDLE9BQU8sRUFBRSxDQUNQLElBQUksc0JBQXNCLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUNwRCxJQUFJLHdCQUF3QixDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FDdkQsQ0FBQztnQkFFSjtvQkFDRSxPQUFPLEVBQUUsQ0FBQyxJQUFJLHdCQUF3QixDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ3JFO1FBQ0gsQ0FBQyxDQUFDLENBQ0gsQ0FDRixDQUNGLENBQUMsQ0FBQztJQWpEQSxDQUFDOzs0SUFSTyw0QkFBNEIseUNBSzdCLHVCQUF1QixhQUN2Qix1QkFBdUI7Z0pBTnRCLDRCQUE0QjsyRkFBNUIsNEJBQTRCO2tCQUR4QyxVQUFVOzswQkFNTixNQUFNOzJCQUFDLHVCQUF1Qjs7MEJBQzlCLE1BQU07MkJBQUMsdUJBQXVCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgSW5qZWN0YWJsZSxcbiAgSW5qZWN0LFxufSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7XG4gIEFjdGlvbnMsXG4gIGNyZWF0ZUVmZmVjdCxcbiAgb2ZUeXBlLFxufSBmcm9tICdAbmdyeC9lZmZlY3RzJztcbmltcG9ydCB7XG4gIG9mLFxuICBPYnNlcnZhYmxlLFxuICBpaWYsXG4gIGRlZmVyLFxufSBmcm9tICdyeGpzJztcbmltcG9ydCB7XG4gIHN3aXRjaE1hcCxcbiAgbWFwLFxuICBjYXRjaEVycm9yLFxuICB0YXAsXG59IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcblxuaW1wb3J0IHtcbiAgREFGRl9BVVRIX0VSUk9SX01BVENIRVIsXG4gIERhZmZBdXRoUmVzZXRQYXNzd29yZEluZm8sXG4gIERhZmZBdXRoU3RvcmFnZVNlcnZpY2UsXG59IGZyb20gJ0BkYWZmb2RpbC9hdXRoJztcbmltcG9ydCB7XG4gIERhZmZSZXNldFBhc3N3b3JkRHJpdmVyLFxuICBEYWZmUmVzZXRQYXNzd29yZFNlcnZpY2VJbnRlcmZhY2UsXG59IGZyb20gJ0BkYWZmb2RpbC9hdXRoL2RyaXZlcic7XG5pbXBvcnQge1xuICBEYWZmRXJyb3IsXG4gIERhZmZTZXJ2ZXJTaWRlU3RvcmFnZUVycm9yLFxuICBEYWZmU3RvcmFnZVNlcnZpY2VFcnJvcixcbn0gZnJvbSAnQGRhZmZvZGlsL2NvcmUnO1xuaW1wb3J0IHsgRXJyb3JUcmFuc2Zvcm1lciB9IGZyb20gJ0BkYWZmb2RpbC9jb3JlL3N0YXRlJztcblxuaW1wb3J0IHtcbiAgRGFmZkF1dGhSZXNldFBhc3N3b3JkQWN0aW9uVHlwZXMsXG4gIERhZmZSZXNldFBhc3N3b3JkLFxuICBEYWZmUmVzZXRQYXNzd29yZFN1Y2Nlc3MsXG4gIERhZmZSZXNldFBhc3N3b3JkRmFpbHVyZSxcbiAgRGFmZlNlbmRSZXNldEVtYWlsLFxuICBEYWZmU2VuZFJlc2V0RW1haWxTdWNjZXNzLFxuICBEYWZmU2VuZFJlc2V0RW1haWxGYWlsdXJlLFxuICBEYWZmQXV0aENvbXBsZXRlLFxuICBEYWZmQXV0aFNlcnZlclNpZGUsXG4gIERhZmZBdXRoU3RvcmFnZUZhaWx1cmUsXG59IGZyb20gJy4uL2FjdGlvbnMvcHVibGljX2FwaSc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBEYWZmQXV0aFJlc2V0UGFzc3dvcmRFZmZlY3RzPFxuICBUIGV4dGVuZHMgRGFmZkF1dGhSZXNldFBhc3N3b3JkSW5mbyA9IERhZmZBdXRoUmVzZXRQYXNzd29yZEluZm8sXG4+IHtcbiAgY29uc3RydWN0b3IoXG4gICAgcHJpdmF0ZSBhY3Rpb25zJDogQWN0aW9ucyxcbiAgICBASW5qZWN0KERhZmZSZXNldFBhc3N3b3JkRHJpdmVyKSBwcml2YXRlIGRyaXZlcjogRGFmZlJlc2V0UGFzc3dvcmRTZXJ2aWNlSW50ZXJmYWNlPFQ+LFxuICAgIEBJbmplY3QoREFGRl9BVVRIX0VSUk9SX01BVENIRVIpIHByaXZhdGUgZXJyb3JNYXRjaGVyOiBFcnJvclRyYW5zZm9ybWVyLFxuICAgIHByaXZhdGUgc3RvcmFnZTogRGFmZkF1dGhTdG9yYWdlU2VydmljZSxcbiAgKSB7fVxuXG4gIHNlbmRSZXNldEVtYWlsJDogT2JzZXJ2YWJsZTxhbnk+ID0gY3JlYXRlRWZmZWN0KCgpID0+IHRoaXMuYWN0aW9ucyQucGlwZShcbiAgICBvZlR5cGUoRGFmZkF1dGhSZXNldFBhc3N3b3JkQWN0aW9uVHlwZXMuU2VuZFJlc2V0RW1haWxBY3Rpb24pLFxuICAgIHN3aXRjaE1hcCgoYWN0aW9uOiBEYWZmU2VuZFJlc2V0RW1haWwpID0+XG4gICAgICB0aGlzLmRyaXZlci5zZW5kUmVzZXRFbWFpbChhY3Rpb24uZW1haWwpLnBpcGUoXG4gICAgICAgIG1hcCgoKSA9PlxuICAgICAgICAgIG5ldyBEYWZmU2VuZFJlc2V0RW1haWxTdWNjZXNzKCksXG4gICAgICAgICksXG4gICAgICAgIGNhdGNoRXJyb3IoKGVycm9yOiBEYWZmRXJyb3IpID0+XG4gICAgICAgICAgb2YobmV3IERhZmZTZW5kUmVzZXRFbWFpbEZhaWx1cmUodGhpcy5lcnJvck1hdGNoZXIoZXJyb3IpKSksXG4gICAgICAgICksXG4gICAgICApLFxuICAgICksXG4gICkpO1xuXG4gIHJlc2V0UGFzc3dvcmQkID0gY3JlYXRlRWZmZWN0KCgpID0+IHRoaXMuYWN0aW9ucyQucGlwZShcbiAgICBvZlR5cGUoRGFmZkF1dGhSZXNldFBhc3N3b3JkQWN0aW9uVHlwZXMuUmVzZXRQYXNzd29yZEFjdGlvbiksXG4gICAgc3dpdGNoTWFwKChhY3Rpb246IERhZmZSZXNldFBhc3N3b3JkPFQ+KSA9PlxuICAgICAgaWlmKFxuICAgICAgICAoKSA9PiBhY3Rpb24uYXV0b0xvZ2luLFxuICAgICAgICBkZWZlcigoKSA9PiB0aGlzLmRyaXZlci5yZXNldFBhc3N3b3JkKGFjdGlvbi5pbmZvKS5waXBlKFxuICAgICAgICAgIHRhcCh0b2tlbiA9PiB0aGlzLnN0b3JhZ2Uuc2V0QXV0aFRva2VuKHRva2VuKSksXG4gICAgICAgICAgc3dpdGNoTWFwKCgpID0+IG9mKG5ldyBEYWZmUmVzZXRQYXNzd29yZFN1Y2Nlc3MoKSwgbmV3IERhZmZBdXRoQ29tcGxldGUoKSkpLFxuICAgICAgICApKSxcbiAgICAgICAgZGVmZXIoKCkgPT4gdGhpcy5kcml2ZXIucmVzZXRQYXNzd29yZE9ubHkoYWN0aW9uLmluZm8pLnBpcGUoXG4gICAgICAgICAgbWFwKCgpID0+IG5ldyBEYWZmUmVzZXRQYXNzd29yZFN1Y2Nlc3MoKSksXG4gICAgICAgICkpLFxuICAgICAgKS5waXBlKFxuICAgICAgICBjYXRjaEVycm9yKChlcnJvcjogRGFmZkVycm9yKSA9PiB7XG4gICAgICAgICAgc3dpdGNoICh0cnVlKSB7XG4gICAgICAgICAgICBjYXNlIGVycm9yIGluc3RhbmNlb2YgRGFmZlNlcnZlclNpZGVTdG9yYWdlRXJyb3I6XG4gICAgICAgICAgICAgIHJldHVybiBvZihcbiAgICAgICAgICAgICAgICBuZXcgRGFmZkF1dGhTZXJ2ZXJTaWRlKHRoaXMuZXJyb3JNYXRjaGVyKGVycm9yKSksXG4gICAgICAgICAgICAgICAgbmV3IERhZmZSZXNldFBhc3N3b3JkRmFpbHVyZSh0aGlzLmVycm9yTWF0Y2hlcihlcnJvcikpLFxuICAgICAgICAgICAgICApO1xuXG4gICAgICAgICAgICBjYXNlIGVycm9yIGluc3RhbmNlb2YgRGFmZlN0b3JhZ2VTZXJ2aWNlRXJyb3I6XG4gICAgICAgICAgICAgIHJldHVybiBvZihcbiAgICAgICAgICAgICAgICBuZXcgRGFmZkF1dGhTdG9yYWdlRmFpbHVyZSh0aGlzLmVycm9yTWF0Y2hlcihlcnJvcikpLFxuICAgICAgICAgICAgICAgIG5ldyBEYWZmUmVzZXRQYXNzd29yZEZhaWx1cmUodGhpcy5lcnJvck1hdGNoZXIoZXJyb3IpKSxcbiAgICAgICAgICAgICAgKTtcblxuICAgICAgICAgICAgZGVmYXVsdDpcbiAgICAgICAgICAgICAgcmV0dXJuIG9mKG5ldyBEYWZmUmVzZXRQYXNzd29yZEZhaWx1cmUodGhpcy5lcnJvck1hdGNoZXIoZXJyb3IpKSk7XG4gICAgICAgICAgfVxuICAgICAgICB9KSxcbiAgICAgICksXG4gICAgKSxcbiAgKSk7XG59XG4iXX0=
|
|
@@ -14,6 +14,8 @@ export function daffAuthReducer(state = daffAuthInitialState, action) {
|
|
|
14
14
|
errors: [],
|
|
15
15
|
};
|
|
16
16
|
case DaffAuthActionTypes.AuthCheckFailureAction:
|
|
17
|
+
case DaffAuthActionTypes.AuthServerSideAction:
|
|
18
|
+
case DaffAuthActionTypes.AuthStorageFailureAction:
|
|
17
19
|
return {
|
|
18
20
|
...state,
|
|
19
21
|
loading: false,
|
|
@@ -23,4 +25,4 @@ export function daffAuthReducer(state = daffAuthInitialState, action) {
|
|
|
23
25
|
return state;
|
|
24
26
|
}
|
|
25
27
|
}
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5yZWR1Y2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vbGlicy9hdXRoL3N0YXRlL3NyYy9yZWR1Y2Vycy9hdXRoL2F1dGgucmVkdWNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsbUJBQW1CLEdBRXBCLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHNUQsTUFBTSxVQUFVLGVBQWUsQ0FDN0IsS0FBSyxHQUFHLG9CQUFvQixFQUM1QixNQUF1QjtJQUV2QixRQUFRLE1BQU0sQ0FBQyxJQUFJLEVBQUU7UUFDbkIsS0FBSyxtQkFBbUIsQ0FBQyxlQUFlO1lBQ3RDLE9BQU87Z0JBQ0wsR0FBRyxLQUFLO2dCQUNSLE9BQU8sRUFBRSxJQUFJO2FBQ2QsQ0FBQztRQUVKLEtBQUssbUJBQW1CLENBQUMsc0JBQXNCO1lBQzdDLE9BQU87Z0JBQ0wsR0FBRyxLQUFLO2dCQUNSLE9BQU8sRUFBRSxLQUFLO2dCQUNkLE1BQU0sRUFBRSxFQUFFO2FBQ1gsQ0FBQztRQUVKLEtBQUssbUJBQW1CLENBQUMsc0JBQXNCLENBQUM7UUFDaEQsS0FBSyxtQkFBbUIsQ0FBQyxvQkFBb0IsQ0FBQztRQUM5QyxLQUFLLG1CQUFtQixDQUFDLHdCQUF3QjtZQUMvQyxPQUFPO2dCQUNMLEdBQUcsS0FBSztnQkFDUixPQUFPLEVBQUUsS0FBSztnQkFDZCxNQUFNLEVBQUUsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDO2FBQzlCLENBQUM7UUFFSjtZQUNFLE9BQU8sS0FBSyxDQUFDO0tBQ2hCO0FBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIERhZmZBdXRoQWN0aW9uVHlwZXMsXG4gIERhZmZBdXRoQWN0aW9ucyxcbn0gZnJvbSAnLi4vLi4vYWN0aW9ucy9wdWJsaWNfYXBpJztcbmltcG9ydCB7IGRhZmZBdXRoSW5pdGlhbFN0YXRlIH0gZnJvbSAnLi9hdXRoLWluaXRpYWwtc3RhdGUnO1xuaW1wb3J0IHsgRGFmZkF1dGhSZWR1Y2VyU3RhdGUgfSBmcm9tICcuL2F1dGgtcmVkdWNlci1zdGF0ZS5pbnRlcmZhY2UnO1xuXG5leHBvcnQgZnVuY3Rpb24gZGFmZkF1dGhSZWR1Y2VyKFxuICBzdGF0ZSA9IGRhZmZBdXRoSW5pdGlhbFN0YXRlLFxuICBhY3Rpb246IERhZmZBdXRoQWN0aW9ucyxcbik6IERhZmZBdXRoUmVkdWNlclN0YXRlIHtcbiAgc3dpdGNoIChhY3Rpb24udHlwZSkge1xuICAgIGNhc2UgRGFmZkF1dGhBY3Rpb25UeXBlcy5BdXRoQ2hlY2tBY3Rpb246XG4gICAgICByZXR1cm4ge1xuICAgICAgICAuLi5zdGF0ZSxcbiAgICAgICAgbG9hZGluZzogdHJ1ZSxcbiAgICAgIH07XG5cbiAgICBjYXNlIERhZmZBdXRoQWN0aW9uVHlwZXMuQXV0aENoZWNrU3VjY2Vzc0FjdGlvbjpcbiAgICAgIHJldHVybiB7XG4gICAgICAgIC4uLnN0YXRlLFxuICAgICAgICBsb2FkaW5nOiBmYWxzZSxcbiAgICAgICAgZXJyb3JzOiBbXSxcbiAgICAgIH07XG5cbiAgICBjYXNlIERhZmZBdXRoQWN0aW9uVHlwZXMuQXV0aENoZWNrRmFpbHVyZUFjdGlvbjpcbiAgICBjYXNlIERhZmZBdXRoQWN0aW9uVHlwZXMuQXV0aFNlcnZlclNpZGVBY3Rpb246XG4gICAgY2FzZSBEYWZmQXV0aEFjdGlvblR5cGVzLkF1dGhTdG9yYWdlRmFpbHVyZUFjdGlvbjpcbiAgICAgIHJldHVybiB7XG4gICAgICAgIC4uLnN0YXRlLFxuICAgICAgICBsb2FkaW5nOiBmYWxzZSxcbiAgICAgICAgZXJyb3JzOiBbYWN0aW9uLmVycm9yTWVzc2FnZV0sXG4gICAgICB9O1xuXG4gICAgZGVmYXVsdDpcbiAgICAgIHJldHVybiBzdGF0ZTtcbiAgfVxufVxuIl19
|
|
@@ -343,7 +343,11 @@ class MagentoAuthApolloBearerTokenLinkGenerator {
|
|
|
343
343
|
}
|
|
344
344
|
getLink() {
|
|
345
345
|
return new ApolloLink((operation, forward) => {
|
|
346
|
-
|
|
346
|
+
let token = null;
|
|
347
|
+
try {
|
|
348
|
+
token = this.storage.getAuthToken();
|
|
349
|
+
}
|
|
350
|
+
catch (e) { }
|
|
347
351
|
if (token) {
|
|
348
352
|
operation.setContext({
|
|
349
353
|
headers: Object.assign(Object.assign({}, operation.getContext().headers), { authorization: `Bearer ${token}` }),
|