public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auth: Replace maximum inactive/lifetime settings of days to duration (#27150)

Browse Source 
Allows login_maximum_inactive_lifetime_duration and
login_maximum_lifetime_duration to be configured using
time.Duration-compatible values while retaining backward compatibility.

Fixes #17554

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
(cherry picked from commit 8d971ab2f2)
This commit is contained in:
Hansuuuuuuuuuu
2020-09-17 10:44:02 +02:00
committed by Hugo Häggmark
parent 4ca888c798
commit 1a598a8a41
12 changed files with 122 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/login.go
+1 -1
View File
@@ -249,7 +249,7 @@ func (hs *HTTPServer) loginUserWithUser(user *models.User, c *models.ReqContext)
}
hs.log.Info("Successful Login", "User", user.Email)
middleware.WriteSessionCookie(c, userToken.UnhashedToken, hs.Cfg.LoginMaxLifetimeDays)
middleware.WriteSessionCookie(c, userToken.UnhashedToken, hs.Cfg.LoginMaxLifetime)
return nil
}