IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(login): invert naming for dissallow user pass login

Browse Source
This commit is contained in:
bergquist 2016-06-25 16:30:41 +02:00
parent 092b6517dc
commit 690a74c6b7
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/defaults.ini
View File

@ -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

2
pkg/api/login.go
View File

@ -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)

18
pkg/setting/setting.go
View File

@ -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)

2
public/app/core/controllers/login_ctrl.js
View File

@ -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;

6
public/app/partials/login.html
View File

@ -17,7 +17,7 @@
</button>
</div>
<form name="loginForm" class="login-form gf-form-group" ng-if="!oauthOnly">
<form name="loginForm" class="login-form gf-form-group" ng-if="allowUserPassLogin">
<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-if="oauthEnabled && !oauthOnly">
<div class="text-center login-divider" ng-if="oauthEnabled && allowUserPassLogin">
<div class="login-divider-line">
<span class="login-divider-text">
Or login with
@ -64,7 +64,7 @@
<div class="clearfix"></div>
<div class="text-center password-recovery" ng-if="!oauthOnly">
<div class="text-center password-recovery" ng-if="allowUserPassLogin">
<div class="text-center">
<a href="user/password/send-reset-email">
Forgot your password?