Skip to content

fix(phone): set phone_verified when a phone number is confirmed #2690

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
kanakkholwal wants to merge 4 commits into
base: master
Choose a base branch
from
+56 −0
Open

fix(phone): set phone_verified when a phone number is confirmed #2690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1684b7f
feat(phone): update user metadata and identity data on phone confirma…
kanakkholwal Aug 9, 2026
3163df0
fix(phone): set phone_verified when a phone number is confirmed
kanakkholwal Aug 9, 2026
dacf7c0
Merge branch 'fix/phone-verified-1906' of https://github.com/kanakkho…
kanakkholwal Aug 9, 2026
82095b2
fix(phone): update phone_verified metadata when unlinking identity
kanakkholwal Aug 9, 2026
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
5 changes: 5 additions & 0 deletions internal/api/identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ func (a *API) DeleteIdentity(w http.ResponseWriter, r *http.Request) error {
if terr := tx.UpdateOnly(user, "phone_confirmed_at"); terr != nil {
return apierrors.NewInternalServerError("Database error updating user phone").WithInternalError(terr)
}
if terr := user.UpdateUserMetaData(tx, map[string]interface{}{
"phone_verified": false,
}); terr != nil {
return apierrors.NewInternalServerError("Database error updating user phone metadata").WithInternalError(terr)
}
default:
if terr := user.UpdateUserEmailFromIdentities(tx); terr != nil {
if models.IsUniqueConstraintViolatedError(terr) {
Expand Down
1 change: 1 addition & 0 deletions internal/api/identity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ func (ts *IdentityTestSuite) TestUnlinkIdentity() {
case "phone":
require.Equal(ts.T(), "", u.GetPhone())
require.Nil(ts.T(), u.PhoneConfirmedAt)
require.Equal(ts.T(), false, u.UserMetaData["phone_verified"])
case "email":
require.Equal(ts.T(), "", u.GetEmail())
require.Nil(ts.T(), u.EmailConfirmedAt)
Expand Down
24 changes: 24 additions & 0 deletions internal/models/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,24 @@ func (u *User) ConfirmPhone(tx *storage.Connection) error {
return err
}

if err := u.UpdateUserMetaData(tx, map[string]any{
"phone_verified": true,
}); err != nil {
return err
}

identity, err := FindIdentityByIdAndProvider(tx, u.ID.String(), "phone")
if err != nil {
if !IsNotFoundError(err) {
return err
}
} else if err := identity.UpdateIdentityData(tx, map[string]interface{}{
"phone": u.GetPhone(),
"phone_verified": true,
}); err != nil {
return err
}

return ClearAllOneTimeTokensForUser(tx, u.ID)
}

Expand Down Expand Up @@ -633,6 +651,12 @@ func (u *User) ConfirmPhoneChange(tx *storage.Connection) error {
return err
}

if err := u.UpdateUserMetaData(tx, map[string]interface{}{
"phone_verified": true,
Comment thread
depthfirst-app[bot] marked this conversation as resolved.
}); err != nil {
return err
}

identity, err := FindIdentityByIdAndProvider(tx, u.ID.String(), "phone")
if err != nil {
if IsNotFoundError(err) {
Expand Down
26 changes: 26 additions & 0 deletions internal/models/user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,32 @@ func (ts *UserTestSuite) TestConfirmPhoneChange() {

require.NotNil(ts.T(), identity.IdentityData)
require.Equal(ts.T(), identity.IdentityData["phone"], "987654321")
require.Equal(ts.T(), true, user.UserMetaData["phone_verified"])
}

func (ts *UserTestSuite) TestConfirmPhone() {
user, err := NewUser("123456789", "", "", "authenticated", map[string]interface{}{
"phone_verified": false,
})
require.NoError(ts.T(), err)
require.NoError(ts.T(), ts.db.Create(user))

identity, err := NewIdentity(user, "phone", map[string]interface{}{
"sub": user.ID.String(),
"phone_verified": false,
})
require.NoError(ts.T(), err)
require.NoError(ts.T(), ts.db.Create(identity))

require.NoError(ts.T(), user.ConfirmPhone(ts.db))

require.NotNil(ts.T(), user.PhoneConfirmedAt)
require.Equal(ts.T(), true, user.UserMetaData["phone_verified"])

identity, err = FindIdentityByIdAndProvider(ts.db, user.ID.String(), "phone")
require.NoError(ts.T(), err)
require.Equal(ts.T(), true, identity.IdentityData["phone_verified"])
require.Equal(ts.T(), "123456789", identity.IdentityData["phone"])
}

func (ts *UserTestSuite) TestUpdateUserEmailSuccess() {
Expand Down