-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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.
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
Improve oauth2 scope token handling #32633
Merged
Merged
+21
−12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Nov 25, 2024
pull-request-size
bot
added
the
size/XS
Denotes a PR that changes 0-9 lines, ignoring generated files.
label
Nov 25, 2024
wxiaoguang
added
type/bug
issue/regression
Indicates a previously functioning feature or behavior that has broken or regressed after a change
skip-changelog
This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
labels
Nov 25, 2024
github-actions
bot
added
modifies/api
This PR adds API routes or modifies them
modifies/go
Pull requests that update Go code
labels
Nov 25, 2024
This was referenced Nov 25, 2024
wxiaoguang
force-pushed
the
fix-oauth2-token
branch
from
November 25, 2024 04:31
7691832
to
1923bb6
Compare
pull-request-size
bot
added
size/S
Denotes a PR that changes 10-29 lines, ignoring generated files.
and removed
size/XS
Denotes a PR that changes 0-9 lines, ignoring generated files.
labels
Nov 25, 2024
lunny
approved these changes
Nov 25, 2024
GiteaBot
added
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
and removed
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
labels
Nov 25, 2024
wxiaoguang
force-pushed
the
fix-oauth2-token
branch
from
November 25, 2024 05:40
1923bb6
to
58bc9e0
Compare
wxiaoguang
force-pushed
the
fix-oauth2-token
branch
from
November 25, 2024 05:40
58bc9e0
to
4597729
Compare
i'm sure @wxiaoguang aligned better with the gitea's style. this is the minimal diff doing the same: modified services/oauth2_provider/access_token.go
@@ -83,7 +83,7 @@ func GrantAdditionalScopes(grantScopes string) auth.AccessTokenScope {
var tokenScopes []string
for _, tokenScope := range strings.Split(grantScopes, " ") {
- if slices.Index(scopesSupported, tokenScope) == -1 {
+ if slices.Index(scopesSupported, tokenScope) == -1 && tokenScope != "" {
tokenScopes = append(tokenScopes, tokenScope)
}
} |
pull-request-size
bot
added
size/M
Denotes a PR that changes 30-99 lines, ignoring generated files.
and removed
size/S
Denotes a PR that changes 10-29 lines, ignoring generated files.
labels
Nov 25, 2024
Applied your suggestion in a9415a6, major changes:
|
Zettat123
approved these changes
Nov 26, 2024
GiteaBot
added
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
and removed
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
labels
Nov 26, 2024
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Nov 27, 2024
* giteaofficial/main: Introduce OrgList and add LoadTeams, optimaze Load teams for orgs (go-gitea#32543) Refactor markup render system (go-gitea#32645) Fix: passkey login not working anymore (go-gitea#32623) Refactor some frontend problems (go-gitea#32646) Bypass vitest bug (go-gitea#32647) Fix race condition in mermaid observer (go-gitea#32599) Improve oauth2 scope token handling (go-gitea#32633) Fixed Issue of Review Menu Shown Behind (go-gitea#32631) Add github compatible tarball download API endpoints (go-gitea#32572) Fix markup render regression and fix some tests (go-gitea#32640) Fix sqlite3 test (go-gitea#32622) Strict pagination check (go-gitea#32548)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
issue/regression
Indicates a previously functioning feature or behavior that has broken or regressed after a change
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
modifies/api
This PR adds API routes or modifies them
modifies/go
Pull requests that update Go code
size/M
Denotes a PR that changes 30-99 lines, ignoring generated files.
skip-changelog
This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
type/bug
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.