From 116355745387615ee606b7f08c6530a89d316194 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 23 Jun 2026 12:58:25 +0530
Subject: [PATCH] fix(web):update password auth forms

---
 surfsense_web/app/(home)/login/LocalLoginForm.tsx | 4 ++--
 surfsense_web/app/(home)/register/page.tsx        | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/surfsense_web/app/(home)/login/LocalLoginForm.tsx b/surfsense_web/app/(home)/login/LocalLoginForm.tsx
index 108151512..314dfa4cc 100644
--- a/surfsense_web/app/(home)/login/LocalLoginForm.tsx
+++ b/surfsense_web/app/(home)/login/LocalLoginForm.tsx
@@ -38,7 +38,7 @@ export function LocalLoginForm() {
 		trackLoginAttempt("local");
 
 		try {
-			const data = await login({
+			await login({
 				username,
 				password,
 				grant_type: "password",
@@ -54,7 +54,7 @@ export function LocalLoginForm() {
 
 			// Small delay to show success message
 			setTimeout(() => {
-				router.push(`/auth/callback?token=${data.access_token}`);
+				router.push("/auth/callback");
 			}, 500);
 		} catch (err) {
 			if (err instanceof ValidationError) {
diff --git a/surfsense_web/app/(home)/register/page.tsx b/surfsense_web/app/(home)/register/page.tsx
index 9421a0156..571103e79 100644
--- a/surfsense_web/app/(home)/register/page.tsx
+++ b/surfsense_web/app/(home)/register/page.tsx
@@ -12,8 +12,8 @@ import { Logo } from "@/components/Logo";
 import { useRuntimeConfig } from "@/components/providers/runtime-config";
 import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
+import { useSession } from "@/hooks/use-session";
 import { getAuthErrorDetails, isNetworkError, shouldRetry } from "@/lib/auth-errors";
-import { getBearerToken } from "@/lib/auth-utils";
 import { AppError, ValidationError } from "@/lib/error";
 import {
 	trackRegistrationAttempt,
@@ -37,18 +37,19 @@ export default function RegisterPage() {
 		message: null,
 	});
 	const router = useRouter();
+	const session = useSession();
 	const [{ mutateAsync: register, isPending: isRegistering }] = useAtom(registerMutationAtom);
 
 	// Check authentication type and redirect if not LOCAL
 	useEffect(() => {
-		if (getBearerToken()) {
+		if (session.status === "authenticated") {
 			router.replace("/dashboard");
 			return;
 		}
 		if (authType !== "LOCAL") {
 			router.push("/login");
 		}
-	}, [authType, router]);
+	}, [authType, router, session.status]);
 
 	const handleSubmit = (e: React.FormEvent) => {
 		e.preventDefault();