github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-07 00:50:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove default value and allow empty grants

Browse Source
This commit is contained in:
Johannes Batzill 2023-07-18 16:54:40 -07:00
parent 478ae74e49
commit ac84328a6b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/api/controller/serviceaccount/create_token.go
View File

@ -17,10 +17,9 @@ import (
)
type CreateTokenInput struct {
UID string `json:"uid"`
Lifetime time.Duration `json:"lifetime"`
// TODO: Added to unblock UI - Depending on product decision remove default value, or remove Grants completely.
Grants enum.AccessGrant `json:"grants" default:"9223372036854775807"`
UID string `json:"uid"`
Lifetime time.Duration `json:"lifetime"`
Grants enum.AccessGrant `json:"grants"`
}
// CreateToken creates a new service account access token.
@ -37,7 +36,8 @@ func (c *Controller) CreateToken(ctx context.Context, session *auth.Session,
if err = check.TokenLifetime(in.Lifetime); err != nil {
return nil, err
}
if err = check.AccessGrant(in.Grants, false); err != nil {
// TODO: Added to unblock UI - Depending on product decision enforce grants, or remove Grants completely.
if err = check.AccessGrant(in.Grants, true); err != nil {
return nil, err
}

10
internal/api/controller/user/create_access_token.go
View File

@ -17,10 +17,9 @@ import (
)
type CreateTokenInput struct {
UID string `json:"uid"`
Lifetime time.Duration `json:"lifetime"`
// TODO: Added to unblock UI - Depending on product decision remove default value, or remove Grants completely.
Grants enum.AccessGrant `json:"grants" default:"9223372036854775807"`
UID string `json:"uid"`
Lifetime time.Duration `json:"lifetime"`
Grants enum.AccessGrant `json:"grants"`
}
/*
@ -44,7 +43,8 @@ func (c *Controller) CreateAccessToken(ctx context.Context, session *auth.Sessio
if err = check.TokenLifetime(in.Lifetime); err != nil {
return nil, err
}
if err = check.AccessGrant(in.Grants, false); err != nil {
// TODO: Added to unblock UI - Depending on product decision enforce grants, or remove Grants completely.
if err = check.AccessGrant(in.Grants, true); err != nil {
return nil, err
}