Skip to content

feat: fix missing email, phone identities when updating password #2141

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

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

feat: fix missing email, phone identities when updating password #2141

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
34 changes: 34 additions & 0 deletions internal/api/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
"net/http"
"time"

"github.com/fatih/structs"
"github.com/gofrs/uuid"
"github.com/supabase/auth/internal/api/apierrors"
"github.com/supabase/auth/internal/api/provider"
"github.com/supabase/auth/internal/api/sms_provider"
"github.com/supabase/auth/internal/mailer"
"github.com/supabase/auth/internal/models"
Expand Down Expand Up @@ -190,6 +192,38 @@
sessionID = &session.ID
}

emailIdentity, terr := models.FindIdentityByIdAndProvider(tx, user.ID.String(), "email")
if terr != nil && !models.IsNotFoundError(terr) {
return apierrors.NewInternalServerError("Error looking up email identity for user during password change").WithInternalError(terr)
}

phoneIdentity, terr := models.FindIdentityByIdAndProvider(tx, user.ID.String(), "phone")
if terr != nil && !models.IsNotFoundError(terr) {
return apierrors.NewInternalServerError("Error looking up phone identity for user during password change").WithInternalError(terr)
}

if emailIdentity == nil && user.GetEmail() != "" {
emailIdentity, terr = a.createNewIdentity(tx, user, "email", structs.Map(provider.Claims{

Check failure on line 206 in internal/api/user.go

View workflow job for this annotation

GitHub Actions / test 

this value of emailIdentity is never used (SA4006)
Subject: user.ID.String(),
Email: user.GetEmail(),
EmailVerified: user.IsConfirmed() || config.Mailer.Autoconfirm,
}))
if terr != nil {
return apierrors.NewInternalServerError("Error creating missing email identity during password change").WithInternalError(terr)
}
}

if phoneIdentity == nil && user.GetPhone() != "" {
phoneIdentity, terr = a.createNewIdentity(tx, user, "phone", structs.Map(provider.Claims{

Check failure on line 217 in internal/api/user.go

View workflow job for this annotation

GitHub Actions / test 

this value of phoneIdentity is never used (SA4006)
Subject: user.ID.String(),
Phone: user.GetPhone(),
PhoneVerified: user.IsPhoneConfirmed() || config.Sms.Autoconfirm,
}))
if terr != nil {
return apierrors.NewInternalServerError("Error creating missing phone identity during password change").WithInternalError(terr)
}
}

if terr = user.UpdatePassword(tx, sessionID); terr != nil {
return apierrors.NewInternalServerError("Error during password storage").WithInternalError(terr)
}
Expand Down
Loading