diff options
| author | Chris <ccbrown112@gmail.com> | 2017-11-20 11:04:04 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-20 11:04:04 -0600 |
| commit | d1cee022471f43decafc4da0bff7892ff52f0664 (patch) | |
| tree | a114ba5f223eaad489c8d8a6edb22ac5cc63e4f9 /app/authentication.go | |
| parent | ab6ef954b4acbd30ba87c2a7680e7843b946adca (diff) | |
| download | chat-d1cee022471f43decafc4da0bff7892ff52f0664.tar.gz chat-d1cee022471f43decafc4da0bff7892ff52f0664.tar.bz2 chat-d1cee022471f43decafc4da0bff7892ff52f0664.zip | |
Refactor password validation and config defaults (#7859)
* refactor password validation and config defaults
* reorder config lines for clarity
Diffstat (limited to 'app/authentication.go')
| -rw-r--r-- | app/authentication.go | 7 |
1 files changed, 7 insertions, 0 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 |