Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pkg/apiToken/ApiTokenService.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,14 @@ func (impl ApiTokenServiceImpl) GetAllActiveApiTokens() ([]*openapi.ApiToken, er
apiToken.Token = &apiTokenFromDb.Token
}
if latestAuditLog != nil {
lastUsedAtStr := latestAuditLog.CreatedOn.String()
// the user_audit row is updated in place on every usage, so updated_on holds the latest usage;
// created_on only holds the first usage and is used as fallback for rows written before
// updated_on was added to user_audit
lastUsedAt := latestAuditLog.UpdatedOn
if lastUsedAt.IsZero() {
lastUsedAt = latestAuditLog.CreatedOn
}
lastUsedAtStr := lastUsedAt.String()
apiToken.LastUsedAt = &lastUsedAtStr
apiToken.LastUsedByIp = &latestAuditLog.ClientIp
}
Expand Down
Loading