From 7ecc3f7ea366f4f250e890c472e0c57ce4e5969a Mon Sep 17 00:00:00 2001
From: Rob Marscher <rob@robmarscher.com>
Date: Wed, 20 Dec 2023 20:14:32 -0500
Subject: [PATCH] Fix enableTokens check

---
 packages/api/src/auth/user.ts   | 2 +-
 packages/api/src/routes/user.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/api/src/auth/user.ts b/packages/api/src/auth/user.ts
index fb2cdc785..fc4246fd5 100644
--- a/packages/api/src/auth/user.ts
+++ b/packages/api/src/auth/user.ts
@@ -168,7 +168,7 @@ export const signInWithEmail = async (
     await updatePassword(ctx, email, password)
   }
   const session = await createSession(ctx.auth, authMethod.userId)
-  if (setCookie) {
+  if (!ctx.enableTokens && setCookie) {
     const cookie = ctx.auth.createSessionCookie(session.id)
     setCookie(cookie.serialize())
   }
diff --git a/packages/api/src/routes/user.ts b/packages/api/src/routes/user.ts
index 304ec8ed9..1afe55975 100644
--- a/packages/api/src/routes/user.ts
+++ b/packages/api/src/routes/user.ts
@@ -186,7 +186,7 @@ const signInWithAppleIdTokenHandler =
       idTokenClaims: payload,
     })
     const session = await createSession(ctx.auth, user.id)
-    if (ctx.enableTokens && ctx.setCookie) {
+    if (!ctx.enableTokens && ctx.setCookie) {
       ctx.setCookie(ctx.auth.createSessionCookie(session.id).serialize())
     }
     return { session }
@@ -247,7 +247,7 @@ const signInWithEmailCodeHandler =
       console.log('calling update passing and invalidate sessions')
       await ctx.auth.invalidateUserSessions(res.session?.userId)
       const session = await createSession(ctx.auth, res.session?.userId)
-      if (ctx.enableTokens && ctx.setCookie) {
+      if (!ctx.enableTokens && ctx.setCookie) {
         ctx.setCookie(ctx.auth.createSessionCookie(session.id).serialize())
       }
       res.session = session
@@ -342,7 +342,7 @@ export const userRouter = router({
         email: input.email,
       })
       const session = await createSession(ctx.auth, user.id)
-      if (ctx.enableTokens && ctx.setCookie) {
+      if (!ctx.enableTokens && ctx.setCookie) {
         ctx.setCookie(ctx.auth.createSessionCookie(session.id).serialize())
       }
       return { session }