Merge pull request #128 from rmarscher/lucia-enable-tokens-check

[Lucia] Fix to setting cookies
timothymiller · Dec 21, 2023 · 325b5e5 · 325b5e5
2 parents 90a537e + 7ecc3f7
commit 325b5e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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 }