mirror of https://github.com/grafana/grafana
Chore: Move api key models into apikey service package (#53241)
* Chore: move api key models into apikey service package * force table name for api keypull/53303/head
Serge Zaitsev
3 years ago
committed by
GitHub
parent
af83a09a92
commit
191ab3bb01
@ -1,64 +0,0 @@ |
||||
package models |
||||
|
||||
import ( |
||||
"errors" |
||||
"time" |
||||
) |
||||
|
||||
var ( |
||||
ErrApiKeyNotFound = errors.New("API key not found") |
||||
ErrInvalidApiKey = errors.New("invalid API key") |
||||
ErrInvalidApiKeyExpiration = errors.New("negative value for SecondsToLive") |
||||
ErrDuplicateApiKey = errors.New("API key, organization ID and name must be unique") |
||||
) |
||||
|
||||
type ApiKey struct { |
||||
Id int64 |
||||
OrgId int64 |
||||
Name string |
||||
Key string |
||||
Role RoleType |
||||
Created time.Time |
||||
Updated time.Time |
||||
LastUsedAt *time.Time `xorm:"last_used_at"` |
||||
Expires *int64 |
||||
ServiceAccountId *int64 |
||||
} |
||||
|
||||
// ---------------------
|
||||
// COMMANDS
|
||||
// swagger:model
|
||||
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 DeleteApiKeyCommand struct { |
||||
Id int64 `json:"id"` |
||||
OrgId int64 `json:"-"` |
||||
} |
||||
|
||||
// ----------------------
|
||||
// QUERIES
|
||||
|
||||
type GetApiKeysQuery struct { |
||||
OrgId int64 |
||||
IncludeExpired bool |
||||
User *SignedInUser |
||||
Result []*ApiKey |
||||
} |
||||
|
||||
type GetApiKeyByNameQuery struct { |
||||
KeyName string |
||||
OrgId int64 |
||||
Result *ApiKey |
||||
} |
||||
|
||||
type GetApiKeyByIdQuery struct { |
||||
ApiKeyId int64 |
||||
Result *ApiKey |
||||
} |
||||
@ -1,3 +1,62 @@ |
||||
package apikey |
||||
|
||||
// TODO: define all apikey models here
|
||||
import ( |
||||
"errors" |
||||
"time" |
||||
|
||||
"github.com/grafana/grafana/pkg/models" |
||||
) |
||||
|
||||
var ( |
||||
ErrNotFound = errors.New("API key not found") |
||||
ErrInvalid = errors.New("invalid API key") |
||||
ErrInvalidExpiration = errors.New("negative value for SecondsToLive") |
||||
ErrDuplicate = errors.New("API key, organization ID and name must be unique") |
||||
) |
||||
|
||||
type APIKey struct { |
||||
Id int64 |
||||
OrgId int64 |
||||
Name string |
||||
Key string |
||||
Role models.RoleType |
||||
Created time.Time |
||||
Updated time.Time |
||||
LastUsedAt *time.Time `xorm:"last_used_at"` |
||||
Expires *int64 |
||||
ServiceAccountId *int64 |
||||
} |
||||
|
||||
func (k APIKey) TableName() string { return "api_key" } |
||||
|
||||
// swagger:model
|
||||
type AddCommand struct { |
||||
Name string `json:"name" binding:"Required"` |
||||
Role models.RoleType `json:"role" binding:"Required"` |
||||
OrgId int64 `json:"-"` |
||||
Key string `json:"-"` |
||||
SecondsToLive int64 `json:"secondsToLive"` |
||||
Result *APIKey `json:"-"` |
||||
} |
||||
|
||||
type DeleteCommand struct { |
||||
Id int64 `json:"id"` |
||||
OrgId int64 `json:"-"` |
||||
} |
||||
|
||||
type GetApiKeysQuery struct { |
||||
OrgId int64 |
||||
IncludeExpired bool |
||||
User *models.SignedInUser |
||||
Result []*APIKey |
||||
} |
||||
type GetByNameQuery struct { |
||||
KeyName string |
||||
OrgId int64 |
||||
Result *APIKey |
||||
} |
||||
|
||||
type GetByIDQuery struct { |
||||
ApiKeyId int64 |
||||
Result *APIKey |
||||
} |
||||
|
||||
Loading…
Reference in new issue