Skip to content
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

Jump to bottom

Generic alpha log error message for failed ACL login #6848

Merged
merged 2 commits into from
Nov 5, 2020
Merged

Generic alpha log error message for failed ACL login #6848

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c42828b
In case of an invalid login request, a generic error message will be …
OmarAyo Nov 5, 2020
9fdc503
used x.ErrorInvalidLogin per Ibrahim's suggestion
OmarAyo Nov 5, 2020
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
6 changes: 3 additions & 3 deletions edgraph/access_ee.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func (s *Server) authenticateLogin(ctx context.Context, request *api.LoginReques

if user == nil {
return nil, errors.Errorf("unable to authenticate through refresh token: "+
"user not found for id %v", userId)
"invalid username or password")
}

glog.Infof("Authenticated user %s through refresh token", userId)
Expand All @@ -155,10 +155,10 @@ func (s *Server) authenticateLogin(ctx context.Context, request *api.LoginReques

if user == nil {
return nil, errors.Errorf("unable to authenticate through password: "+
"user not found for id %v", request.Userid)
"invalid username or passowrd")
}
if !user.PasswordMatch {
return nil, errors.Errorf("password mismatch for user: %v", request.Userid)
return nil, x.ErrorInvalidLogin
}
return user, nil
}
Expand Down