changed stuff

Author: breadddevv

lib/withAuth.ts

@@ -80,7 +80,7 @@ export function withAuth(
             "session_token=",
             "Path=/",
             "HttpOnly",
-            "SameSite=Strict",
+            "SameSite=lax",
             "Secure",
             "Max-Age=0",
           ].join("; "),
@@ -231,7 +231,7 @@ export function withAuthSsr<
             "session_token=",
             "Path=/",
             "HttpOnly",
-            "SameSite=Strict",
+            "SameSite=lax",
             "Secure",
             "Max-Age=0",
           ].join("; "),

pages/api/auth/discord/callback.ts

@@ -115,6 +115,8 @@ export default async function handler(
       where: { discordUserId },
     });
 
+    console.log(existingDiscord)
+    console.log(req)
 
     const cookies = cookie.parse(req.headers.cookie || "")
     const sessionToken = cookies.session_token
@@ -163,13 +165,13 @@ export default async function handler(
 
     res.setHeader(
       "Set-Cookie",
-      `session_token=${session.token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${60 * 60 * 24 * 7
-      }; ${process.env.NODE_ENV === "production" ? "Secure;" : ""}`
+      `session_token=${session.token}; Path=/; HttpOnly; SameSite=lax; Max-Age=${60 * 60 * 24 * 7}; ${process.env.NODE_ENV === "production" ? "Secure;" : ""}`
     )
 
     return res.redirect("/")
   } catch (err) {
     console.error("Discord OAuth error:", err)
+    console.log("hi")
 
     if (axios.isAxiosError(err)) {
       console.error(err.response?.data)

pages/api/auth/google/callback.ts

@@ -175,7 +175,7 @@ export default async function handler(req: AuthenticatedRequest, res: NextApiRes
 
     res.setHeader(
       "Set-Cookie",
-      `session_token=${session.token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${60 * 60 * 24 * 30}`
+      `session_token=${session.token}; Path=/; HttpOnly; SameSite=lax; Max-Age=${60 * 60 * 24 * 30}`
     )
 
     return res.redirect("/")

pages/api/auth/login.ts

@@ -167,7 +167,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse<Response>) {
       req.headers["user-agent"]
     )
 
-    res.setHeader('Set-Cookie', `session_token=${session.token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${60 * 60 * 24 * 30}`)
+    res.setHeader('Set-Cookie', `session_token=${session.token}; Path=/; HttpOnly; SameSite=lax; Max-Age=${60 * 60 * 24 * 30}`)
 
     const tovyuser: User = {
       userId: id,

pages/api/auth/logout.ts

@@ -23,7 +23,7 @@ export async function handler(
         "session_token=;",
         "Path=/;",
         "HttpOnly;",
-        "SameSite=Strict;",
+        "SameSite=lax;",
         "Max-Age=0;",
         process.env.NODE_ENV === "production" ? "Secure;" : "",
       ].join(" ")

pages/api/auth/roblox/callback.ts

@@ -163,7 +163,7 @@ export default async function handler(
 
     res.setHeader(
       'Set-Cookie',
-      `session_token=${session.token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${
+      `session_token=${session.token}; Path=/; HttpOnly; SameSite=lax; Max-Age=${
         60 * 60 * 24 * 30
       }; ${process.env.NODE_ENV === 'production' ? 'Secure;' : ''}`
     )

pages/api/auth/roblox/start.ts

@@ -15,7 +15,7 @@ export default async function handler(req: AuthenticatedRequest, res: NextApiRes
 	let clientId: string | undefined;
 	let redirectUri: string | undefined;
 	clientId = process.env.ROBLOX_CLIENT_ID;
-	redirectUri = `${process.env.PLANETARY_CLOUD_URL ? `https://${process.env.PLANETARY_CLOUD_URL}` : process.env.NEXTAUTH_URL || process.env.PUBLIC_URL}/api/auth/discord/callback`;
+	redirectUri = `${process.env.PLANETARY_CLOUD_URL ? `https://${process.env.PLANETARY_CLOUD_URL}` : process.env.NEXTAUTH_URL || process.env.PUBLIC_URL}/api/auth/roblox/callback`;
   if (!clientId || !redirectUri) {
 		try {
 			const configs = await prisma.instanceConfig.findMany({

pages/api/auth/signup/finish.ts

@@ -93,7 +93,7 @@ export default async function handler(
       req.headers['user-agent']
     );
 
-    res.setHeader('Set-Cookie', `session_token=${session.token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${60 * 60 * 24 * 30}`);
+    res.setHeader('Set-Cookie', `session_token=${session.token}; Path=/; HttpOnly; SameSite=lax; Max-Age=${60 * 60 * 24 * 30}`);
 
     return res.status(200).json({ success: true });
   } catch (error) {

pages/api/setupworkspace.ts

@@ -131,11 +131,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       req.headers['user-agent']
     )
 
-    res.setHeader('Set-Cookie', `session_token=${session.token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${60 * 60 * 24 * 7}`)
+    res.setHeader('Set-Cookie', `session_token=${session.token}; Path=/; HttpOnly; SameSite=lax; Max-Age=${60 * 60 * 24 * 7}`)
 
     res.setHeader('Set-Cookie', [
-      `session_token=${session.token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${60 * 60 * 24 * 30}`,
-      `app_setup=true; Path=/; HttpOnly; SameSite=Strict`,
+      `session_token=${session.token}; Path=/; HttpOnly; SameSite=lax; Max-Age=${60 * 60 * 24 * 30}`,
+      `app_setup=true; Path=/; HttpOnly; SameSite=lax`,
     ])
 
     await setRegistry(req.headers.host as string);

pages/api/user/account.ts

@@ -55,7 +55,7 @@ export async function handler(req: AuthenticatedRequest, res: NextApiResponse) {
       'session_token=',
       'Path=/',
       'HttpOnly',
-      'SameSite=Strict',
+      'SameSite=lax',
       'Secure',
       'Max-Age=0',
     ].join('; '))