Use normal request instead of nextrequest

Author: bcbogdan

lib/ts/nextjs/middleware.ts

@@ -1,6 +1,6 @@
 import { enableLogging, logDebugMessage } from "../logger";
 
-import type { NextRequest, SuperTokensNextjsConfig, SuperTokensRequestToken } from "./types";
+import type { SuperTokensNextjsConfig, SuperTokensRequestToken } from "./types";
 
 const ACCESS_TOKEN_COOKIE_NAME = "sAccessToken";
 const ACCESS_TOKEN_HEADER_NAME = "st-access-token";
@@ -32,13 +32,14 @@ let AppInfo: SuperTokensNextjsConfig["appInfo"];
 //     });
 // }
 
-export async function refreshSession(config: SuperTokensNextjsConfig, request: NextRequest): Promise<Response> {
+export async function refreshSession(config: SuperTokensNextjsConfig, request: Request): Promise<Response> {
     AppInfo = config.appInfo;
     if (config.enableDebugLogs) {
         enableLogging();
     }
+    console.log(request);
     const refreshToken =
-        request.cookies.get(REFRESH_TOKEN_COOKIE_NAME)?.value || request.headers.get(REFRESH_TOKEN_HEADER_NAME);
+        getCookie(request, REFRESH_TOKEN_COOKIE_NAME) || request.headers.get(REFRESH_TOKEN_HEADER_NAME);
     if (!refreshToken) {
         logDebugMessage("Refresh token not found");
         return redirectToAuthPage(request);
@@ -52,7 +53,6 @@ export async function refreshSession(config: SuperTokensNextjsConfig, request: N
             logDebugMessage("Missing tokens from refresh response");
             return redirectToAuthPage(request);
         }
-
         const currentUrl = new URL(request.url);
         const redirectUrl = new URL(currentUrl.searchParams.get("redirectTo") || "/", request.url);
         const finalResponse = new Response(null, {
@@ -91,7 +91,7 @@ export async function refreshSession(config: SuperTokensNextjsConfig, request: N
     }
 }
 
-function redirectToAuthPage(request: NextRequest): Response {
+function redirectToAuthPage(request: Request): Response {
     const authPagePath = AppInfo.websiteBasePath || "/auth";
     const redirectUrl = new URL(authPagePath, request.url);
     logDebugMessage(`Redirecting to: ${redirectUrl}`);
@@ -154,3 +154,11 @@ async function fetchNewTokens(currentRefreshToken: string): Promise<{
 
     return { accessToken, refreshToken, frontToken, antiCsrfToken };
 }
+
+function getCookie(request: Request, name: string) {
+    return request.headers
+        .get("cookie")
+        ?.split("; ")
+        .find((row) => row.startsWith(`${name}=`))
+        ?.split("=")[1];
+}

lib/ts/nextjs/types.ts

@@ -27,16 +27,6 @@ export function isCookiesStore(obj: unknown): obj is CookiesStore {
     return typeof obj === "object" && obj !== null && "get" in obj && typeof (obj as CookiesStore).get === "function";
 }
 
-export type NextRequest = Request & {
-    cookies: CookiesStore;
-};
-
-export type NextResponse = Response & {
-    cookies: CookiesStore;
-    redirect: (url: URL) => NextResponse;
-    next: (opts?: { headers?: Record<string, string> }) => NextResponse;
-};
-
 export type SuperTokensNextjsConfig = {
     appInfo: AppInfoUserInput;
     enableDebugLogs?: boolean;