From b5c20533d254035d3d3eebb523df3ab6ad7789d7 Mon Sep 17 00:00:00 2001
From: Luke Vella <me@lukevella.com>
Date: Sat, 4 Nov 2023 18:29:59 +0000
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Update=20how=20guest=20ses?=
 =?UTF-8?q?sion=20is=20handled?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/components/user-provider.tsx |  5 ---
 apps/web/src/middleware.ts                | 44 +++++++++++------------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/apps/web/src/components/user-provider.tsx b/apps/web/src/components/user-provider.tsx
index 778d3c131..a263a54af 100644
--- a/apps/web/src/components/user-provider.tsx
+++ b/apps/web/src/components/user-provider.tsx
@@ -71,11 +71,6 @@ export const UserProvider = (props: { children?: React.ReactNode }) => {
           token: legacyToken,
           redirect: false,
         });
-      } else {
-        // End: Legacy token migration
-        signIn("guest", {
-          redirect: false,
-        });
       }
     },
   });
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index de148d4e0..a9f3dd502 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -62,29 +62,29 @@ export default withAuth(
             value: legacyToken.value,
             httpOnly: false,
           });
-        } else {
-          // Create new guest user
-          const newUser = `user-${randomid()}`;
-          const token = await encode({
-            token: {
-              sub: newUser,
-              email: null,
-            },
-            secret: process.env.SECRET_PASSWORD,
-          });
-          const secure = process.env.NODE_ENV === "production";
-          const prefix = secure ? "__Secure-" : "";
-          const name = `${prefix}next-auth.session-token`;
-
-          res.cookies.set({
-            name,
-            value: token,
-            httpOnly: true,
-            secure,
-            sameSite: "lax",
-            path: "/",
-          });
         }
+      } else {
+        // Create new guest user
+        const newUser = `user-${randomid()}`;
+        const token = await encode({
+          token: {
+            sub: newUser,
+            email: null,
+          },
+          secret: process.env.SECRET_PASSWORD,
+        });
+        const secure = process.env.NODE_ENV === "production";
+        const prefix = secure ? "__Secure-" : "";
+        const name = `${prefix}next-auth.session-token`;
+
+        res.cookies.set({
+          name,
+          value: token,
+          httpOnly: true,
+          secure,
+          sameSite: "lax",
+          path: "/",
+        });
       }
     }