From 2750c8a801b97849673e5b4ed79fa43a39874b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 28 Sep 2016 15:27:08 +0200
Subject: [PATCH] feat(config): changed name of allow_user_login_pass to
 disable_login_form, changed the section of the config option to [auth],
 impacts merged PR #5423

---
 conf/defaults.ini                          | 5 +++--
 conf/sample.ini                            | 4 ++++
 docs/sources/installation/configuration.md | 8 ++++++++
 pkg/api/login.go                           | 2 +-
 pkg/setting/setting.go                     | 7 +++++--
 public/app/core/controllers/login_ctrl.js  | 2 +-
 public/app/partials/login.html             | 6 +++---
 7 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 9fbecb6a1ea..39e10280645 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -190,8 +190,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
+[auth]
+# Set to true to disable (hide) the login form, useful if you use OAuth
+disable_login_form = false
 
 #################################### Anonymous Auth ######################
 [auth.anonymous]
diff --git a/conf/sample.ini b/conf/sample.ini
index 27f64ee8066..bb575a596b0 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -175,6 +175,10 @@
 # Default UI theme ("dark" or "light")
 ;default_theme = dark
 
+[auth]
+# Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false
+;disable_login_form = false
+
 #################################### Anonymous Auth ##########################
 [auth.anonymous]
 # enable anonymous access
diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index d8f29dd7029..146ac68a08d 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -238,6 +238,14 @@ options are `Admin` and `Editor` and `Read-Only Editor`.
 
 <hr>
 
+## [auth]
+
+### disable_login_form
+
+Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false.
+
+<hr>
+
 ## [auth.anonymous]
 
 ### enabled
diff --git a/pkg/api/login.go b/pkg/api/login.go
index c3dea616abf..8fbe414c08c 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -33,7 +33,7 @@ func LoginView(c *middleware.Context) {
 	viewData.Settings["oauth"] = enabledOAuths
 	viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp
 	viewData.Settings["loginHint"] = setting.LoginHint
-	viewData.Settings["allowUserPassLogin"] = setting.AllowUserPassLogin
+	viewData.Settings["disableLoginForm"] = setting.DisableLoginForm
 
 	if !tryLoginUsingRememberCookie(c) {
 		c.HTML(200, VIEW_INDEX, viewData)
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 79e61dd0114..806e94dee98 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -92,7 +92,7 @@ var (
 	VerifyEmailEnabled bool
 	LoginHint          string
 	DefaultTheme       string
-	AllowUserPassLogin bool
+	DisableLoginForm   bool
 
 	// Http auth
 	AdminUser     string
@@ -519,7 +519,10 @@ 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()
-	AllowUserPassLogin = users.Key("allow_user_pass_login").MustBool(true)
+
+	// auth
+	auth := Cfg.Section("auth")
+	DisableLoginForm = auth.Key("disable_login_form").MustBool(false)
 
 	// 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 8a336c16086..4b03dddf973 100644
--- a/public/app/core/controllers/login_ctrl.js
+++ b/public/app/core/controllers/login_ctrl.js
@@ -25,7 +25,7 @@ function (angular, _, coreModule, config) {
     $scope.oauth = config.oauth;
     $scope.oauthEnabled = _.keys(config.oauth).length > 0;
 
-    $scope.allowUserPassLogin = config.allowUserPassLogin;
+    $scope.disableLoginForm = config.disableLoginForm;
     $scope.disableUserSignUp = config.disableUserSignUp;
     $scope.loginHint     = config.loginHint;
 
diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 648632fe1c4..b6a37ba46c2 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -17,7 +17,7 @@
 				</button>
 			</div>
 
-      <form name="loginForm" class="login-form gf-form-group" ng-show="allowUserPassLogin">
+      <form name="loginForm" class="login-form gf-form-group" ng-hide="disableLoginForm">
 				<div class="gf-form" ng-if="loginMode">
 					<span class="gf-form-label width-7">User</span>
 					<input type="text" name="username" class="gf-form-input max-width-14" required ng-model='formModel.user' placeholder={{loginHint}}>
@@ -40,7 +40,7 @@
 			</form>
 
 			<div ng-if="loginMode">
-				<div class="text-center login-divider" ng-show="oauthEnabled && allowUserPassLogin">
+				<div class="text-center login-divider" ng-show="oauthEnabled && !disableLoginForm">
 					<div class="login-divider-line">
 						<span class="login-divider-text">
 							Or login with
@@ -71,7 +71,7 @@
 
 			<div class="clearfix"></div>
 
-			<div class="text-center password-recovery" ng-show="allowUserPassLogin">
+			<div class="text-center password-recovery" ng-hide="disableLoginForm">
 				<div class="text-center">
 					<a href="user/password/send-reset-email">
 						Forgot your password?