fix: Guard more sign-in routes

Author: dawsontoth

src/components/Navbar.tsx

@@ -231,7 +231,7 @@ function AnonymousNav() {
 	return (
 		<div className="flex items-center justify-between">
 			<div className="inline-block">
-				<Link to="/">
+				<Link to="/sign-in">
 					<Logo />
 					<span className="text-grey text-xs inline-block pl-2">{import.meta.env.VITE_STUDIO_VERSION}</span>
 				</Link>

src/features/instance/instanceLayoutRoute.ts

@@ -1,7 +1,7 @@
 import { clusterLayoutRoute } from '@/features/cluster/routes';
 import { InstanceLayout } from '@/features/instance/InstanceLayout';
 import { getInstanceInfoQueryOptions } from '@/features/cluster/queries/getInstanceInfoQuery';
-import { currentUrlAfterHash } from '@/lib/urls/currentUrlAfterHash';
+import { buildRedirectInSearch } from '@/lib/urls/buildRedirectInSearch';
 import { dashboardLayout } from '@/router/dashboardRoute';
 import { createRoute, redirect } from '@tanstack/react-router';
 
@@ -22,7 +22,7 @@ export function createInstanceLayoutRoute(mode: 'local' | 'cluster' | 'instance'
 				const auth = context.authentication[params.clusterId];
 				if (!auth || (!auth.isLoading && !auth.user)) {
 					const to = `/${params.organizationId}/${params.clusterId}/sign-in`;
-					throw redirect({ to, search: currentUrlAfterHash() !== '/' && { redirect: currentUrlAfterHash() } });
+					throw redirect({ to, search: buildRedirectInSearch() });
 				}
 				return await context.queryClient.ensureQueryData(getInstanceInfoQueryOptions(params));
 			},
@@ -36,7 +36,7 @@ export function createInstanceLayoutRoute(mode: 'local' | 'cluster' | 'instance'
 			const auth = context.authentication[params.instanceId];
 			if (!auth || (!auth.isLoading && !auth.user)) {
 				const to = `/${params.organizationId}/${params.clusterId}/instance/${params.instanceId}/sign-in`;
-				throw redirect({ to, search: currentUrlAfterHash() !== '/' && { redirect: currentUrlAfterHash() } });
+				throw redirect({ to, search: buildRedirectInSearch() });
 			}
 			return await context.queryClient.ensureQueryData(getInstanceInfoQueryOptions(params));
 		},

src/lib/urls/buildRedirectInSearch.ts

@@ -0,0 +1,15 @@
+import { currentUrlAfterHash } from '@/lib/urls/currentUrlAfterHash';
+
+const ignoredUrls = [
+	'/',
+	'/forgot-password',
+	'/reset-password',
+	'/sign-in',
+	'/sign-up',
+	'/verify-email',
+];
+
+export function buildRedirectInSearch() {
+	const url = currentUrlAfterHash().split('?')[0];
+	return !ignoredUrls.includes(url) && { redirect: url };
+}

src/router/dashboardRoute.ts

@@ -1,6 +1,6 @@
 import { Dashboard } from '@/features/layouts/Dashboard';
 import { OverallAppSignIn } from '@/lib/authStore';
-import { currentUrlAfterHash } from '@/lib/urls/currentUrlAfterHash';
+import { buildRedirectInSearch } from '@/lib/urls/buildRedirectInSearch';
 import { rootRoute } from '@/router/rootRoute';
 import { createRoute, redirect } from '@tanstack/react-router';
 
@@ -13,7 +13,7 @@ export const dashboardLayout = createRoute({
 		if (auth && !auth.isLoading && !auth.user) {
 			throw redirect({
 				to: '/sign-in',
-				search: currentUrlAfterHash() !== '/' && { redirect: currentUrlAfterHash() },
+				search: buildRedirectInSearch(),
 			});
 		}
 	},