diff --git a/internal/dtos/user.go b/internal/dtos/user.go index ee56cb3..3bc44f5 100644 --- a/internal/dtos/user.go +++ b/internal/dtos/user.go @@ -17,8 +17,6 @@ type UserDTO struct { } type ResetUserPasswordDTO struct { - // NOTE: probably userID shouldn't be here - UserID uuid.UUID CurrentPassword string NewPassword string } diff --git a/internal/service/usersrv/usersrv.go b/internal/service/usersrv/usersrv.go index cf5be57..525212c 100644 --- a/internal/service/usersrv/usersrv.go +++ b/internal/service/usersrv/usersrv.go @@ -22,7 +22,7 @@ type UserServicer interface { RefreshTokens(ctx context.Context, refreshToken string) (dtos.TokensDTO, error) Logout(ctx context.Context, userID uuid.UUID) error - ChangePassword(ctx context.Context, inp dtos.ResetUserPasswordDTO) error + ChangePassword(ctx context.Context, userID uuid.UUID, inp dtos.ResetUserPasswordDTO) error Verify(ctx context.Context, verificationKey string) error ResendVerificationEmail(ctx context.Context, credentials dtos.SignInDTO) error @@ -165,7 +165,11 @@ func (u *UserSrv) RefreshTokens(ctx context.Context, rtoken string) (dtos.Tokens }, nil } -func (u *UserSrv) ChangePassword(ctx context.Context, inp dtos.ResetUserPasswordDTO) error { +func (u *UserSrv) ChangePassword( + ctx context.Context, + userID uuid.UUID, + inp dtos.ResetUserPasswordDTO, +) error { oldPass, err := u.hasher.Hash(inp.CurrentPassword) if err != nil { return err @@ -176,7 +180,7 @@ func (u *UserSrv) ChangePassword(ctx context.Context, inp dtos.ResetUserPassword return err } - if err := u.userstore.ChangePassword(ctx, inp.UserID, oldPass, newPass); err != nil { + if err := u.userstore.ChangePassword(ctx, userID, oldPass, newPass); err != nil { return err } diff --git a/internal/transport/http/apiv1/auth.go b/internal/transport/http/apiv1/auth.go index 472b78b..cd51ccf 100644 --- a/internal/transport/http/apiv1/auth.go +++ b/internal/transport/http/apiv1/auth.go @@ -154,8 +154,8 @@ func (a *APIV1) changePasswordHandler(c *gin.Context) { if err := a.usersrv.ChangePassword( c.Request.Context(), + a.getUserID(c), dtos.ResetUserPasswordDTO{ - UserID: a.getUserID(c), CurrentPassword: req.CurrentPassword, NewPassword: req.NewPassword, }); err != nil {