mirror of
https://github.com/grafana/grafana.git
synced 2024-11-26 19:00:54 -06:00
dc9ec7dc91
* Modify backend to allow expiration of API Keys * Add middleware test for expired api keys * Modify frontend to enable expiration of API Keys * Fix frontend tests * Fix migration and add index for `expires` field * Add api key tests for database access * Substitude time.Now() by a mock for test usage * Front-end modifications * Change input label to `Time to live` * Change input behavior to comply with the other similar * Add tooltip * Modify AddApiKey api call response Expiration should be *time.Time instead of string * Present expiration date in the selected timezone * Use kbn for transforming intervals to seconds * Use `assert` library for tests * Frontend fixes Add checks for empty/undefined/null values * Change expires column from datetime to integer * Restrict api key duration input It should be interval not number * AddApiKey must complain if SecondsToLive is negative * Declare ErrInvalidApiKeyExpiration * Move configuration to auth section * Update docs * Eliminate alias for models in modified files * Omit expiration from api response if empty * Eliminate Goconvey from test file * Fix test Do not sleep, use mocked timeNow() instead * Remove index for expires from api_key table The index should be anyway on both org_id and expires fields. However this commit eliminates completely the index for now since not many rows are expected to be in this table. * Use getTimeZone function * Minor change in api key listing The frontend should display a message instead of empty string if the key does not expire.
76 lines
1.4 KiB
Go
76 lines
1.4 KiB
Go
package models
|
|
|
|
import (
|
|
"errors"
|
|
"time"
|
|
)
|
|
|
|
var ErrInvalidApiKey = errors.New("Invalid API Key")
|
|
var ErrInvalidApiKeyExpiration = errors.New("Negative value for SecondsToLive")
|
|
|
|
type ApiKey struct {
|
|
Id int64
|
|
OrgId int64
|
|
Name string
|
|
Key string
|
|
Role RoleType
|
|
Created time.Time
|
|
Updated time.Time
|
|
Expires *int64
|
|
}
|
|
|
|
// ---------------------
|
|
// COMMANDS
|
|
type AddApiKeyCommand struct {
|
|
Name string `json:"name" binding:"Required"`
|
|
Role RoleType `json:"role" binding:"Required"`
|
|
OrgId int64 `json:"-"`
|
|
Key string `json:"-"`
|
|
SecondsToLive int64 `json:"secondsToLive"`
|
|
|
|
Result *ApiKey `json:"-"`
|
|
}
|
|
|
|
type UpdateApiKeyCommand struct {
|
|
Id int64 `json:"id"`
|
|
Name string `json:"name"`
|
|
Role RoleType `json:"role"`
|
|
|
|
OrgId int64 `json:"-"`
|
|
}
|
|
|
|
type DeleteApiKeyCommand struct {
|
|
Id int64 `json:"id"`
|
|
OrgId int64 `json:"-"`
|
|
}
|
|
|
|
// ----------------------
|
|
// QUERIES
|
|
|
|
type GetApiKeysQuery struct {
|
|
OrgId int64
|
|
IncludeInvalid bool
|
|
Result []*ApiKey
|
|
}
|
|
|
|
type GetApiKeyByNameQuery struct {
|
|
KeyName string
|
|
OrgId int64
|
|
Result *ApiKey
|
|
}
|
|
|
|
type GetApiKeyByIdQuery struct {
|
|
ApiKeyId int64
|
|
Result *ApiKey
|
|
}
|
|
|
|
// ------------------------
|
|
// DTO & Projections
|
|
|
|
type ApiKeyDTO struct {
|
|
Id int64 `json:"id"`
|
|
Name string `json:"name"`
|
|
Role RoleType `json:"role"`
|
|
Expiration *time.Time `json:"expiration,omitempty"`
|
|
}
|