From 96280b6d71ea5326e487956cc31ff2d0f20f5112 Mon Sep 17 00:00:00 2001
From: Nathaniel Tampus <contact@nize.ph>
Date: Mon, 6 Feb 2023 14:48:31 +0800
Subject: [PATCH] env variables for easier dev setup

---
 server/src/middleware/session.ts | 9 +++------
 server/src/server.ts             | 8 ++++++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/server/src/middleware/session.ts b/server/src/middleware/session.ts
index cf9c7c2..f20d8c4 100644
--- a/server/src/middleware/session.ts
+++ b/server/src/middleware/session.ts
@@ -19,10 +19,7 @@ declare module "http" {
     }
 }
 const sessionMiddleware = session({
-    store: new PGSession({
-        pool: db,
-        createTableIfMissing: true
-    }),
+    store: new PGSession({ pool: db, createTableIfMissing: true }),
     secret: process.env.SESSION_SECRET || "whatever this is",
     resave: false,
     saveUninitialized: false,
@@ -30,9 +27,9 @@ const sessionMiddleware = session({
     proxy: true,
     cookie: {
         maxAge: 30 * 24 * 60 * 60 * 1000, // 30 days
-        secure: true,
+        secure: process.env.NODE_ENV === "production" ? true : false,
         httpOnly: true,
-        sameSite: "none"
+        sameSite: process.env.NODE_ENV === "production" ? "none" : "lax"
     },
     genid: function () {
         return nanoid(21);
diff --git a/server/src/server.ts b/server/src/server.ts
index fe6dc7a..66e427b 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -1,6 +1,5 @@
 import "dotenv/config";
 import cors from "cors";
-const corsConfig = { origin: "https://ches.su", credentials: true };
 
 import express, { Request, Response, NextFunction } from "express";
 import { createServer } from "http";
@@ -11,6 +10,11 @@ import { db } from "./db";
 
 import routes from "./routes";
 
+const corsConfig = {
+    origin: process.env.CORS_ORIGIN || "http://localhost:3000",
+    credentials: true
+};
+
 const app = express();
 const server = createServer(app);
 
@@ -40,7 +44,7 @@ io.use((socket, next) => {
 });
 initSocket();
 
-const port = process.env.PORT || 3000;
+const port = process.env.PORT || 3001;
 server.listen(port, () => {
     console.log(`listening on :${port}`);
 });