diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/authentication.go | 7 | ||||
| -rw-r--r-- | app/user.go | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/authentication.go b/app/authentication.go index 809c2e6c7..91e3bf564 100644 --- a/app/authentication.go +++ b/app/authentication.go @@ -11,6 +11,13 @@ import ( "github.com/mattermost/mattermost-server/utils" ) +func (a *App) IsPasswordValid(password string) *model.AppError { + if utils.IsLicensed() && *utils.License().Features.PasswordRequirements { + return utils.IsPasswordValidWithSettings(password, &a.Config().PasswordSettings) + } + return utils.IsPasswordValid(password) +} + func (a *App) CheckPasswordAndAllCriteria(user *model.User, password string, mfaToken string) *model.AppError { if err := a.CheckUserAdditionalAuthenticationCriteria(user, mfaToken); err != nil { return err 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 } |