Commit 0d2be0a7 by Anthony Templeton Committed by Torkel Ödegaard

Logging: Login and Logout logging actions (#17760) (#17883)

parent 1c291e26
...@@ -126,7 +126,6 @@ func (hs *HTTPServer) LoginPost(c *m.ReqContext, cmd dtos.LoginCommand) Response ...@@ -126,7 +126,6 @@ func (hs *HTTPServer) LoginPost(c *m.ReqContext, cmd dtos.LoginCommand) Response
} }
metrics.M_Api_Login_Post.Inc() metrics.M_Api_Login_Post.Inc()
return JSON(200, result) return JSON(200, result)
} }
...@@ -139,7 +138,7 @@ func (hs *HTTPServer) loginUserWithUser(user *m.User, c *m.ReqContext) { ...@@ -139,7 +138,7 @@ func (hs *HTTPServer) loginUserWithUser(user *m.User, c *m.ReqContext) {
if err != nil { if err != nil {
hs.log.Error("failed to create auth token", "error", err) hs.log.Error("failed to create auth token", "error", err)
} }
hs.log.Info("Successful Login", "User", user.Email)
middleware.WriteSessionCookie(c, userToken.UnhashedToken, hs.Cfg.LoginMaxLifetimeDays) middleware.WriteSessionCookie(c, userToken.UnhashedToken, hs.Cfg.LoginMaxLifetimeDays)
} }
...@@ -153,6 +152,7 @@ func (hs *HTTPServer) Logout(c *m.ReqContext) { ...@@ -153,6 +152,7 @@ func (hs *HTTPServer) Logout(c *m.ReqContext) {
if setting.SignoutRedirectUrl != "" { if setting.SignoutRedirectUrl != "" {
c.Redirect(setting.SignoutRedirectUrl) c.Redirect(setting.SignoutRedirectUrl)
} else { } else {
hs.log.Info("Successful Logout", "User", c.Email)
c.Redirect(setting.AppSubUrl + "/login") c.Redirect(setting.AppSubUrl + "/login")
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment