diff --git a/conf/defaults.ini b/conf/defaults.ini index c087fcf1ab1..5233fe89722 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -178,6 +178,9 @@ login_hint = email or username # Default UI theme ("dark" or "light") default_theme = dark +# Allow users to sign in using username and password +allow_user_pass_login = true + #################################### Anonymous Auth ########################## [auth.anonymous] # enable anonymous access diff --git a/pkg/api/login.go b/pkg/api/login.go index 93a6d114704..4f976f753a2 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -29,7 +29,7 @@ func LoginView(c *middleware.Context) { viewData.Settings["githubAuthEnabled"] = setting.OAuthService.GitHub viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp viewData.Settings["loginHint"] = setting.LoginHint - viewData.Settings["oauthOnly"] = setting.DisableUserPassLogin + viewData.Settings["allowUserPassLogin"] = setting.AllowUserPassLogin if !tryLoginUsingRememberCookie(c) { c.HTML(200, VIEW_INDEX, viewData) diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 5a6b63a1de8..14dc7b88c55 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -82,14 +82,14 @@ var ( ExternalEnabled bool // User settings - AllowUserSignUp bool - AllowUserOrgCreate bool - AutoAssignOrg bool - AutoAssignOrgRole string - VerifyEmailEnabled bool - LoginHint string - DefaultTheme string - DisableUserPassLogin bool + AllowUserSignUp bool + AllowUserOrgCreate bool + AutoAssignOrg bool + AutoAssignOrgRole string + VerifyEmailEnabled bool + LoginHint string + DefaultTheme string + AllowUserPassLogin bool // Http auth AdminUser string @@ -486,7 +486,7 @@ func NewConfigContext(args *CommandLineArgs) error { VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false) LoginHint = users.Key("login_hint").String() DefaultTheme = users.Key("default_theme").String() - DisableUserPassLogin = users.Key("disable_user_pass_login").MustBool(false) + AllowUserPassLogin = users.Key("allow_user_pass_login").MustBool(true) // anonymous access AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false) diff --git a/public/app/core/controllers/login_ctrl.js b/public/app/core/controllers/login_ctrl.js index 2be5f6b1740..8696d94f4f3 100644 --- a/public/app/core/controllers/login_ctrl.js +++ b/public/app/core/controllers/login_ctrl.js @@ -18,7 +18,7 @@ function (angular, coreModule, config) { $scope.googleAuthEnabled = config.googleAuthEnabled; $scope.githubAuthEnabled = config.githubAuthEnabled; $scope.oauthEnabled = config.githubAuthEnabled || config.googleAuthEnabled; - $scope.oauthOnly = config.oauthOnly; + $scope.allowUserPassLogin = config.allowUserPassLogin; $scope.disableUserSignUp = config.disableUserSignUp; $scope.loginHint = config.loginHint; diff --git a/public/app/partials/login.html b/public/app/partials/login.html index 660206ede59..2966a82b73a 100644 --- a/public/app/partials/login.html +++ b/public/app/partials/login.html @@ -17,7 +17,7 @@ -