sigh

skillrecordings · Dec 18, 2024 · 6a64598 · 6a64598
1 parent d368956
commit 6a64598
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/apps/epic-web/src/server/get-middleware-response.ts b/apps/epic-web/src/server/get-middleware-response.ts
@@ -28,8 +28,5 @@ export async function getMiddlewareResponse(req: NextRequest) {
     }
   }
 
-  // Delete ck_subscriber cookie if it exists
-  response.cookies.delete('ck_subscriber')
-
   return response
 }
diff --git a/apps/epic-web/src/server/user-cookies.ts b/apps/epic-web/src/server/user-cookies.ts
@@ -3,7 +3,7 @@ import {Subscriber} from 'schemas/subscriber'
 
 export function setUserCookie(res: NextResponse, subscriber: Subscriber) {
   if (subscriber) {
-    res.cookies.set('ck_subscriber', JSON.stringify(subscriber), {
+    res.cookies.set('ck_subscriber', JSON.stringify(deepOmitNull(subscriber)), {
       secure: process.env.NODE_ENV === 'production',
       path: '/',
       httpOnly: true,
@@ -18,3 +18,21 @@ export function setUserCookie(res: NextResponse, subscriber: Subscriber) {
 export function clearUserCookie(res: NextResponse) {
   res.cookies.delete('ck_subscriber')
 }
+
+function deepOmitNull(obj: any): any {
+  if (Array.isArray(obj)) {
+    return obj.map(deepOmitNull).filter((x) => x !== null)
+  }
+
+  if (obj && typeof obj === 'object') {
+    return Object.entries(obj).reduce((acc, [key, value]) => {
+      const cleaned = deepOmitNull(value)
+      if (cleaned !== null) {
+        acc[key] = cleaned
+      }
+      return acc
+    }, {} as Record<string, any>)
+  }
+
+  return obj === null ? undefined : obj
+}
diff --git a/apps/total-typescript/src/server/user-cookies.ts b/apps/total-typescript/src/server/user-cookies.ts
@@ -3,7 +3,7 @@ import {Subscriber} from '@skillrecordings/skill-lesson/schemas/subscriber'
 
 export function setUserCookie(res: NextResponse, subscriber: Subscriber) {
   if (subscriber) {
-    res.cookies.set('ck_subscriber', JSON.stringify(subscriber), {
+    res.cookies.set('ck_subscriber', JSON.stringify(deepOmitNull(subscriber)), {
       secure: process.env.NODE_ENV === 'production',
       path: '/',
       httpOnly: true,
@@ -18,3 +18,21 @@ export function setUserCookie(res: NextResponse, subscriber: Subscriber) {
 export function clearUserCookie(res: NextResponse) {
   res.cookies.delete('ck_subscriber')
 }
+
+function deepOmitNull(obj: any): any {
+  if (Array.isArray(obj)) {
+    return obj.map(deepOmitNull).filter((x) => x !== null)
+  }
+
+  if (obj && typeof obj === 'object') {
+    return Object.entries(obj).reduce((acc, [key, value]) => {
+      const cleaned = deepOmitNull(value)
+      if (cleaned !== null) {
+        acc[key] = cleaned
+      }
+      return acc
+    }, {} as Record<string, any>)
+  }
+
+  return obj === null ? undefined : obj
+}