Skip to content

fix: preserve user metadata when email_confirm=true in Confirm function #2089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: preserve user metadata when email_confirm=true in Confirm function #2089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions internal/models/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,9 +449,24 @@ func (u *User) Confirm(tx *storage.Connection) error {
return err
}

if err := u.UpdateUserMetaData(tx, map[string]interface{}{
"email_verified": true,
}); err != nil {
// 1. Reload the user state from the database to get the most recent
// metadata, including any changes made by database triggers.
latestUser, err := FindUserByID(tx, u.ID)
if err != nil {
return err
}

// 2. Prepare the metadata for update. Start with the fresh data from the database.
metaDataToUpdate := latestUser.UserMetaData
if metaDataToUpdate == nil {
metaDataToUpdate = make(map[string]interface{})
}
metaDataToUpdate["email_verified"] = true

// 3. Now, call the existing UpdateUserMetaData function.
// This will correctly update the user's metadata without data loss,
// and it also updates the in-memory user object 'u' for consistency.
if err := u.UpdateUserMetaData(tx, metaDataToUpdate); err != nil {
return err
}

Expand Down