chore: updated cookie config

Author: Davidthecode

apps/api/src/app.ts

@@ -13,6 +13,8 @@ import trackRoutes from "@/routes/track/route";
 const createApp = (): Express => {
   const app: Express = express();
 
+  app.set("trust proxy", true);
+
   app.use(cors(corsOptions));
 
   app.all("/api/auth/*splat", toNodeHandler(auth));

apps/api/src/config/env.ts

@@ -2,6 +2,7 @@ import "dotenv/config";
 
 export const env = {
   PORT: process.env.PORT,
+  NODE_ENV: process.env.NODE_ENV,
   APP_URL: process.env.APP_URL,
   FRONTEND_URL: process.env.FRONTEND_URL,
   API_URL: process.env.API_URL,

apps/api/src/lib/auth/auth.ts

@@ -4,6 +4,8 @@ import { prismaAdapter } from "better-auth/adapters/prisma";
 import { env } from "@/config/env";
 import { sendWelcomeEmail } from "@/lib/actions/email";
 
+const isProd = env.NODE_ENV === "production";
+
 export const auth = betterAuth({
   database: prismaAdapter(db, {
     provider: "postgresql",
@@ -14,6 +16,17 @@ export const auth = betterAuth({
     storeSessionInDatabase: true,
     preserveSessionInDatabase: true,
   },
+  advanced: {
+    useSecureCookies: isProd,
+    cookies: {
+      state: {
+        attributes: {
+          sameSite: isProd ? "none" : "lax",
+          secure: isProd,
+        },
+      },
+    },
+  },
   socialProviders: {
     google: {
       clientId: env.GOOGLE_CLIENT_ID || "",

apps/web/app/providers.tsx

@@ -9,7 +9,7 @@ const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
       staleTime: 60 * 1000,
-      gcTime: 1000 * 60 * 30, // 30 minutes
+      gcTime: 1000 * 60 * 30,
     },
   },
 });

apps/web/config/env.ts

@@ -1,6 +1,6 @@
 export const env = {
   apiBase: process.env.NEXT_PUBLIC_API_URL,
   appBase: process.env.NEXT_PUBLIC_APP_URL,
-  FLAGIX_SDK_API_KEY: process.env.FLAGIX_SDK_API_KEY,
-  FLAGIX_SDK_BASE_URL: process.env.FLAGIX_SDK_BASE_URL,
+  FLAGIX_SDK_API_KEY: process.env.NEXT_PUBLIC_FLAGIX_SDK_API_KEY,
+  FLAGIX_SDK_BASE_URL: process.env.NEXT_PUBLIC_FLAGIX_SDK_BASE_URL,
 };