IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-09-28 15:27:08 +02:00
parent 3e657357e5
commit 2750c8a801
7 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/defaults.ini
+3 -2
View File
@@ -190,8 +190,9 @@ login_hint = email or username
# Default UI theme ("dark" or "light") # Default UI theme ("dark" or "light")
default_theme = dark default_theme = dark
# Allow users to sign in using username and password [auth]
allow_user_pass_login = true # Set to true to disable (hide) the login form, useful if you use OAuth
disable_login_form = false
#################################### Anonymous Auth ###################### #################################### Anonymous Auth ######################
[auth.anonymous] [auth.anonymous]
conf/sample.ini
+4
View File
@@ -175,6 +175,10 @@
# Default UI theme ("dark" or "light") # Default UI theme ("dark" or "light")
;default_theme = dark ;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 ########################## #################################### Anonymous Auth ##########################
[auth.anonymous] [auth.anonymous]
# enable anonymous access # enable anonymous access
docs/sources/installation/configuration.md
+8
View File
@@ -238,6 +238,14 @@ options are `Admin` and `Editor` and `Read-Only Editor`.
<hr> <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] ## [auth.anonymous]
### enabled ### enabled
pkg/api/login.go
+1 -1
View File
@@ -33,7 +33,7 @@ func LoginView(c *middleware.Context) {
viewData.Settings["oauth"] = enabledOAuths viewData.Settings["oauth"] = enabledOAuths
viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp
viewData.Settings["loginHint"] = setting.LoginHint viewData.Settings["loginHint"] = setting.LoginHint
viewData.Settings["allowUserPassLogin"] = setting.AllowUserPassLogin viewData.Settings["disableLoginForm"] = setting.DisableLoginForm
if !tryLoginUsingRememberCookie(c) { if !tryLoginUsingRememberCookie(c) {
c.HTML(200, VIEW_INDEX, viewData) c.HTML(200, VIEW_INDEX, viewData)
pkg/setting/setting.go
+5 -2
View File
@@ -92,7 +92,7 @@ var (
VerifyEmailEnabled bool VerifyEmailEnabled bool
LoginHint string LoginHint string
DefaultTheme string DefaultTheme string
AllowUserPassLogin bool DisableLoginForm bool
// Http auth // Http auth
AdminUser string AdminUser string
@@ -519,7 +519,10 @@ func NewConfigContext(args *CommandLineArgs) error {
VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false) VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
LoginHint = users.Key("login_hint").String() LoginHint = users.Key("login_hint").String()
DefaultTheme = users.Key("default_theme").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 // anonymous access
AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false) AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false)
public/app/core/controllers/login_ctrl.js
+1 -1
View File
@@ -25,7 +25,7 @@ function (angular, _, coreModule, config) {
$scope.oauth = config.oauth; $scope.oauth = config.oauth;
$scope.oauthEnabled = _.keys(config.oauth).length > 0; $scope.oauthEnabled = _.keys(config.oauth).length > 0;
$scope.allowUserPassLogin = config.allowUserPassLogin; $scope.disableLoginForm = config.disableLoginForm;
$scope.disableUserSignUp = config.disableUserSignUp; $scope.disableUserSignUp = config.disableUserSignUp;
$scope.loginHint = config.loginHint; $scope.loginHint = config.loginHint;
public/app/partials/login.html
+3 -3
View File
@@ -17,7 +17,7 @@
</button> </button>
</div> </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"> <div class="gf-form" ng-if="loginMode">
<span class="gf-form-label width-7">User</span> <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}}> <input type="text" name="username" class="gf-form-input max-width-14" required ng-model='formModel.user' placeholder={{loginHint}}>
@@ -40,7 +40,7 @@
</form> </form>
<div ng-if="loginMode"> <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"> <div class="login-divider-line">
<span class="login-divider-text"> <span class="login-divider-text">
Or login with Or login with
@@ -71,7 +71,7 @@
<div class="clearfix"></div> <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"> <div class="text-center">
<a href="user/password/send-reset-email"> <a href="user/password/send-reset-email">
Forgot your password? Forgot your password?