@dereekb/dbx-core 9.24.20 → 9.24.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/auth/router/auth.router.service.mjs +17 -1
- package/esm2020/lib/auth/router/state/effect/auth.router.state.effect.mjs +4 -4
- package/fesm2015/dereekb-dbx-core.mjs +17 -2
- package/fesm2015/dereekb-dbx-core.mjs.map +1 -1
- package/fesm2020/dereekb-dbx-core.mjs +17 -2
- package/fesm2020/dereekb-dbx-core.mjs.map +1 -1
- package/lib/auth/router/auth.router.service.d.ts +10 -1
- package/package.json +4 -4
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BehaviorSubject } from 'rxjs';
|
|
1
2
|
import { Injectable } from '@angular/core';
|
|
2
3
|
import { goWithRouter } from '../../router';
|
|
3
4
|
import { DbxRouterService } from '../../router/router/service/router.service';
|
|
@@ -12,10 +13,25 @@ export class DbxAppAuthRouterService {
|
|
|
12
13
|
constructor(dbxRouterService, dbxAppAuthRoutes) {
|
|
13
14
|
this.dbxRouterService = dbxRouterService;
|
|
14
15
|
this.dbxAppAuthRoutes = dbxAppAuthRoutes;
|
|
16
|
+
this._isAuthRouterEffectsEnabled = new BehaviorSubject(true);
|
|
17
|
+
this.isAuthRouterEffectsEnabled$ = this._isAuthRouterEffectsEnabled.asObservable();
|
|
18
|
+
}
|
|
19
|
+
ngOnDestroy() {
|
|
20
|
+
this._isAuthRouterEffectsEnabled.complete();
|
|
15
21
|
}
|
|
16
22
|
get hasOnboardingState() {
|
|
17
23
|
return Boolean(this.dbxAppAuthRoutes.onboardRef);
|
|
18
24
|
}
|
|
25
|
+
// MARK: Effects
|
|
26
|
+
/**
|
|
27
|
+
* Whether or not DbxAppAuthRouterEffects are enabled.
|
|
28
|
+
*/
|
|
29
|
+
get isAuthRouterEffectsEnabled() {
|
|
30
|
+
return this._isAuthRouterEffectsEnabled.value;
|
|
31
|
+
}
|
|
32
|
+
set isAuthRouterEffectsEnabled(enabled) {
|
|
33
|
+
this._isAuthRouterEffectsEnabled.next(enabled);
|
|
34
|
+
}
|
|
19
35
|
// MARK: Navigate
|
|
20
36
|
/**
|
|
21
37
|
* Navigates to the login state.
|
|
@@ -58,4 +74,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
|
|
|
58
74
|
providedIn: 'root'
|
|
59
75
|
}]
|
|
60
76
|
}], ctorParameters: function () { return [{ type: i1.DbxRouterService }, { type: i2.DbxAppAuthRoutes }]; } });
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5yb3V0ZXIuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2RieC1jb3JlL3NyYy9saWIvYXV0aC9yb3V0ZXIvYXV0aC5yb3V0ZXIuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxVQUFVLEVBQWEsTUFBTSxlQUFlLENBQUM7QUFDdEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUM1QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUM5RSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxlQUFlLENBQUM7Ozs7QUFFakQ7O0dBRUc7QUFJSCxNQUFNLE9BQU8sdUJBQXVCO0lBS2xDLFlBQXFCLGdCQUFrQyxFQUFXLGdCQUFrQztRQUEvRSxxQkFBZ0IsR0FBaEIsZ0JBQWdCLENBQWtCO1FBQVcscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFrQjtRQUo1RixnQ0FBMkIsR0FBRyxJQUFJLGVBQWUsQ0FBVSxJQUFJLENBQUMsQ0FBQztRQUVoRSxnQ0FBMkIsR0FBRyxJQUFJLENBQUMsMkJBQTJCLENBQUMsWUFBWSxFQUFFLENBQUM7SUFFZ0IsQ0FBQztJQUV4RyxXQUFXO1FBQ1QsSUFBSSxDQUFDLDJCQUEyQixDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzlDLENBQUM7SUFFRCxJQUFJLGtCQUFrQjtRQUNwQixPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDbkQsQ0FBQztJQUVELGdCQUFnQjtJQUVoQjs7T0FFRztJQUNILElBQUksMEJBQTBCO1FBQzVCLE9BQU8sSUFBSSxDQUFDLDJCQUEyQixDQUFDLEtBQUssQ0FBQztJQUNoRCxDQUFDO0lBRUQsSUFBSSwwQkFBMEIsQ0FBQyxPQUFnQjtRQUM3QyxJQUFJLENBQUMsMkJBQTJCLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRCxpQkFBaUI7SUFDakI7Ozs7T0FJRztJQUNILFNBQVM7UUFDUCxPQUFPLFlBQVksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDN0UsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxhQUFhO1FBQ1gsT0FBTyxZQUFZLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFlBQVksSUFBSSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDbkgsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxjQUFjO1FBQ1osT0FBTyxZQUFZLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFVBQVUsSUFBSSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDL0csQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxPQUFPO1FBQ0wsT0FBTyxZQUFZLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzNFLENBQUM7O3FIQS9EVSx1QkFBdUI7eUhBQXZCLHVCQUF1QixjQUZ0QixNQUFNOzRGQUVQLHVCQUF1QjtrQkFIbkMsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBCZWhhdmlvclN1YmplY3QgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IEluamVjdGFibGUsIE9uRGVzdHJveSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgZ29XaXRoUm91dGVyIH0gZnJvbSAnLi4vLi4vcm91dGVyJztcbmltcG9ydCB7IERieFJvdXRlclNlcnZpY2UgfSBmcm9tICcuLi8uLi9yb3V0ZXIvcm91dGVyL3NlcnZpY2Uvcm91dGVyLnNlcnZpY2UnO1xuaW1wb3J0IHsgRGJ4QXBwQXV0aFJvdXRlcyB9IGZyb20gJy4vYXV0aC5yb3V0ZXInO1xuXG4vKipcbiAqIEhlbHBlciBzZXJ2aWNlIGZvciBuYXZpZ2F0aW5nIHRvIGltcG9ydGFudCBhdXRoLXJlbGF0ZWQgcm91dGVzLlxuICovXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBEYnhBcHBBdXRoUm91dGVyU2VydmljZSBpbXBsZW1lbnRzIE9uRGVzdHJveSB7XG4gIHByaXZhdGUgX2lzQXV0aFJvdXRlckVmZmVjdHNFbmFibGVkID0gbmV3IEJlaGF2aW9yU3ViamVjdDxib29sZWFuPih0cnVlKTtcblxuICByZWFkb25seSBpc0F1dGhSb3V0ZXJFZmZlY3RzRW5hYmxlZCQgPSB0aGlzLl9pc0F1dGhSb3V0ZXJFZmZlY3RzRW5hYmxlZC5hc09ic2VydmFibGUoKTtcblxuICBjb25zdHJ1Y3RvcihyZWFkb25seSBkYnhSb3V0ZXJTZXJ2aWNlOiBEYnhSb3V0ZXJTZXJ2aWNlLCByZWFkb25seSBkYnhBcHBBdXRoUm91dGVzOiBEYnhBcHBBdXRoUm91dGVzKSB7fVxuXG4gIG5nT25EZXN0cm95KCk6IHZvaWQge1xuICAgIHRoaXMuX2lzQXV0aFJvdXRlckVmZmVjdHNFbmFibGVkLmNvbXBsZXRlKCk7XG4gIH1cblxuICBnZXQgaGFzT25ib2FyZGluZ1N0YXRlKCk6IGJvb2xlYW4ge1xuICAgIHJldHVybiBCb29sZWFuKHRoaXMuZGJ4QXBwQXV0aFJvdXRlcy5vbmJvYXJkUmVmKTtcbiAgfVxuXG4gIC8vIE1BUks6IEVmZmVjdHNcblxuICAvKipcbiAgICogV2hldGhlciBvciBub3QgRGJ4QXBwQXV0aFJvdXRlckVmZmVjdHMgYXJlIGVuYWJsZWQuXG4gICAqL1xuICBnZXQgaXNBdXRoUm91dGVyRWZmZWN0c0VuYWJsZWQoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuIHRoaXMuX2lzQXV0aFJvdXRlckVmZmVjdHNFbmFibGVkLnZhbHVlO1xuICB9XG5cbiAgc2V0IGlzQXV0aFJvdXRlckVmZmVjdHNFbmFibGVkKGVuYWJsZWQ6IGJvb2xlYW4pIHtcbiAgICB0aGlzLl9pc0F1dGhSb3V0ZXJFZmZlY3RzRW5hYmxlZC5uZXh0KGVuYWJsZWQpO1xuICB9XG5cbiAgLy8gTUFSSzogTmF2aWdhdGVcbiAgLyoqXG4gICAqIE5hdmlnYXRlcyB0byB0aGUgbG9naW4gc3RhdGUuXG4gICAqXG4gICAqIEByZXR1cm5zXG4gICAqL1xuICBnb1RvTG9naW4oKSB7XG4gICAgcmV0dXJuIGdvV2l0aFJvdXRlcih0aGlzLmRieFJvdXRlclNlcnZpY2UpKHRoaXMuZGJ4QXBwQXV0aFJvdXRlcy5sb2dpblJlZik7XG4gIH1cblxuICAvKipcbiAgICogTmF2aWdhdGVzIHRvIHRoZSBsb2dnZWQgb3V0IHN0YXRlLCBpZiBpdCBleGlzdHMsIG90aGVyd2lzZSBuYXZpZ2F0ZXMgdG8gdGhlIGxvZ2luIHN0YXRlLlxuICAgKlxuICAgKiBAcmV0dXJuc1xuICAgKi9cbiAgZ29Ub0xvZ2dlZE91dCgpIHtcbiAgICByZXR1cm4gZ29XaXRoUm91dGVyKHRoaXMuZGJ4Um91dGVyU2VydmljZSkodGhpcy5kYnhBcHBBdXRoUm91dGVzLmxvZ2dlZE91dFJlZiA/PyB0aGlzLmRieEFwcEF1dGhSb3V0ZXMubG9naW5SZWYpO1xuICB9XG5cbiAgLyoqXG4gICAqIE5hdmlnYXRlcyB0byB0aGUgb25ib2FyZGluZyBzdGF0ZSBpZiBpdCBpcyBhdmFpbGFibGUsIG90aGVyd2lzZSBuYXZpZ2F0ZXMgdG8gdGhlIGFwcC5cbiAgICpcbiAgICogQHJldHVybnNcbiAgICovXG4gIGdvVG9PbmJvYXJkaW5nKCk6IFByb21pc2U8Ym9vbGVhbj4ge1xuICAgIHJldHVybiBnb1dpdGhSb3V0ZXIodGhpcy5kYnhSb3V0ZXJTZXJ2aWNlKSh0aGlzLmRieEFwcEF1dGhSb3V0ZXMub25ib2FyZFJlZiA/PyB0aGlzLmRieEFwcEF1dGhSb3V0ZXMuYXBwUmVmKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBOYXZpZ2F0ZXMgdG8gdGhlIGFwcCBzdGF0ZS5cbiAgICpcbiAgICogQHJldHVybnNcbiAgICovXG4gIGdvVG9BcHAoKSB7XG4gICAgcmV0dXJuIGdvV2l0aFJvdXRlcih0aGlzLmRieFJvdXRlclNlcnZpY2UpKHRoaXMuZGJ4QXBwQXV0aFJvdXRlcy5hcHBSZWYpO1xuICB9XG59XG4iXX0=
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { exhaustMap } from 'rxjs';
|
|
1
|
+
import { exhaustMap, filter } from 'rxjs';
|
|
2
2
|
import { Inject, Injectable, InjectionToken, Optional } from '@angular/core';
|
|
3
3
|
import { Actions, createEffect, ofType } from '@ngrx/effects';
|
|
4
4
|
import { Store } from '@ngrx/store';
|
|
@@ -26,11 +26,11 @@ export class DbxAppAuthRouterEffects extends AbstractOnDbxAppContextStateEffects
|
|
|
26
26
|
/**
|
|
27
27
|
* Effect to redirect to the login when logout occurs.
|
|
28
28
|
*/
|
|
29
|
-
this.redirectToLoginOnLogout = createEffect(() => this.actions$.pipe(ofType(onDbxAppAuth.DbxAppAuthActions.loggedOut), exhaustMap(() => this.dbxAppAuthRouterService.goToLogin())), { dispatch: false });
|
|
29
|
+
this.redirectToLoginOnLogout = createEffect(() => this.actions$.pipe(ofType(onDbxAppAuth.DbxAppAuthActions.loggedOut), filter(() => this.dbxAppAuthRouterService.isAuthRouterEffectsEnabled), exhaustMap(() => this.dbxAppAuthRouterService.goToLogin())), { dispatch: false });
|
|
30
30
|
/**
|
|
31
31
|
* Effect to redirect to the app when login occurs.
|
|
32
32
|
*/
|
|
33
|
-
this.redirectToOnboardOnLogIn = createEffect(() => this.actions$.pipe(ofType(onDbxAppAuth.DbxAppAuthActions.loggedIn), exhaustMap(() => this.dbxAppAuthRouterService.goToApp())), { dispatch: false });
|
|
33
|
+
this.redirectToOnboardOnLogIn = createEffect(() => this.actions$.pipe(ofType(onDbxAppAuth.DbxAppAuthActions.loggedIn), filter(() => this.dbxAppAuthRouterService.isAuthRouterEffectsEnabled), exhaustMap(() => this.dbxAppAuthRouterService.goToApp())), { dispatch: false });
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
DbxAppAuthRouterEffects.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxAppAuthRouterEffects, deps: [{ token: DBX_APP_AUTH_ROUTER_EFFECTS_TOKEN, optional: true }, { token: i1.Actions }, { token: i2.Store }, { token: i3.DbxAppAuthRouterService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -43,4 +43,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
|
|
|
43
43
|
}, {
|
|
44
44
|
type: Optional
|
|
45
45
|
}] }, { type: i1.Actions }, { type: i2.Store }, { type: i3.DbxAppAuthRouterService }]; } });
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5yb3V0ZXIuc3RhdGUuZWZmZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvZGJ4LWNvcmUvc3JjL2xpYi9hdXRoL3JvdXRlci9zdGF0ZS9lZmZlY3QvYXV0aC5yb3V0ZXIuc3RhdGUuZWZmZWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFNLE1BQU0sTUFBTSxDQUFDO0FBQzlDLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLGNBQWMsRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFN0UsT0FBTyxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzlELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDcEMsT0FBTyxFQUFzQiw0QkFBNEIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQy9GLE9BQU8sRUFBRSxtQ0FBbUMsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3ZGLE9BQU8sRUFBa0IsWUFBWSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDOUQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7Ozs7O0FBRXBFOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0saUNBQWlDLEdBQUcsSUFBSSxjQUFjLENBQUMscUNBQXFDLENBQUMsQ0FBQztBQUUzRzs7OztHQUlHO0FBRUgsTUFBTSxPQUFPLHVCQUF3QixTQUFRLG1DQUF5RDtJQUNwRyxZQUFtRSxZQUFxRCxFQUFFLFFBQWlCLEVBQUUsS0FBa0MsRUFBVyx1QkFBZ0Q7UUFDeE8sS0FBSyxDQUFDLFlBQVksSUFBSSw0QkFBNEIsRUFBRSxRQUFRLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFEbUgsNEJBQXVCLEdBQXZCLHVCQUF1QixDQUF5QjtRQUkxTzs7V0FFRztRQUNNLDRCQUF1QixHQUFHLFlBQVksQ0FDN0MsR0FBRyxFQUFFLENBQ0gsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQ2hCLE1BQU0sQ0FBQyxZQUFZLENBQUMsaUJBQWlCLENBQUMsU0FBUyxDQUFDLEVBQ2hELE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLENBQUMsMEJBQTBCLENBQUMsRUFDckUsVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUMzRCxFQUNILEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxDQUNwQixDQUFDO1FBRUY7O1dBRUc7UUFDTSw2QkFBd0IsR0FBRyxZQUFZLENBQzlDLEdBQUcsRUFBRSxDQUNILElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUNoQixNQUFNLENBQUMsWUFBWSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxFQUMvQyxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLDBCQUEwQixDQUFDLEVBQ3JFLFVBQVUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FDekQsRUFDSCxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FDcEIsQ0FBQztJQTFCRixDQUFDOztxSEFIVSx1QkFBdUIsa0JBQ2QsaUNBQWlDO3lIQUQxQyx1QkFBdUI7NEZBQXZCLHVCQUF1QjtrQkFEbkMsVUFBVTs7MEJBRUksTUFBTTsyQkFBQyxpQ0FBaUM7OzBCQUFHLFFBQVEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBleGhhdXN0TWFwLCBmaWx0ZXIsIG9mIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUsIEluamVjdGlvblRva2VuLCBPcHRpb25hbCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQXJyYXlPclZhbHVlLCBNYXliZSB9IGZyb20gJ0BkZXJlZWtiL3V0aWwnO1xuaW1wb3J0IHsgQWN0aW9ucywgY3JlYXRlRWZmZWN0LCBvZlR5cGUgfSBmcm9tICdAbmdyeC9lZmZlY3RzJztcbmltcG9ydCB7IFN0b3JlIH0gZnJvbSAnQG5ncngvc3RvcmUnO1xuaW1wb3J0IHsgRGJ4QXBwQ29udGV4dFN0YXRlLCBEQlhfS05PV05fQVBQX0NPTlRFWFRfU1RBVEVTIH0gZnJvbSAnLi4vLi4vLi4vLi4vY29udGV4dC9jb250ZXh0JztcbmltcG9ydCB7IEFic3RyYWN0T25EYnhBcHBDb250ZXh0U3RhdGVFZmZlY3RzIH0gZnJvbSAnLi4vLi4vLi4vLi4vY29udGV4dC9zdGF0ZS9lZmZlY3QnO1xuaW1wb3J0IHsgZnJvbURieEFwcEF1dGgsIG9uRGJ4QXBwQXV0aCB9IGZyb20gJy4uLy4uLy4uL3N0YXRlJztcbmltcG9ydCB7IERieEFwcEF1dGhSb3V0ZXJTZXJ2aWNlIH0gZnJvbSAnLi4vLi4vYXV0aC5yb3V0ZXIuc2VydmljZSc7XG5cbi8qKlxuICogVXNlZCBieSBEYnhBcHBBdXRoUm91dGVyRWZmZWN0cyB0byBjb25maWd1cmUgdGhlIHN0YXRlcyB0aGF0IHNob3VsZCBiZSBhY3RpdnZlIGJ5IGRlZmF1bHQuXG4gKi9cbmV4cG9ydCBjb25zdCBEQlhfQVBQX0FVVEhfUk9VVEVSX0VGRkVDVFNfVE9LRU4gPSBuZXcgSW5qZWN0aW9uVG9rZW4oJ0RieEFwcEF1dGhSb3V0ZXJFZmZlY3RzQWN0aXZlU3RhdGVzJyk7XG5cbi8qKlxuICogU2V0IG9mIG5ncnggZWZmZWN0cyB0aGF0IGhhbmRsZSBuYXZpZ2F0aW9uIGluIHRoZSBhcHAgd2hlbiB0aGUgYXV0aCBjaGFuZ2VzIGluIGNlcnRhaW4gd2F5cy5cbiAqXG4gKiBJcyBjb25maWd1cmFibGUgdmlhIHRoZSBEQlhfQVBQX0FVVEhfUk9VVEVSX0VGRkVDVFNfVE9LRU4gdG8gY2hvb3NlIHdoaWNoIHN0YXRlcyB0aGlzIGVmZmVjdCBpcyBhY3RpdmUgb3Igbm90LiBCeSBkZWZhdWx0IGlzIGVxdWFsIHRvIERCWF9LTk9XTl9BUFBfQ09OVEVYVF9TVEFURVMuXG4gKi9cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBEYnhBcHBBdXRoUm91dGVyRWZmZWN0cyBleHRlbmRzIEFic3RyYWN0T25EYnhBcHBDb250ZXh0U3RhdGVFZmZlY3RzPGZyb21EYnhBcHBBdXRoLlN0YXRlPiB7XG4gIGNvbnN0cnVjdG9yKEBJbmplY3QoREJYX0FQUF9BVVRIX1JPVVRFUl9FRkZFQ1RTX1RPS0VOKSBAT3B0aW9uYWwoKSBhY3RpdmVTdGF0ZXM6IE1heWJlPEFycmF5T3JWYWx1ZTxEYnhBcHBDb250ZXh0U3RhdGU+PiwgYWN0aW9ucyQ6IEFjdGlvbnMsIHN0b3JlOiBTdG9yZTxmcm9tRGJ4QXBwQXV0aC5TdGF0ZT4sIHJlYWRvbmx5IGRieEFwcEF1dGhSb3V0ZXJTZXJ2aWNlOiBEYnhBcHBBdXRoUm91dGVyU2VydmljZSkge1xuICAgIHN1cGVyKGFjdGl2ZVN0YXRlcyA/PyBEQlhfS05PV05fQVBQX0NPTlRFWFRfU1RBVEVTLCBhY3Rpb25zJCwgc3RvcmUpO1xuICB9XG5cbiAgLyoqXG4gICAqIEVmZmVjdCB0byByZWRpcmVjdCB0byB0aGUgbG9naW4gd2hlbiBsb2dvdXQgb2NjdXJzLlxuICAgKi9cbiAgcmVhZG9ubHkgcmVkaXJlY3RUb0xvZ2luT25Mb2dvdXQgPSBjcmVhdGVFZmZlY3QoXG4gICAgKCkgPT5cbiAgICAgIHRoaXMuYWN0aW9ucyQucGlwZShcbiAgICAgICAgb2ZUeXBlKG9uRGJ4QXBwQXV0aC5EYnhBcHBBdXRoQWN0aW9ucy5sb2dnZWRPdXQpLFxuICAgICAgICBmaWx0ZXIoKCkgPT4gdGhpcy5kYnhBcHBBdXRoUm91dGVyU2VydmljZS5pc0F1dGhSb3V0ZXJFZmZlY3RzRW5hYmxlZCksXG4gICAgICAgIGV4aGF1c3RNYXAoKCkgPT4gdGhpcy5kYnhBcHBBdXRoUm91dGVyU2VydmljZS5nb1RvTG9naW4oKSlcbiAgICAgICksXG4gICAgeyBkaXNwYXRjaDogZmFsc2UgfVxuICApO1xuXG4gIC8qKlxuICAgKiBFZmZlY3QgdG8gcmVkaXJlY3QgdG8gdGhlIGFwcCB3aGVuIGxvZ2luIG9jY3Vycy5cbiAgICovXG4gIHJlYWRvbmx5IHJlZGlyZWN0VG9PbmJvYXJkT25Mb2dJbiA9IGNyZWF0ZUVmZmVjdChcbiAgICAoKSA9PlxuICAgICAgdGhpcy5hY3Rpb25zJC5waXBlKFxuICAgICAgICBvZlR5cGUob25EYnhBcHBBdXRoLkRieEFwcEF1dGhBY3Rpb25zLmxvZ2dlZEluKSxcbiAgICAgICAgZmlsdGVyKCgpID0+IHRoaXMuZGJ4QXBwQXV0aFJvdXRlclNlcnZpY2UuaXNBdXRoUm91dGVyRWZmZWN0c0VuYWJsZWQpLFxuICAgICAgICBleGhhdXN0TWFwKCgpID0+IHRoaXMuZGJ4QXBwQXV0aFJvdXRlclNlcnZpY2UuZ29Ub0FwcCgpKVxuICAgICAgKSxcbiAgICB7IGRpc3BhdGNoOiBmYWxzZSB9XG4gICk7XG59XG4iXX0=
|
|
@@ -3004,10 +3004,25 @@ class DbxAppAuthRouterService {
|
|
|
3004
3004
|
constructor(dbxRouterService, dbxAppAuthRoutes) {
|
|
3005
3005
|
this.dbxRouterService = dbxRouterService;
|
|
3006
3006
|
this.dbxAppAuthRoutes = dbxAppAuthRoutes;
|
|
3007
|
+
this._isAuthRouterEffectsEnabled = new BehaviorSubject(true);
|
|
3008
|
+
this.isAuthRouterEffectsEnabled$ = this._isAuthRouterEffectsEnabled.asObservable();
|
|
3009
|
+
}
|
|
3010
|
+
ngOnDestroy() {
|
|
3011
|
+
this._isAuthRouterEffectsEnabled.complete();
|
|
3007
3012
|
}
|
|
3008
3013
|
get hasOnboardingState() {
|
|
3009
3014
|
return Boolean(this.dbxAppAuthRoutes.onboardRef);
|
|
3010
3015
|
}
|
|
3016
|
+
// MARK: Effects
|
|
3017
|
+
/**
|
|
3018
|
+
* Whether or not DbxAppAuthRouterEffects are enabled.
|
|
3019
|
+
*/
|
|
3020
|
+
get isAuthRouterEffectsEnabled() {
|
|
3021
|
+
return this._isAuthRouterEffectsEnabled.value;
|
|
3022
|
+
}
|
|
3023
|
+
set isAuthRouterEffectsEnabled(enabled) {
|
|
3024
|
+
this._isAuthRouterEffectsEnabled.next(enabled);
|
|
3025
|
+
}
|
|
3011
3026
|
// MARK: Navigate
|
|
3012
3027
|
/**
|
|
3013
3028
|
* Navigates to the login state.
|
|
@@ -3069,11 +3084,11 @@ class DbxAppAuthRouterEffects extends AbstractOnDbxAppContextStateEffects {
|
|
|
3069
3084
|
/**
|
|
3070
3085
|
* Effect to redirect to the login when logout occurs.
|
|
3071
3086
|
*/
|
|
3072
|
-
this.redirectToLoginOnLogout = createEffect(() => this.actions$.pipe(ofType(loggedOut), exhaustMap(() => this.dbxAppAuthRouterService.goToLogin())), { dispatch: false });
|
|
3087
|
+
this.redirectToLoginOnLogout = createEffect(() => this.actions$.pipe(ofType(loggedOut), filter(() => this.dbxAppAuthRouterService.isAuthRouterEffectsEnabled), exhaustMap(() => this.dbxAppAuthRouterService.goToLogin())), { dispatch: false });
|
|
3073
3088
|
/**
|
|
3074
3089
|
* Effect to redirect to the app when login occurs.
|
|
3075
3090
|
*/
|
|
3076
|
-
this.redirectToOnboardOnLogIn = createEffect(() => this.actions$.pipe(ofType(loggedIn), exhaustMap(() => this.dbxAppAuthRouterService.goToApp())), { dispatch: false });
|
|
3091
|
+
this.redirectToOnboardOnLogIn = createEffect(() => this.actions$.pipe(ofType(loggedIn), filter(() => this.dbxAppAuthRouterService.isAuthRouterEffectsEnabled), exhaustMap(() => this.dbxAppAuthRouterService.goToApp())), { dispatch: false });
|
|
3077
3092
|
}
|
|
3078
3093
|
}
|
|
3079
3094
|
DbxAppAuthRouterEffects.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxAppAuthRouterEffects, deps: [{ token: DBX_APP_AUTH_ROUTER_EFFECTS_TOKEN, optional: true }, { token: i1$3.Actions }, { token: i1$4.Store }, { token: DbxAppAuthRouterService }], target: i0.ɵɵFactoryTarget.Injectable });
|