usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2024-12-26 07:01:17 +08:00
Code Issues Projects Releases Packages Wiki Activity

chore: replace unmatchedEmailAndPasswordError with unmatchedUsernameAndPasswordError` (#3889)

Browse source 
replace unmatchedEmailAndPasswordError with unmatchedUsernameAndPasswordError
This commit is contained in:
Haohan Yang 2024-09-07 17:17:20 +02:00 committed by GitHub
parent 88db037204
commit 044d46c36d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/router/api/v1/auth_service.go
View file

@ -25,7 +25,7 @@ import (
)
const (
unmatchedEmailAndPasswordError = "unmatched email and password"
unmatchedUsernameAndPasswordError = "unmatched username and password"
)
func (s *APIV1Service) GetAuthStatus(ctx context.Context, _ *v1pb.GetAuthStatusRequest) (*v1pb.User, error) {
@ -51,11 +51,11 @@ func (s *APIV1Service) SignIn(ctx context.Context, request *v1pb.SignInRequest)
return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to find user by username %s", request.Username))
}
if user == nil {
return nil, status.Errorf(codes.InvalidArgument, unmatchedEmailAndPasswordError)
return nil, status.Errorf(codes.InvalidArgument, unmatchedUsernameAndPasswordError)
}
// Compare the stored hashed password, with the hashed version of the password that was received.
if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(request.Password)); err != nil {
return nil, status.Errorf(codes.InvalidArgument, unmatchedEmailAndPasswordError)
return nil, status.Errorf(codes.InvalidArgument, unmatchedUsernameAndPasswordError)
}
workspaceGeneralSetting, err := s.Store.GetWorkspaceGeneralSetting(ctx)