fix: change password redirects to login page on success

intershop · Mar 2, 2020 · 2bfdab6 · 2bfdab6
1 parent 7314bf0
commit 2bfdab6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/app/core/guards/login.guard.ts b/src/app/core/guards/login.guard.ts
@@ -34,6 +34,11 @@ export class LoginGuard implements CanActivate {
       return true;
     }
 
+    // force page view by queryParam
+    if (route.queryParams.forcePageView) {
+      return true;
+    }
+
     const returnUrl = route.queryParams.returnUrl || '/home';
 
     this.currentDialog = this.modalService.open(LazyLoginModalComponent, { centered: true, size: 'sm' });

diff --git a/src/app/pages/forgot-password/update-password/update-password.component.ts b/src/app/pages/forgot-password/update-password/update-password.component.ts
@@ -46,7 +46,7 @@ export class UpdatePasswordComponent implements OnInit, OnDestroy {
         takeUntil(this.destroy$)
       )
       .subscribe(() => {
-        this.router.navigate(['/login']);
+        this.router.navigate(['/login'], { queryParams: { forcePageView: true } });
       });
   }