thermokarst/bactdb
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Validate user password

Browse source 
Fixes #29.
This commit is contained in:
Matthew Dillon 2015-11-13 13:43:09 -07:00
parent a482a083bf
commit 5e5121fc65
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
api/users.go
View file

@ -201,16 +201,18 @@ func HandleUserVerify(w http.ResponseWriter, r *http.Request) *types.AppError {
user.Verified = true
count, err := models.DBH.Update(&user)
if err != nil {
if err := models.Update(&user); err != nil {
if err == errors.ErrUserNotUpdated {
return newJSONError(err, http.StatusBadRequest)
}
if err, ok := err.(types.ValidationError); ok {
return &types.AppError{Error: err, Status: helpers.StatusUnprocessableEntity}
}
return newJSONError(err, http.StatusInternalServerError)
}
if count != 1 {
return newJSONError(errors.ErrUserNotUpdated, http.StatusInternalServerError)
}
q = `DELETE FROM verification WHERE user_id=$1;`
_, err = models.DBH.Exec(q, user.ID)
_, err := models.DBH.Exec(q, user.ID)
if err != nil {
return newJSONError(err, http.StatusInternalServerError)
}
@ -275,6 +277,9 @@ func HandleUserPasswordChange(w http.ResponseWriter, r *http.Request) *types.App
}
if err := models.UpdateUserPassword(&claims, r.FormValue("password")); err != nil {
if err, ok := err.(types.ValidationError); ok {
return &types.AppError{Error: err, Status: helpers.StatusUnprocessableEntity}
}
return newJSONError(err, http.StatusInternalServerError)
}

7
models/users.go
View file

@ -181,6 +181,13 @@ func UpdateUserPassword(claims *types.Claims, password string) error {
return err
}
// Temporarily set PW as plaintext, for validation purposes
user.Password = password
if err := user.validate(); err != nil {
return err
}
hash, err := bcrypt.GenerateFromPassword([]byte(password), 12)
if err != nil {
return err