feat(website): login menu button redirects back to current page

loculus-project · Feb 26, 2024 · 01016a0 · 01016a0
1 parent 922e5a4
commit 01016a0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/website/src/components/Navigation/Navigation.astro b/website/src/components/Navigation/Navigation.astro
@@ -2,15 +2,18 @@
 import { SandwichMenu } from './SandwichMenu.tsx';
 import { cleanOrganism } from './cleanOrganism';
 import { navigationItems } from '../../routes';
+import { getAuthUrl } from '../../middleware/authMiddleware';
 
 const { organism, knownOrganisms } = cleanOrganism(Astro.params.organism);
 
 const isLoggedIn = Astro.locals.session.isLoggedIn;
+
+const loginUrl = await getAuthUrl(Astro.url.toString());
 ---
 
 <div class='flex justify-end'>
     <div class='subtitle hidden sm:flex sm:z-6 gap-4'>
-        {navigationItems.top(organism?.key, isLoggedIn).map(({ text, path }) => <a href={path}>{text}</a>)}
+        {navigationItems.top(organism?.key, isLoggedIn, loginUrl).map(({ text, path }) => <a href={path}>{text}</a>)}
     </div>
 
     <div class='sm:hidden fixed z-0'>
@@ -20,6 +23,7 @@ const isLoggedIn = Astro.locals.session.isLoggedIn;
             organism={organism}
             knownOrganisms={knownOrganisms}
             isLoggedIn={isLoggedIn}
+            loginUrl={loginUrl}
             client:load
         />
     </div>

diff --git a/website/src/components/Navigation/SandwichMenu.tsx b/website/src/components/Navigation/SandwichMenu.tsx
@@ -12,9 +12,10 @@ type SandwichMenuProps = {
     organism: Organism | undefined;
     knownOrganisms: Organism[];
     isLoggedIn: boolean;
+    loginUrl: string | undefined;
 };
 
-export const SandwichMenu: FC<SandwichMenuProps> = ({ top, right, organism, knownOrganisms, isLoggedIn }) => {
+export const SandwichMenu: FC<SandwichMenuProps> = ({ top, right, organism, knownOrganisms, isLoggedIn, loginUrl }) => {
     const { isOpen, toggle: toggleMenu, close: closeMenu } = useOffCanvas();
 
     return (
@@ -49,7 +50,7 @@ export const SandwichMenu: FC<SandwichMenuProps> = ({ top, right, organism, know
                                     path={routes.organismStartPage(organism.key)}
                                 />
                             ))}
-                            {navigationItems.top(organism?.key, isLoggedIn).map(({ text, path }) => (
+                            {navigationItems.top(organism?.key, isLoggedIn, loginUrl).map(({ text, path }) => (
                                 <OffCanvasNavItem key={path} text={text} level={1} path={path} />
                             ))}
                         </div>

diff --git a/website/src/routes.ts b/website/src/routes.ts
@@ -175,7 +175,7 @@ export const navigationItems = {
     ],
 };
 
-function topNavigationItems(organism: string | undefined, isLoggedIn: boolean) {
+function topNavigationItems(organism: string | undefined, isLoggedIn: boolean, loginUrl: string | undefined) {
     if (organism === undefined) {
         return [
             {
@@ -186,10 +186,9 @@ function topNavigationItems(organism: string | undefined, isLoggedIn: boolean) {
                 text: 'Submit',
                 path: routes.organismSelectorPage('submit'),
             },
-            {
-                text: isLoggedIn ? 'My account' : 'Login',
-                path: routes.userOverviewPage(),
-            },
+            ...(isLoggedIn
+                ? [{ text: 'My account', path: routes.userOverviewPage() }]
+                : [{ text: 'Login', path: loginUrl! }]),
             {
                 text: 'Datasets',
                 path: routes.datasetsPage(),
@@ -210,10 +209,9 @@ function topNavigationItems(organism: string | undefined, isLoggedIn: boolean) {
             text: 'Revise',
             path: routes.revisePage(organism),
         },
-        {
-            text: isLoggedIn ? 'My account' : 'Login',
-            path: routes.userOverviewPage(organism),
-        },
+        ...(isLoggedIn
+            ? [{ text: 'My account', path: routes.userOverviewPage(organism) }]
+            : [{ text: 'Login', path: loginUrl! }]),
         {
             text: 'Datasets',
             path: routes.datasetsPage(),