IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 10:20:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

improves readability of loginping handler

Browse Source
This commit is contained in:
bergquist 2019-01-24 15:17:09 +01:00
parent 516037fbdd
commit 9153b6ed96
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/sample.ini
View File

@ -115,8 +115,8 @@ log_queries =
# How many days an session can be unused before we inactivate it # How many days an session can be unused before we inactivate it
;login_remember_days = 7 ;login_remember_days = 7
# How often should the login token be rotated. default to '30m' # How often should the login token be rotated. default to '30'
;rotate_cookie_every = 30m ;rotate_token_minutes = 30
# How long should Grafana keep expired tokens before deleting them # How long should Grafana keep expired tokens before deleting them
;delete_expired_token_after_days = 30 ;delete_expired_token_after_days = 30

9
pkg/api/login.go
View File

@ -78,13 +78,12 @@ func tryOAuthAutoLogin(c *m.ReqContext) bool {
return false return false
} }
func (hs *HTTPServer) LoginAPIPing(c *m.ReqContext) { func (hs *HTTPServer) LoginAPIPing(c *m.ReqContext) Response {
if !c.IsSignedIn || !c.IsAnonymous { if c.IsSignedIn || c.IsAnonymous {
c.JsonApiErr(401, "Unauthorized", nil) return JSON(200, "Logged in")
return
} }
c.JsonOK("Logged in") return Error(401, "Unauthorized", nil)
} }
func (hs *HTTPServer) LoginPost(c *m.ReqContext, cmd dtos.LoginCommand) Response { func (hs *HTTPServer) LoginPost(c *m.ReqContext, cmd dtos.LoginCommand) Response {