IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 10:20:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Remove result field from notifications (#65170)

Browse Source 
* remove result field from notifications

* fix test
This commit is contained in:
Serge Zaitsev 2023-03-28 13:44:15 +02:00 committed by GitHub
parent 352967f092
commit b2ab57d14b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/password.go
View File

@ -70,7 +70,8 @@ func (hs *HTTPServer) ResetPassword(c *contextmodel.ReqContext) response.Respons
return usr, err return usr, err
} }
if err := hs.NotificationService.ValidateResetPasswordCode(c.Req.Context(), &query, getUserByLogin); err != nil { userResult, err := hs.NotificationService.ValidateResetPasswordCode(c.Req.Context(), &query, getUserByLogin)
if err != nil {
if errors.Is(err, notifications.ErrInvalidEmailCode) { if errors.Is(err, notifications.ErrInvalidEmailCode) {
return response.Error(400, "Invalid or expired reset password code", nil) return response.Error(400, "Invalid or expired reset password code", nil)
} }
@ -87,9 +88,8 @@ func (hs *HTTPServer) ResetPassword(c *contextmodel.ReqContext) response.Respons
} }
cmd := user.ChangeUserPasswordCommand{} cmd := user.ChangeUserPasswordCommand{}
cmd.UserID = query.Result.ID cmd.UserID = userResult.ID
var err error cmd.NewPassword, err = util.EncodePassword(form.NewPassword, userResult.Salt)
cmd.NewPassword, err = util.EncodePassword(form.NewPassword, query.Result.Salt)
if err != nil { if err != nil {
return response.Error(500, "Failed to encode password", err) return response.Error(500, "Failed to encode password", err)
} }

3
pkg/services/notifications/models.go
View File

@ -49,6 +49,5 @@ type SendResetPasswordEmailCommand struct {
} }
type ValidateResetPasswordCodeQuery struct { type ValidateResetPasswordCodeQuery struct {
Code string Code string
Result *user.User
} }

13
pkg/services/notifications/notifications.go
View File

@ -235,27 +235,26 @@ func (ns *NotificationService) SendResetPasswordEmail(ctx context.Context, cmd *
type GetUserByLoginFunc = func(c context.Context, login string) (*user.User, error) type GetUserByLoginFunc = func(c context.Context, login string) (*user.User, error)
func (ns *NotificationService) ValidateResetPasswordCode(ctx context.Context, query *ValidateResetPasswordCodeQuery, userByLogin GetUserByLoginFunc) error { func (ns *NotificationService) ValidateResetPasswordCode(ctx context.Context, query *ValidateResetPasswordCodeQuery, userByLogin GetUserByLoginFunc) (*user.User, error) {
login := getLoginForEmailCode(query.Code) login := getLoginForEmailCode(query.Code)
if login == "" { if login == "" {
return ErrInvalidEmailCode return nil, ErrInvalidEmailCode
} }
user, err := userByLogin(ctx, login) user, err := userByLogin(ctx, login)
if err != nil { if err != nil {
return err return nil, err
} }
validEmailCode, err := validateUserEmailCode(ns.Cfg, user, query.Code) validEmailCode, err := validateUserEmailCode(ns.Cfg, user, query.Code)
if err != nil { if err != nil {
return err return nil, err
} }
if !validEmailCode { if !validEmailCode {
return ErrInvalidEmailCode return nil, ErrInvalidEmailCode
} }
query.Result = user return user, nil
return nil
} }
func (ns *NotificationService) signUpStartedHandler(ctx context.Context, evt *events.SignUpStarted) error { func (ns *NotificationService) signUpStartedHandler(ctx context.Context, evt *events.SignUpStarted) error {

2
pkg/services/notifications/notifications_test.go
View File

@ -216,7 +216,7 @@ func TestSendEmailAsync(t *testing.T) {
getUserByLogin := func(ctx context.Context, login string) (*user.User, error) { getUserByLogin := func(ctx context.Context, login string) (*user.User, error) {
return &testuser, nil return &testuser, nil
} }
err = sut.ValidateResetPasswordCode(context.Background(), &query, getUserByLogin) _, err = sut.ValidateResetPasswordCode(context.Background(), &query, getUserByLogin)
require.NoError(t, err) require.NoError(t, err)
}) })