finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup models.User.HashPassword (#3334)

Browse source
This commit is contained in:
Kim "BKC" Carlbäcker 2018-01-11 23:19:38 +01:00 • committed by Lauris BH
parent 9aed18073d
commit e5b8b4b5ec
7 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
routers/admin/users.go
View file

@ -194,13 +194,12 @@ func EditUserPost(ctx *context.Context, form auth.AdminEditUserForm) {
}
if len(form.Password) > 0 {
u.Passwd = form.Password
var err error
if u.Salt, err = models.GetUserSalt(); err != nil {
ctx.ServerError("UpdateUser", err)
return
}
u.HashPassword()
u.HashPassword(form.Password)
}
u.LoginName = form.LoginName

3
routers/api/v1/admin/user.go
View file

@ -126,13 +126,12 @@ func EditUser(ctx *context.APIContext, form api.EditUserOption) {
}
if len(form.Password) > 0 {
u.Passwd = form.Password
var err error
if u.Salt, err = models.GetUserSalt(); err != nil {
ctx.Error(500, "UpdateUser", err)
return
}
u.HashPassword()
u.HashPassword(form.Password)
}
u.LoginName = form.LoginName

3
routers/user/auth.go
View file

@ -984,7 +984,6 @@ func ResetPasswdPost(ctx *context.Context) {
return
}
u.Passwd = passwd
var err error
if u.Rands, err = models.GetUserSalt(); err != nil {
ctx.ServerError("UpdateUser", err)
@ -994,7 +993,7 @@ func ResetPasswdPost(ctx *context.Context) {
ctx.ServerError("UpdateUser", err)
return
}
u.HashPassword()
u.HashPassword(passwd)
if err := models.UpdateUserCols(u, "passwd", "rands", "salt"); err != nil {
ctx.ServerError("UpdateUser", err)
return

3
routers/user/setting.go
View file

@ -229,13 +229,12 @@ func SettingsSecurityPost(ctx *context.Context, form auth.ChangePasswordForm) {
} else if form.Password != form.Retype {
ctx.Flash.Error(ctx.Tr("form.password_not_match"))
} else {
ctx.User.Passwd = form.Password
var err error
if ctx.User.Salt, err = models.GetUserSalt(); err != nil {
ctx.ServerError("UpdateUser", err)
return
}
ctx.User.HashPassword()
ctx.User.HashPassword(form.Password)
if err := models.UpdateUserCols(ctx.User, "salt", "passwd"); err != nil {
ctx.ServerError("UpdateUser", err)
return