fix: Switch to Web Standard redirects

Author: maamokun

.github/workflows/npm-beta-publish.yml

@@ -23,9 +23,8 @@ jobs:
         run: bun install --frozen-lockfile
       - name: Build Project
         run: bun run build
-      - uses: JS-DevTools/npm-publish@v3
+      - uses: JS-DevTools/npm-publish@v4
         with:
-          token: ${{ secrets.NPM_TOKEN }}
           access: "public"
           provenance: true
           tag: "beta"

.github/workflows/npm-publish.yml

@@ -20,8 +20,7 @@ jobs:
         run: bun install --frozen-lockfile
       - name: Build Project
         run: bun run build
-      - uses: JS-DevTools/npm-publish@v3
+      - uses: JS-DevTools/npm-publish@v4
         with:
-          token: ${{ secrets.NPM_TOKEN }}
           access: "public"
           provenance: true

package.json

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

src/redirect.ts

@@ -1,18 +1,17 @@
-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";
 import jwt from "jsonwebtoken";
 
-export const handleRedirect = async (req: NextRequest) => {
+export const handleRedirect = async (req: Request) => {
 	const config = getGlobalConfig();
 	const cookieStore = await cookies();
 	const params = new URL(req.url).searchParams;
 	const code = params.get("code");
 
 	if (!code) {
-		return NextResponse.json(
+		return Response.json(
 			{ error: "Authorization code not found" },
 			{ status: 400 },
 		);
@@ -31,7 +30,7 @@ export const handleRedirect = async (req: NextRequest) => {
 			error?: string;
 			message?: string;
 		};
-		return NextResponse.json(
+		return Response.json(
 			{ error: error.message || "Failed to fetch user data" },
 			{ status: 500 },
 		);

src/server-actions.ts

@@ -1,4 +1,3 @@
-import { NextRequest, NextResponse } from "next/server";
 import { headers } from "next/headers";
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
@@ -41,28 +40,28 @@ export const getSession = async (): Promise<Session | null> => {
 	}
 };
 
-export const signIn = async (redirectTo?: string): Promise<NextResponse> => {
+export const signIn = async (redirectTo?: string): Promise<Response> => {
 	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 });
+		return Response.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 redirect(signInURL);
 };
 
-export const signOut = async (): Promise<NextResponse> => {
+export const signOut = async (): Promise<Response> => {
 	const cookieStore = await cookies();
 	const token = cookieStore.get("AUTH_SESSION")?.value;
 	if (!token) {
-		return NextResponse.json({ message: "Not signed in" }, { status: 401 });
+		return Response.json({ message: "Not signed in" }, { status: 401 });
 	}
 
 	cookieStore.delete("AUTH_SESSION");
 
-	return NextResponse.json({ message: "Signed out successfully" }, { status: 200 });
+	return Response.json({ message: "Signed out successfully" }, { status: 200 });
 };

types/redirect.d.ts

@@ -1,5 +1,3 @@
-import type { NextRequest, NextResponse } from "next/server";
-
 export declare function handleRedirect(
-	req: NextRequest,
-): Promise<NextResponse | void>;
+	req: Request,
+): Promise<Response | void>;

types/server-actions.d.ts

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