Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

Revert "♻️ Update how guest session is handled"

Luke Vella41f85279bb6a
diff --git a/apps/web/src/components/user-provider.tsx b/apps/web/src/components/user-provider.tsx
index a263a54af..778d3c131 100644
--- a/apps/web/src/components/user-provider.tsx
+++ b/apps/web/src/components/user-provider.tsx
@@ -71,6 +71,11 @@ 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 a9f3dd502..de148d4e0 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`;
+ } 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: "/",
- });
+ res.cookies.set({
+ name,
+ value: token,
+ httpOnly: true,
+ secure,
+ sameSite: "lax",
+ path: "/",
+ });
+ }
}
}