Merge pull request #1108 from ORCID/add-guard-on-login-page

add guard to login page
ORCID · Feb 7, 2024 · 488f37b · 488f37b
2 parents f22f759 + b0234b7
commit 488f37b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/ui/src/app/account/account.route.ts b/ui/src/app/account/account.route.ts
@@ -11,6 +11,11 @@ export const routes: Routes = [
   {
     path: 'login',
     component: LoginComponent,
+    data: {
+      authorities: [],
+      pageTitle: 'global.menu.account.login.string',
+    },
+    canActivate: [AuthGuard],
   },
   {
     path: 'reset/request',

diff --git a/ui/src/app/account/auth.guard.ts b/ui/src/app/account/auth.guard.ts
@@ -20,7 +20,11 @@ export const AuthGuard = (route: ActivatedRouteSnapshot, state: RouterStateSnaps
         if (hasAnyAuthority) {
           return true
         } else {
-          router.navigate(['accessdenied'])
+          if (state.url === '/login') {
+            router.navigate(['/'])
+          } else {
+            router.navigate(['accessdenied'])
+          }
           return false
         }
       } else {