From d1cee022471f43decafc4da0bff7892ff52f0664 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 20 Nov 2017 11:04:04 -0600 Subject: Refactor password validation and config defaults (#7859) * refactor password validation and config defaults * reorder config lines for clarity --- app/user.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/user.go') diff --git a/app/user.go b/app/user.go index 358a87711..1f0d1f84e 100644 --- a/app/user.go +++ b/app/user.go @@ -213,7 +213,7 @@ func (a *App) CreateUser(user *model.User) (*model.User, *model.AppError) { func (a *App) createUser(user *model.User) (*model.User, *model.AppError) { user.MakeNonNil() - if err := utils.IsPasswordValid(user.Password); user.AuthService == "" && err != nil { + if err := a.IsPasswordValid(user.Password); user.AuthService == "" && err != nil { return nil, err } @@ -1086,7 +1086,7 @@ func (a *App) UpdatePasswordByUserIdSendEmail(userId, newPassword, method string } func (a *App) UpdatePassword(user *model.User, newPassword string) *model.AppError { - if err := utils.IsPasswordValid(newPassword); err != nil { + if err := a.IsPasswordValid(newPassword); err != nil { return err } -- cgit v1.2.3-1-g7c22