From 3aa24b3afa3a348c7ed3594757f307b283f0f840 Mon Sep 17 00:00:00 2001
From: Tomas Dabasinskas <tomas@dabasinskas.net>
Date: Wed, 19 Dec 2018 14:59:33 +0200
Subject: [PATCH] Rename the setting and add description

---
 conf/defaults.ini    | 2 +-
 conf/sample.ini      | 5 ++++-
 pkg/social/social.go | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 47f6a64eb8b..97c87edb8b2 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -335,7 +335,7 @@ tls_skip_verify_insecure = false
 tls_client_cert =
 tls_client_key =
 tls_client_ca =
-broken_auth_header_provider = false
+send_client_credentials_via_post = false
 
 #################################### Basic Auth ##########################
 [auth.basic]
diff --git a/conf/sample.ini b/conf/sample.ini
index b73ab850bbf..473e4e8450c 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -283,7 +283,10 @@ log_queries =
 ;tls_client_cert =
 ;tls_client_key =
 ;tls_client_ca =
-;broken_auth_header_provider = false
+
+; Set to true to enable sending client_id and client_secret via POST body instead of Basic authentication HTTP header
+; This might be required if the OAuth provider is not RFC6749 compliant, only supporting credentials passed via POST payload
+;send_client_credentials_via_post = false
 
 #################################### Grafana.com Auth ####################
 [auth.grafana_com]
diff --git a/pkg/social/social.go b/pkg/social/social.go
index da827deaa03..0349a271865 100644
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -79,7 +79,7 @@ func NewOAuthService() {
 			TlsClientKey:             sec.Key("tls_client_key").String(),
 			TlsClientCa:              sec.Key("tls_client_ca").String(),
 			TlsSkipVerify:            sec.Key("tls_skip_verify_insecure").MustBool(),
-			BrokenAuthHeaderProvider: sec.Key("broken_auth_header_provider").MustBool(),
+			BrokenAuthHeaderProvider: sec.Key("send_client_credentials_via_post").MustBool(),
 		}
 
 		if !info.Enabled {