Auth flow for signin and signout now preserves the path sent

src/components/Navbar.tsx

@@ -68,7 +68,9 @@ const Navbar: React.FC<NavbarProps> = ({ title }) => {
                 </li>
               )}
               <li>
-                <a onClick={() => void signOut()}>Sign Out</a>
+                <a onClick={() => void signOut({ callbackUrl: "/" })}>
+                  Sign Out
+                </a>
               </li>
             </ul>
           </div>

src/pages/profile/index.tsx

@@ -18,7 +18,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
   if (!session) {
     return {
       redirect: {
-        destination: "/",
+        destination: `/api/auth/signin?callbackUrl=${ctx.resolvedUrl}`,
         permanent: false,
       },
     };

src/pages/room/[id].tsx

@@ -37,7 +37,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
   if (!session) {
     return {
       redirect: {
-        destination: "/",
+        destination: `/api/auth/signin?callbackUrl=${ctx.resolvedUrl}`,
         permanent: false,
       },
     };

src/server/auth.ts

@@ -12,6 +12,7 @@ import { prisma } from "~/server/db";
 import type { Role } from "~/utils/types";
 import { sendMail } from "fms-ts";
 import { cacheClient, deleteFromCache } from "redicache-ts";
+import { redirect } from "next/navigation";
 
 const client = cacheClient(env.REDIS_URL);
 
@@ -75,7 +76,7 @@ export const authOptions: NextAuthOptions = {
     async signIn({}) {
       await deleteFromCache(client, env.APP_ENV, `kv_userlist_admin`);
     },
-    async signOut({}) {
+    async signOut() {
       await deleteFromCache(client, env.APP_ENV, `kv_userlist_admin`);
     },
   },