Merge pull request #176 from cinovo/bugfix/login-redirect

Fix login redirect
cinovo · Mar 14, 2024 · 983be5d · 983be5d
2 parents b87d543 + 0e809f3
commit 983be5d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/webapp/src/app/util/auth/authentication.guard.ts b/src/main/webapp/src/app/util/auth/authentication.guard.ts
@@ -12,16 +12,22 @@ import { AuthTokenProviderService } from './authtokenprovider.service';
  * @author mweise
  */
 export const loggedIn: (expectedLoggedIn: boolean) => CanActivateFn = (expectedLoggedIn ) => {
-  return (route) => {
+  return (_route, state) => {
     const router = inject(Router);
 
-    const redirect = route.url;
+    const redirect = state.url;
     return inject(AuthTokenProviderService).loggedIn.pipe(
         map(actualLoggedIn => {
           if (actualLoggedIn === expectedLoggedIn) {
             return true;
           }
-          return router.createUrlTree(['/login'], {queryParams: {redirect}});
+          if (!actualLoggedIn) {
+            return router.createUrlTree(['/login'], {queryParams: {redirect}});
+          }
+          if (redirect !== "/login") {
+            return router.createUrlTree([redirect]);
+          }
+          return router.createUrlTree(["/home"]);
         })
     );
   }