- return this.authService.isLoggedIn
- .pipe(
- take(1),
- map((isLoggedIn: boolean) => {
- if (!isLoggedIn) {
- this.router.navigate(['/login']).catch(() => {
- //TODO: Handle error notification
- });
- }
+ // eslint-disable-next-line deprecation/deprecation
+ return combineLatest(
+ this.authService.isLoggedIn,
+ this.authService.isChangePassword
+ ).pipe(
+ map(([isLoggedIn, changePassword]: [boolean, boolean]): boolean => {
+ if (changePassword || isLoggedIn) {