opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-28 13:32:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Api: Fix auth tokens returning wrong seenAt value (#17980)

Browse Source 
Changes so a non-set seenAt property gets the createdAt value.

Fixes #17953
This commit is contained in:
Marcus Efraimsson
2019-07-08 14:30:02 +02:00
committed by GitHub
parent bdaf0aa81a
commit 962d4daabd
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/api/user_token.go
View File

@ -84,6 +84,13 @@ func (server *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID
}
}
createdAt := time.Unix(token.CreatedAt, 0)
seenAt := time.Unix(token.SeenAt, 0)
if token.SeenAt == 0 {
seenAt = createdAt
}
result = append(result, &dtos.UserToken{
Id: token.Id,
IsActive: isActive,
@ -93,8 +100,8 @@ func (server *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID
OperatingSystemVersion: osVersion,
Browser: client.UserAgent.Family,
BrowserVersion: browserVersion,
CreatedAt: time.Unix(token.CreatedAt, 0),
SeenAt: time.Unix(token.SeenAt, 0),
CreatedAt: createdAt,
SeenAt: seenAt,
})
}