(hopefully) fixed redirects!!!

kieler · Jul 26, 2023 · 6d4a647 · 6d4a647
1 parent 652388a
commit 6d4a647
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/Website/src/app/webapi/auth/route.ts b/Website/src/app/webapi/auth/route.ts
@@ -2,22 +2,21 @@ import {cookies} from "next/headers";
 import {NextRequest, NextResponse} from "next/server";
 import {authenticate} from "@/lib/data";
 import {NextURL} from "next/dist/server/web/next-url";
+import {hostname} from "os";
 
 // export async function GET(request: NextRequest) {
 //     return new NextResponse(null, { status: 405 })
 // }
 
 export async function POST(request: NextRequest) {
-    const url = request.nextUrl.clone();
-    const base_host = request.headers.get('x-forwarded-host')
+    const base_host = request.headers.get('origin')
 
-    console.log('request headers:', request.headers);
+    // console.log('request headers:', request.headers);
+    const url = new NextURL('/', base_host ?? `http://${hostname()}`);
 
-    // console.log('baz', request.destination);
     const data = await request.formData();
-    // console.log('foo', data);
     url.pathname = data.get("dst_url")?.toString() || '/';
-    // console.log("new url", url)
+
     const username = data.get("username")?.toString()
     const password = data.get("password")?.toString()
     if (username && password) {
@@ -30,7 +29,7 @@ export async function POST(request: NextRequest) {
                     sameSite: 'lax',
                     httpOnly: true
                 });
-                url.searchParams.set('success', 'true')
+                url.searchParams.set('success', 'true');
                 console.log("User:", username, 'login successful.');
             } else {
                 console.log("User:", username, 'login failed.');
@@ -44,5 +43,5 @@ export async function POST(request: NextRequest) {
         return new NextResponse('Malformed Request', {status: 400});
     }
 
-    return NextResponse.redirect(new NextURL(url, {base: base_host ?? undefined}))
+    return NextResponse.redirect(url);
 }