diff options
Diffstat (limited to 'internal/processing/user')
| -rw-r--r-- | internal/processing/user/changepassword.go | 2 | ||||
| -rw-r--r-- | internal/processing/user/emailconfirm.go | 4 | ||||
| -rw-r--r-- | internal/processing/user/emailconfirm_test.go | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/internal/processing/user/changepassword.go b/internal/processing/user/changepassword.go index ddfec6898..856e92bdc 100644 --- a/internal/processing/user/changepassword.go +++ b/internal/processing/user/changepassword.go @@ -45,7 +45,7 @@ func (p *processor) ChangePassword(ctx context.Context, user *gtsmodel.User, old user.EncryptedPassword = string(newPasswordHash) user.UpdatedAt = time.Now() - if err := p.db.UpdateByPrimaryKey(ctx, user, "encrypted_password", "updated_at"); err != nil { + if err := p.db.UpdateByID(ctx, user, user.ID, "encrypted_password", "updated_at"); err != nil { return gtserror.NewErrorInternalError(err, "database error") } diff --git a/internal/processing/user/emailconfirm.go b/internal/processing/user/emailconfirm.go index 5a68383b8..82124007c 100644 --- a/internal/processing/user/emailconfirm.go +++ b/internal/processing/user/emailconfirm.go @@ -77,7 +77,7 @@ func (p *processor) SendConfirmEmail(ctx context.Context, user *gtsmodel.User, u user.LastEmailedAt = time.Now() user.UpdatedAt = time.Now() - if err := p.db.UpdateByPrimaryKey(ctx, user, updatingColumns...); err != nil { + if err := p.db.UpdateByID(ctx, user, user.ID, updatingColumns...); err != nil { return fmt.Errorf("SendConfirmEmail: error updating user entry after email sent: %s", err) } @@ -126,7 +126,7 @@ func (p *processor) ConfirmEmail(ctx context.Context, token string) (*gtsmodel.U user.ConfirmationToken = "" user.UpdatedAt = time.Now() - if err := p.db.UpdateByPrimaryKey(ctx, user, updatingColumns...); err != nil { + if err := p.db.UpdateByID(ctx, user, user.ID, updatingColumns...); err != nil { return nil, gtserror.NewErrorInternalError(err) } diff --git a/internal/processing/user/emailconfirm_test.go b/internal/processing/user/emailconfirm_test.go index 87aff9756..4e31a3646 100644 --- a/internal/processing/user/emailconfirm_test.go +++ b/internal/processing/user/emailconfirm_test.go @@ -74,7 +74,7 @@ func (suite *EmailConfirmTestSuite) TestConfirmEmail() { user.ConfirmationSentAt = time.Now().Add(-5 * time.Minute) user.ConfirmationToken = "1d1aa44b-afa4-49c8-ac4b-eceb61715cc6" - err := suite.db.UpdateByPrimaryKey(ctx, user, updatingColumns...) + err := suite.db.UpdateByID(ctx, user, user.ID, updatingColumns...) suite.NoError(err) // confirm with the token set above @@ -102,7 +102,7 @@ func (suite *EmailConfirmTestSuite) TestConfirmEmailOldToken() { user.ConfirmationSentAt = time.Now().Add(-192 * time.Hour) user.ConfirmationToken = "1d1aa44b-afa4-49c8-ac4b-eceb61715cc6" - err := suite.db.UpdateByPrimaryKey(ctx, user, updatingColumns...) + err := suite.db.UpdateByID(ctx, user, user.ID, updatingColumns...) suite.NoError(err) // confirm with the token set above |