opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-28 14:42:18 +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{ result = append(result, &dtos.UserToken{
Id: token.Id, Id: token.Id,
IsActive: isActive, IsActive: isActive,
@ -93,8 +100,8 @@ func (server *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID
OperatingSystemVersion: osVersion, OperatingSystemVersion: osVersion,
Browser: client.UserAgent.Family, Browser: client.UserAgent.Family,
BrowserVersion: browserVersion, BrowserVersion: browserVersion,
CreatedAt: time.Unix(token.CreatedAt, 0), CreatedAt: createdAt,
SeenAt: time.Unix(token.SeenAt, 0), SeenAt: seenAt,
}) })
} }

4
pkg/api/user_token_test.go
View File

@ -124,7 +124,7 @@ func TestUserTokenApiEndpoint(t *testing.T) {
ClientIp: "127.0.0.2", ClientIp: "127.0.0.2",
UserAgent: "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1", UserAgent: "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1",
CreatedAt: time.Now().Unix(), CreatedAt: time.Now().Unix(),
SeenAt: time.Now().Unix(), SeenAt: 0,
}, },
} }
sc.userAuthTokenService.GetUserTokensProvider = func(ctx context.Context, userId int64) ([]*m.UserToken, error) { sc.userAuthTokenService.GetUserTokensProvider = func(ctx context.Context, userId int64) ([]*m.UserToken, error) {
@ -154,7 +154,7 @@ func TestUserTokenApiEndpoint(t *testing.T) {
So(resultTwo.Get("isActive").MustBool(), ShouldBeFalse) So(resultTwo.Get("isActive").MustBool(), ShouldBeFalse)
So(resultTwo.Get("clientIp").MustString(), ShouldEqual, "127.0.0.2") So(resultTwo.Get("clientIp").MustString(), ShouldEqual, "127.0.0.2")
So(resultTwo.Get("createdAt").MustString(), ShouldEqual, time.Unix(tokens[1].CreatedAt, 0).Format(time.RFC3339)) So(resultTwo.Get("createdAt").MustString(), ShouldEqual, time.Unix(tokens[1].CreatedAt, 0).Format(time.RFC3339))
So(resultTwo.Get("seenAt").MustString(), ShouldEqual, time.Unix(tokens[1].SeenAt, 0).Format(time.RFC3339)) So(resultTwo.Get("seenAt").MustString(), ShouldEqual, time.Unix(tokens[1].CreatedAt, 0).Format(time.RFC3339))
So(resultTwo.Get("device").MustString(), ShouldEqual, "iPhone") So(resultTwo.Get("device").MustString(), ShouldEqual, "iPhone")
So(resultTwo.Get("browser").MustString(), ShouldEqual, "Mobile Safari") So(resultTwo.Get("browser").MustString(), ShouldEqual, "Mobile Safari")