From c1f642f83ecaf0b686b46be2531416330d22cf81 Mon Sep 17 00:00:00 2001
From: Svenum <s.ziegler@holypenguin.net>
Date: Thu, 4 Dec 2025 13:25:21 +0100
Subject: [PATCH 1/3] fixes: - reload loop if creds invalid but set - pres
 enter on password reset dont work

---
 src/app/app/layout.tsx         |  8 +++++---
 src/app/app/page.tsx           |  2 +-
 src/app/auth/signout/page.tsx  | 12 +++++++++---
 src/app/user/pw-reset/page.tsx | 10 +++++++---
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/app/app/layout.tsx b/src/app/app/layout.tsx
index 26b7b99..b6753bc 100755
--- a/src/app/app/layout.tsx
+++ b/src/app/app/layout.tsx
@@ -27,8 +27,10 @@ export default async function AppLayout({
     }
     const mustShowOOB = await api.user.mustShowOOB(session?.user.session_user.id)
     const user = await api.user.getUser().catch(async ()=>{
-        // Redirect the user to the sign-in page if the user is not found
-        redirect("/api/auth/signin")
+        // If the user is not found, redirect the user to the sign-out page
+        // to clear session after that redirect to sign-in page if the user
+        // is not found
+        redirect("/auth/signout?forced=true")
     })
     if(!user){
         redirect("/")
@@ -91,4 +93,4 @@ export default async function AppLayout({
             </SidebarProvider>
         </HydrateClient>
     )
-}
\ No newline at end of file
+}
diff --git a/src/app/app/page.tsx b/src/app/app/page.tsx
index 22cd23d..b430a21 100755
--- a/src/app/app/page.tsx
+++ b/src/app/app/page.tsx
@@ -27,7 +27,7 @@ export default function App(){
     const [size, setSize] = useState<number>(0)
 
     const router = useRouter()
-    const handler = async (path: string) => {
+    const handler = (path: string) => {
       router.push(path + "?" + params.toString())
     }
 
diff --git a/src/app/auth/signout/page.tsx b/src/app/auth/signout/page.tsx
index 79a4d4c..73e78c1 100755
--- a/src/app/auth/signout/page.tsx
+++ b/src/app/auth/signout/page.tsx
@@ -1,13 +1,19 @@
 'use client'
 import {signOut} from "next-auth/react";
-import {useEffect, useState} from "react";
+import {Suspense, useEffect, useState} from "react";
 import Link from "next/link";
 import {Button} from "@/components/ui/button";
+import {useParams} from "next/navigation";
 
 export default function SignOutPage(){
+    const params = useParams<{forced: string}>()
     useEffect(() => {
         if(window){
-            void signOut({redirect: false})
+          // this is needed to fix infinity redirect bug if creds are not valid
+          if(params.forced === "true"){
+            void signOut({redirectTo: "/auth/signin", redirect: true})
+          }
+          void signOut({redirect: false})
         }
     }, []);
     return(
@@ -21,4 +27,4 @@ export default function SignOutPage(){
             </div>
         </div>
     )
-}
\ No newline at end of file
+}
diff --git a/src/app/user/pw-reset/page.tsx b/src/app/user/pw-reset/page.tsx
index 2d63203..6d1550d 100755
--- a/src/app/user/pw-reset/page.tsx
+++ b/src/app/user/pw-reset/page.tsx
@@ -33,7 +33,8 @@ export default function Page(){
             toast.error("Ther was an error changing your password, please try again.");
         }
     })
-    function handleSubmit(){
+    function handleSubmit(event: Event){
+        event.preventDefault()
         if(!newPW.current || !repeatPW.current || !oldPW.current){
             toast.error("Please fill in all fields.");
             return;
@@ -55,6 +56,7 @@ export default function Page(){
             newPassword: newPW.current.value,
             repeatPassword: repeatPW.current.value
         });
+
     }
     return (
         <div className="flex justify-center items-center h-screen">
@@ -68,6 +70,7 @@ export default function Page(){
                     <CardDescription>
                         You must reset your password before you can continue.
                     </CardDescription>
+                    <form onSubmit={handleSubmit}>
                     <div className="flex flex-col gap-2">
                         <label htmlFor="current-password">Current Password</label>
                         <Input
@@ -91,10 +94,11 @@ export default function Page(){
                             ref={repeatPW}
                         />
                     </div>
-                    <Button type="submit" onClick={handleSubmit}>Change Password</Button>
+                    <Button type="submit">Change Password</Button>
+                  </form>
                 </CardContent>
             </Card>
             <Toaster richColors={true} />
         </div>
     )
-}
\ No newline at end of file
+}

From 0ce9efaf0eceb82303e4960bd59be1bee6b94dc8 Mon Sep 17 00:00:00 2001
From: Sven Ziegler <43136984+Svenum@users.noreply.github.com>
Date: Thu, 4 Dec 2025 13:50:57 +0100
Subject: [PATCH 2/3] Update src/app/user/pw-reset/page.tsx

Co-authored-by: SirBerg <benno@boerg.co>
---
 src/app/user/pw-reset/page.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/user/pw-reset/page.tsx b/src/app/user/pw-reset/page.tsx
index 6d1550d..b73872a 100755
--- a/src/app/user/pw-reset/page.tsx
+++ b/src/app/user/pw-reset/page.tsx
@@ -93,6 +93,7 @@ export default function Page(){
                             name="repeat-password"
                             ref={repeatPW}
                         />
+                        <Button type="submit">Change Password</Button>
                     </div>
                     <Button type="submit">Change Password</Button>
                   </form>

From 4e8b6cecbfa75e230e8012fccdec1cddadf09fdb Mon Sep 17 00:00:00 2001
From: Sven Ziegler <43136984+Svenum@users.noreply.github.com>
Date: Thu, 4 Dec 2025 13:51:03 +0100
Subject: [PATCH 3/3] Update src/app/user/pw-reset/page.tsx

Co-authored-by: SirBerg <benno@boerg.co>
---
 src/app/user/pw-reset/page.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/user/pw-reset/page.tsx b/src/app/user/pw-reset/page.tsx
index b73872a..f6f4471 100755
--- a/src/app/user/pw-reset/page.tsx
+++ b/src/app/user/pw-reset/page.tsx
@@ -95,7 +95,6 @@ export default function Page(){
                         />
                         <Button type="submit">Change Password</Button>
                     </div>
-                    <Button type="submit">Change Password</Button>
                   </form>
                 </CardContent>
             </Card>