github-starred/better-auth
2
0
Fork 0
mirror of https://github.com/better-auth/better-auth.git synced 2026-07-16 23:20:14 -05:00
Code Issues 2.5k Packages Projects Releases 112 Wiki Activity

[PR #5810] fix(email-verification): set emailVerified to true upon email verification #6241

New Issue
Open
opened 2026-03-13 12:52:07 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-03-13 12:52:07 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/better-auth/better-auth/pull/5810
Author: @Ipriyankrajai
Created: 11/6/2025
Status: 🔄 Open

Base: canary ← Head: fix/change-email-verified

📝 Commits (3)

  • 3759878 fix(email-verification): set emailVerified to true upon email verification
  • 5981c12 refactor(email-verification): remove email verification token generation and email sending logic
  • ddfe086 fix(email-verification): update emailVerified status to true after verification

📊 Changes

2 files changed (+3 additions, -21 deletions)

View changed files

📝 packages/better-auth/src/api/routes/email-verification.test.ts (+1 -1)
📝 packages/better-auth/src/api/routes/email-verification.ts (+2 -20)

📄 Description

Fix: Remove redundant email verification when changing email

Problem

When a user with a verified email changes their email address, the system was sending two verification emails:

  1. First email (from changeEmail endpoint): Sent via sendChangeEmailVerification callback to the new email address to confirm the email change request
  2. Second email (from verifyEmail endpoint): After clicking the first verification link, a second verification email was automatically sent to the new email address again

This created an unnecessary extra step in the email change flow - the user had to verify their new email twice.

Solution

When a user verifies an email change request (by clicking the link sent to their new email), we now:

  • ✅ Update the email address to the new email
  • ✅ Set emailVerified: true immediately
  • ❌ Remove the redundant second verification email

Why This Makes Sense

The verification flow already ensures the user owns the new email:

  1. The user must be logged in (session required) to change their email
  2. The verification email is sent to the new email address via sendChangeEmailVerification (lines 793-801 in update-user.ts)
  3. Clicking the verification link sent to the new email confirms the user has access to that email address

Since the user has already verified their ownership of the new email by clicking the verification link sent to it, there's no need for an additional verification email. The act of verifying the change request is sufficient verification of the new email. This matches the pattern used for unverified email changes (lines 744-767 in update-user.ts), where a single verification email to the new address is sufficient.

Changes

  • Updated verifyEmail endpoint to set emailVerified: true when processing email changes (when updateTo is present in the token)
  • Removed the redundant token creation and second verification email sending logic

Related Code

  • packages/better-auth/src/api/routes/email-verification.ts - Removed redundant verification email logic
  • packages/better-auth/src/api/routes/update-user.ts - Already sends the initial change email verification (lines 751-760)

Summary by cubic

Stop sending a second verification email after users confirm an email change. When the user clicks the change-email verification link, we update their email and mark it verified immediately.

  • Bug Fixes
    • Set emailVerified: true in verifyEmail when processing email changes.
    • Removed token generation and follow-up verification email to the new address.
    • Updated session cookie to reflect the new email with emailVerified: true.

Written for commit ddfe08660e. Summary will update automatically on new commits.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/better-auth/better-auth/pull/5810 **Author:** [@Ipriyankrajai](https://github.com/Ipriyankrajai) **Created:** 11/6/2025 **Status:** 🔄 Open **Base:** `canary` ← **Head:** `fix/change-email-verified` --- ### 📝 Commits (3) - [`3759878`](https://github.com/better-auth/better-auth/commit/37598781ed5945da7cbb30768cece3a11cb386c5) fix(email-verification): set emailVerified to true upon email verification - [`5981c12`](https://github.com/better-auth/better-auth/commit/5981c12f87ff6e6caab9b3e283c78c37b3019dbc) refactor(email-verification): remove email verification token generation and email sending logic - [`ddfe086`](https://github.com/better-auth/better-auth/commit/ddfe08660efed9767700bf87df415c2da6e1a1ed) fix(email-verification): update emailVerified status to true after verification ### 📊 Changes **2 files changed** (+3 additions, -21 deletions) <details> <summary>View changed files</summary> 📝 `packages/better-auth/src/api/routes/email-verification.test.ts` (+1 -1) 📝 `packages/better-auth/src/api/routes/email-verification.ts` (+2 -20) </details> ### 📄 Description # Fix: Remove redundant email verification when changing email ## Problem When a user with a verified email changes their email address, the system was sending **two verification emails**: 1. **First email** (from `changeEmail` endpoint): Sent via `sendChangeEmailVerification` callback to the **new email address** to confirm the email change request 2. **Second email** (from `verifyEmail` endpoint): After clicking the first verification link, a second verification email was automatically sent to the **new email address** again This created an unnecessary extra step in the email change flow - the user had to verify their new email twice. ## Solution When a user verifies an email change request (by clicking the link sent to their new email), we now: - ✅ Update the email address to the new email - ✅ Set `emailVerified: true` immediately - ❌ **Remove** the redundant second verification email ## Why This Makes Sense The verification flow already ensures the user owns the new email: 1. The user must be **logged in** (session required) to change their email 2. The verification email is sent to the **new email address** via `sendChangeEmailVerification` (lines 793-801 in `update-user.ts`) 3. Clicking the verification link sent to the new email confirms the user has access to that email address Since the user has already verified their ownership of the new email by clicking the verification link sent to it, there's no need for an additional verification email. The act of verifying the change request **is** sufficient verification of the new email. This matches the pattern used for unverified email changes (lines 744-767 in `update-user.ts`), where a single verification email to the new address is sufficient. ## Changes - Updated `verifyEmail` endpoint to set `emailVerified: true` when processing email changes (when `updateTo` is present in the token) - Removed the redundant token creation and second verification email sending logic ## Related Code - `packages/better-auth/src/api/routes/email-verification.ts` - Removed redundant verification email logic - `packages/better-auth/src/api/routes/update-user.ts` - Already sends the initial change email verification (lines 751-760) <!-- This is an auto-generated description by cubic. --> --- ## Summary by cubic Stop sending a second verification email after users confirm an email change. When the user clicks the change-email verification link, we update their email and mark it verified immediately. - **Bug Fixes** - Set emailVerified: true in verifyEmail when processing email changes. - Removed token generation and follow-up verification email to the new address. - Updated session cookie to reflect the new email with emailVerified: true. <sup>Written for commit ddfe08660efed9767700bf87df415c2da6e1a1ed. Summary will update automatically on new commits.</sup> <!-- End of auto-generated description by cubic. --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-03-13 12:52:07 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
adapter
astro
awaiting external contributor
blocked
breaking
breaking change
bug
c-devops
core
credentials
database
dependencies
devops
devtools
docs
documentation
duplicate
elysia
enhancement
enterprise
expo
express
fastify
good first issue
help wanted
hono
identity
infra
integration
invalid
javascript
locked
maintenance
need-more-information
needs: info
needs: repro
nextjs
nuxt
oauth
organization
P0
payments
perf
platform
plugin
pull-request
Mirrored from GitHub Pull Request
 question
ready
regression
remix
security
social-provider
solid
stale
svelte
tanstack-start
tracking
version-bump
vue
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/better-auth#6241
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?