peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update as per @lafriks review

Browse Source
This commit is contained in:
Lanre Adelowo 2018-07-21 23:02:19 +01:00
parent 741ef66ecf
commit 9b4f70f343
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
routers/user/auth.go
View File

@ -1173,7 +1173,8 @@ func ResetPasswdPost(ctx *context.Context) {
return return
} }
u.HashPassword(passwd) u.HashPassword(passwd)
if err := models.UpdateUserCols(u, "passwd", "rands", "salt"); err != nil { u.MustChangePassword = false
if err := models.UpdateUserCols(u, "must_change_password", "passwd", "rands", "salt"); err != nil {
ctx.ServerError("UpdateUser", err) ctx.ServerError("UpdateUser", err)
return return
} }
@ -1229,11 +1230,6 @@ func MustChangePasswordPost(ctx *context.Context, cpt *captcha.Captcha, form aut
} }
var err error var err error
if u.Rands, err = models.GetUserSalt(); err != nil {
ctx.ServerError("UpdateUser", err)
return
}
if u.Salt, err = models.GetUserSalt(); err != nil { if u.Salt, err = models.GetUserSalt(); err != nil {
ctx.ServerError("UpdateUser", err) ctx.ServerError("UpdateUser", err)
return return
@ -1242,7 +1238,7 @@ func MustChangePasswordPost(ctx *context.Context, cpt *captcha.Captcha, form aut
u.HashPassword(form.Password) u.HashPassword(form.Password)
u.MustChangePassword = false u.MustChangePassword = false
if err := models.UpdateUserCols(u, "must_change_password", "passwd", "rands", "salt"); err != nil { if err := models.UpdateUserCols(u, "must_change_password", "passwd", "salt"); err != nil {
ctx.ServerError("UpdateUser", err) ctx.ServerError("UpdateUser", err)
return return
} }