Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow setting access token scope by CLI #22648

Merged
merged 7 commits into from
Feb 2, 2023
Merged

Allow setting access token scope by CLI #22648

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e300b8f
Allow setting access token scope by CLI
lukashass Jan 28, 2023
ac1824e
Merge branch 'main' into cli-allow-setting-access-token-scope
lunny Jan 29, 2023
60cca20
Merge branch 'main' into cli-allow-setting-access-token-scope
jolheiser Jan 29, 2023
c1459e3
Merge branch 'main' into cli-allow-setting-access-token-scope
lunny Jan 30, 2023
e59da0a
Merge branch 'main' into cli-allow-setting-access-token-scope
lunny Jan 31, 2023
cc83c1f
Merge branch 'main' into cli-allow-setting-access-token-scope
lunny Jan 31, 2023
15c574c
Merge branch 'main' into cli-allow-setting-access-token-scope
lunny Feb 2, 2023
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
15 changes: 13 additions & 2 deletions cmd/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,11 @@ var (
Name: "raw",
Usage: "Display only the token value",
},
cli.StringFlag{
Name: "scopes",
Value: "",
Usage: "Comma separated list of scopes to apply to access token",
},
},
Action: runGenerateAccessToken,
}
Expand Down Expand Up @@ -698,9 +703,15 @@ func runGenerateAccessToken(c *cli.Context) error {
return err
}

accessTokenScope, err := auth_model.AccessTokenScope(c.String("scopes")).Normalize()
if err != nil {
return err
}

t := &auth_model.AccessToken{
Name: c.String("token-name"),
UID: user.ID,
Name: c.String("token-name"),
UID: user.ID,
Scope: accessTokenScope,
}

if err := auth_model.NewAccessToken(t); err != nil {
Expand Down