fix: implement redirect handling after authentication

Author: maamokun

package.json

@@ -8,7 +8,7 @@
 		"dist"
 	],
 	"license": "WTFPL",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"type": "module",
 	"keywords": [
 		"auth",

src/redirect.ts

@@ -1,4 +1,5 @@
 import { type NextRequest, NextResponse } from "next/server";
+import { redirect } from "next/navigation";
 import { type Session, getGlobalConfig } from "./index";
 import { cookies } from "next/headers";
 import { ExchangeCodeForTokens } from "./lib/oauth";
@@ -58,5 +59,10 @@ export const handleRedirect = async (req: NextRequest) => {
 		expiresIn: response.expiresIn,
 	});
 
+	const redirectUri = cookieStore.get("REDIRECT_AFTER")?.value || "/";
+
 	cookieStore.set("AUTH_SESSION", token, { sameSite: "lax", httpOnly: true, secure: true });
+	cookieStore.delete("REDIRECT_AFTER");
+
+	return redirect(redirectUri)
 };

src/server-actions.ts

@@ -1,4 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
+import { headers } from "next/headers";
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 import { type Session, getGlobalConfig } from "./index";
@@ -18,9 +19,13 @@ export const getSession = async (): Promise<Session | null> => {
 	}
 };
 
-export const signIn = async (): Promise<NextResponse> => {
+export const signIn = async (redirectTo?: string): Promise<NextResponse> => {
 	const config = getGlobalConfig();
 	const session = await getSession();
+	const cookieStore = await cookies();
+	const headersList = await headers();
+	const redirectUri = redirectTo ?? headersList.get("Referer") ?? "/";
+	await cookieStore.set("REDIRECT_AFTER", redirectUri, { sameSite: "lax", httpOnly: true, secure: true });
 	if (session) {
 		return NextResponse.json({ message: "Already signed in" }, { status: 200 });
 	}