null/undefined do not override values, we have to omit them from …

…`default.ts`
ducompsoc · Oct 29, 2024 · 0e189d6 · 0e189d6
1 parent 026da66
commit 0e189d6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/server/config/default.ts b/server/config/default.ts
@@ -15,7 +15,6 @@ export default {
     options: {
       cookieOptions: {
         name: "durhack-megateams.x-csrf-token",
-        domain: "megateams.durhack-dev.com",
         sameSite: "strict",
         path: "/",
         secure: false,
@@ -28,7 +27,6 @@ export default {
   session: {
     cookie: {
       name: "durhack-megateams-session",
-      domain: "megateams.durhack-dev.com",
       sameSite: "lax",
       path: "/",
       secure: false,

diff --git a/server/config/development.ts b/server/config/development.ts
@@ -0,0 +1,18 @@
+import type { DeepPartial } from "@server/types/deep-partial"
+import type { ConfigIn } from "@server/config/schema"
+
+export default {
+  csrf: {
+    options: {
+      cookieOptions: {
+        domain: "megateams.durhack-dev.com",
+      },
+    },
+  },
+  session: {
+    cookie: {
+      domain: "megateams.durhack-dev.com",
+    },
+  },
+} satisfies DeepPartial<ConfigIn>
+
diff --git a/server/config/production.ts b/server/config/production.ts
@@ -9,7 +9,6 @@ export default {
     options: {
       cookieOptions: {
         name: "__Host-durhack-megateams.x-csrf-token",
-        domain: null,
         path: "/",
         secure: true,
         sameSite: "strict",
@@ -19,7 +18,6 @@ export default {
   session: {
     cookie: {
       name: "__Host-durhack-megateams-session",
-      domain: null,
       path: "/",
       secure: true,
       sameSite: "lax",