@ -31,10 +31,10 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
}
user , err := s . Store . FindUser ( ctx , userFind )
if err != nil && common . ErrorCode ( err ) != common . NotFound {
return echo . NewHTTPError ( http . StatusInternalServerError , fmt . Sprintf ( "Failed to find user by username %s" , signin . Username ) ) . SetInternal ( err )
return echo . NewHTTPError ( http . StatusInternalServerError , "Incorrect login credentials, please try again" )
}
if user == nil {
return echo . NewHTTPError ( http . StatusUnauthorized , fmt . Sprintf ( "User not found with username %s" , signin . Username ) )
return echo . NewHTTPError ( http . StatusUnauthorized , "Incorrect login credentials, please try again" )
} else if user . RowStatus == api . Archived {
return echo . NewHTTPError ( http . StatusForbidden , fmt . Sprintf ( "User has been archived with username %s" , signin . Username ) )
}
@ -42,7 +42,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
// Compare the stored hashed password, with the hashed version of the password that was received.
if err := bcrypt . CompareHashAndPassword ( [ ] byte ( user . PasswordHash ) , [ ] byte ( signin . Password ) ) ; err != nil {
// If the two passwords don't match, return a 401 status.
return echo . NewHTTPError ( http . StatusUnauthorized , "Incorrect password") . SetInternal ( err )
return echo . NewHTTPError ( http . StatusUnauthorized , "Incorrect login credentials, please try again" )
}
if err = setUserSession ( c , user ) ; err != nil {
@ -99,7 +99,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
Username : & userInfo . Identifier ,
} )
if err != nil && common . ErrorCode ( err ) != common . NotFound {
return echo . NewHTTPError ( http . StatusInternalServerError , fmt . Sprintf ( "Failed to find user by username %s" , userInfo . Identifier ) ) . SetInternal ( err )
return echo . NewHTTPError ( http . StatusInternalServerError , "Incorrect login credentials, please try again" )
}
if user == nil {
userCreate := & api . UserCreate {