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

now /api/login/ping returns Response

Browse Source
This commit is contained in:
Marcus Efraimsson
2019-02-04 17:37:07 +01:00
parent bd83078025
commit cfd8eb5167
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/api.go
View File

@@ -108,8 +108,8 @@ func (hs *HTTPServer) registerRoutes() {
r.Get("/api/snapshots-delete/:deleteKey", Wrap(DeleteDashboardSnapshotByDeleteKey)) r.Get("/api/snapshots-delete/:deleteKey", Wrap(DeleteDashboardSnapshotByDeleteKey))
r.Delete("/api/snapshots/:key", reqEditorRole, Wrap(DeleteDashboardSnapshot)) r.Delete("/api/snapshots/:key", reqEditorRole, Wrap(DeleteDashboardSnapshot))
// api renew session based on remember cookie // api renew session based on cookie
r.Get("/api/login/ping", quota("session"), hs.LoginAPIPing) r.Get("/api/login/ping", quota("session"), Wrap(hs.LoginAPIPing))
// authed api // authed api
r.Group("/api", func(apiRoute routing.RouteRegister) { r.Group("/api", func(apiRoute routing.RouteRegister) {

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.AllowAnonymous && c.IsAnonymous) { if c.IsSignedIn || c.IsAnonymous {
c.JsonOK("Logged in") return JSON(200, "Logged in")
return
} }
c.JsonApiErr(401, "Unauthorized", nil) 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 {