diff --git a/.build/prod/prisma.Dockerfile b/.build/prod/prisma.Dockerfile index a01f725..568eb8f 100644 --- a/.build/prod/prisma.Dockerfile +++ b/.build/prod/prisma.Dockerfile @@ -2,4 +2,6 @@ FROM oven/bun:1.1.42-debian WORKDIR /var/www/html +RUN apt update && apt install openssl -y + CMD bunx prisma studio diff --git a/middleware.ts b/middleware.ts index 824cea0..d89d581 100644 --- a/middleware.ts +++ b/middleware.ts @@ -3,21 +3,34 @@ import type { Session } from "better-auth/types"; import { type NextRequest, NextResponse } from "next/server"; export default async function authMiddleware(request: NextRequest) { - const { data: session } = await betterFetch( - "/api/auth/get-session", - { - baseURL: request.nextUrl.origin, - headers: { - //get the cookie from the request - cookie: request.headers.get("cookie") || "", - }, - }, - ); + const protocol = request.headers.get("x-forwarded-proto") || "http"; + const host = request.headers.get("host") || "localhost:3000"; - if (!session) { + console.log(protocol) + console.log(host) + + try { + const { data: session } = await betterFetch( + "http://localhost:3000/api/auth/get-session", + { + baseURL: `${protocol}://${host}`, + headers: { + //get the cookie from the request + cookie: request.headers.get("cookie") || "", + host: host + }, + + }, + ); + + if (!session) { + return NextResponse.redirect(new URL("/login", request.url)); + } + return NextResponse.next(); + } catch (error) { + console.log("Middlewaree", error); return NextResponse.redirect(new URL("/login", request.url)); } - return NextResponse.next(); } export const config = {