diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index f8e2ecc65d..0000000000 --- a/package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "sim", - "lockfileVersion": 3, - "requires": true, - "packages": {} -} diff --git a/sim/app/(auth)/signup/page.tsx b/sim/app/(auth)/signup/page.tsx index 6ccb786199..e9c7f3b479 100644 --- a/sim/app/(auth)/signup/page.tsx +++ b/sim/app/(auth)/signup/page.tsx @@ -65,7 +65,7 @@ export default function SignupPage() { async function signUpWithGithub() { try { - await client.signIn.social({ provider: 'github' }) + await client.signIn.social({ provider: 'github', callbackURL: '/w' }) } catch (err: any) { let errorMessage = 'Failed to sign up with GitHub' @@ -85,7 +85,7 @@ export default function SignupPage() { async function signUpWithGoogle() { try { - await client.signIn.social({ provider: 'google' }) + await client.signIn.social({ provider: 'google', callbackURL: '/w' }) } catch (err: any) { let errorMessage = 'Failed to sign up with Google' diff --git a/sim/app/middleware.ts b/sim/app/middleware.ts index ce03e005e5..fa2ea28465 100644 --- a/sim/app/middleware.ts +++ b/sim/app/middleware.ts @@ -1,5 +1,4 @@ import { NextRequest, NextResponse } from 'next/server' -import { getSessionCookie } from 'better-auth' export async function middleware(request: NextRequest) { // Check if the path is exactly /w @@ -12,8 +11,17 @@ export async function middleware(request: NextRequest) { return NextResponse.next() } - // Existing auth check for protected routes - const sessionCookie = getSessionCookie(request) + const cookieHeader = request.headers.get("cookie"); + const cookies = cookieHeader?.split("; ").reduce((acc, cookie) => { + const [key, value] = cookie.split("="); + acc.set(key, value); + return acc; + }, new Map()); + + const sessionCookie = + cookies?.get("better-auth.session_token") || + cookies?.get("__Secure-better-auth.session_token"); + if (!sessionCookie) { return NextResponse.redirect(new URL('/login', request.url)) }