Merge branch 'master' into delete_session_on_logout

2019-02-04 20:23:05 +01:00
parent a1b3986532 3b1da3758d
commit fb3c510178
103 changed files with 1720 additions and 798 deletions
@@ -108,8 +108,8 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/api/snapshots-delete/:deleteKey", Wrap(DeleteDashboardSnapshotByDeleteKey))
 	r.Delete("/api/snapshots/:key", reqEditorRole, Wrap(DeleteDashboardSnapshot))

-	// api renew session based on remember cookie
-	r.Get("/api/login/ping", quota("session"), hs.LoginAPIPing)
+	// api renew session based on cookie
+	r.Get("/api/login/ping", quota("session"), Wrap(hs.LoginAPIPing))

 	// authed api
 	r.Group("/api", func(apiRoute routing.RouteRegister) {