fix: Server Actions compatibility

Author: maamokun

package.json

@@ -6,7 +6,7 @@
 	"main": "dist/index.js",
 	"files": ["dist"],
 	"license": "WTFPL",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"type": "module",
 	"repository": {
 		"type": "git",

src/server-actions.ts

@@ -1,13 +1,13 @@
 import { NextRequest, NextResponse } from "next/server";
+import { cookies } from "next/headers";
 import { type Session, getGlobalConfig } from "./index";
 import jwt from "jsonwebtoken";
 
-export const getSession = async (req: NextRequest): Promise<Session | null> => {
+export const getSession = async (): Promise<Session | null> => {
 	const config = getGlobalConfig();
-	const token = req.cookies.get("AUTH_SESSION")?.value;
-	if (!token) {
-		return null;
-	}
+	const cookieStore = await cookies();
+	const token = cookieStore.get("AUTH_SESSION")?.value;
+	if (!token) return null;
 
 	try {
 		return jwt.verify(token, config.jwtSecret) as Session;
@@ -19,29 +19,32 @@ export const getSession = async (req: NextRequest): Promise<Session | null> => {
 
 export const signIn = async (req: NextRequest): Promise<NextResponse> => {
 	const config = getGlobalConfig();
-	const session = await getSession(req);
+	const session = await getSession();
 	if (session) {
-		return NextResponse.json(
-			{ message: "Already signed in" },
-			{ status: 200 },
-		);
+		return NextResponse.json({ message: "Already signed in" }, { status: 200 });
 	}
-
 	const signInURL = `https://discord.com/api/oauth2/authorize?client_id=${config.clientId}&redirect_uri=${encodeURIComponent(config.redirectUri)}&response_type=code&scope=${config.scopes.join(" ")}`;
 	return NextResponse.redirect(signInURL, 302);
 };
 
-export const signOut = async (req: NextRequest): Promise<NextResponse> => {
+export const signOut = async (): Promise<NextResponse> => {
 	const config = getGlobalConfig();
-	const session = await getSession(req);
-	if (!session) {
+	const cookieStore = await cookies();
+	const token = cookieStore.get("AUTH_SESSION")?.value;
+	if (!token) {
 		return NextResponse.json({ message: "Not signed in" }, { status: 401 });
 	}
 
+	try {
+		jwt.verify(token, config.jwtSecret);
+	} catch {
+		return NextResponse.json({ message: "Invalid session" }, { status: 401 });
+	}
+
 	const response = NextResponse.json(
 		{ message: "Signed out successfully" },
-		{ status: 200 },
+		{ status: 200 }
 	);
 	response.cookies.delete("AUTH_SESSION");
 	return response;
-};
+};

types/server-actions.d.ts

@@ -1,8 +1,8 @@
-import type { NextRequest, NextResponse } from "next/server";
+import type { NextResponse } from "next/server";
 import type { Session } from "./index";
 
-export declare function getSession(req: NextRequest): Promise<Session | null>;
+export declare function getSession(): Promise<Session | null>;
 
-export declare function signIn(req: NextRequest): Promise<NextResponse>;
+export declare function signIn(): Promise<NextResponse>;
 
-export declare function signOut(req: NextRequest): Promise<NextResponse>;
+export declare function signOut(): Promise<NextResponse>;