Skip to content

Fix incorrect /tokens api #32085

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

Merged
merged 7 commits into from
Sep 20, 2024
Merged

Fix incorrect /tokens api #32085

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
560b444
Add missing scopes output.
KN4CK3R Sep 19, 2024
72ab29c
Merge branch 'main' into fix-token-api-32078
lunny Sep 19, 2024
a6df958
Fix tests.
KN4CK3R Sep 19, 2024
9bba0d4
Merge branch 'main' into fix-token-api-32078
KN4CK3R Sep 20, 2024
80100ac
Merge branch 'main' into fix-token-api-32078
wxiaoguang Sep 20, 2024
46b07bb
Apply suggestions from code review
lunny Sep 20, 2024
53b72c1
Merge branch 'main' into fix-token-api-32078
lunny Sep 20, 2024
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
5 changes: 5 additions & 0 deletions routers/api/v1/user/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ func CreateAccessToken(ctx *context.APIContext) {
ctx.Error(http.StatusBadRequest, "AccessTokenScope.Normalize", fmt.Errorf("invalid access token scope provided: %w", err))
return
}
if scope == "" {
ctx.Error(http.StatusBadRequest, "AccessTokenScope", "access token must have a scope")
return
}
t.Scope = scope

if err := auth_model.NewAccessToken(ctx, t); err != nil {
Expand All @@ -129,6 +133,7 @@ func CreateAccessToken(ctx *context.APIContext) {
Token: t.Token,
ID: t.ID,
TokenLastEight: t.TokenLastEight,
Scopes: t.Scope.StringSlice(),
})
}

Expand Down
Loading