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.

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 client "preferred username field" logic and the error handling #30622

Merged
merged 4 commits into from
Apr 25, 2024

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Apr 21, 2024

Follow #30454
And fix #24957

When using "preferred_username", if no such field, extractUserNameFromOAuth2 (old getUserName) shouldn't return an error. All other USERNAME options do not return such error.

And fine tune some logic and error messages, make code more stable and more friendly to end users.

image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 21, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 21, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Apr 21, 2024
@GiteaBot 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 Apr 21, 2024
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 21, 2024
@github-actions github-actions bot added modifies/translation modifies/templates This PR modifies the template files labels Apr 21, 2024
@wxiaoguang wxiaoguang changed the title Improve oauth2 client "preferred username field" Improve oauth2 client "preferred username field" and the error handling when fields are missing Apr 21, 2024
@wxiaoguang wxiaoguang changed the title Improve oauth2 client "preferred username field" and the error handling when fields are missing Improve oauth2 client "preferred username field" logic and the error handling Apr 21, 2024
@wxiaoguang wxiaoguang force-pushed the fix-oauth2-prefer branch 3 times, most recently from 39e16a5 to a517009 Compare April 23, 2024 19:30
routers/web/auth/oauth.go Outdated Show resolved Hide resolved
@GiteaBot 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 Apr 25, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) April 25, 2024 11:00
@wxiaoguang wxiaoguang merged commit bffbbf5 into go-gitea:main Apr 25, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Apr 25, 2024
@wxiaoguang wxiaoguang deleted the fix-oauth2-prefer branch April 25, 2024 11:33
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 26, 2024
* giteaofficial/main:
  Deduplicate lfs common code (go-gitea#30704)
  Improve job commit description (go-gitea#30579)
  Improve test for TestPullCompare (go-gitea#30699)
  Allow to save empty comment (go-gitea#30706)
  [skip ci] Updated translations via Crowdin
  Refactor imagediff and fix regression bug (go-gitea#30694)
  Improve oauth2 client "preferred username field" logic and the error handling (go-gitea#30622)
  Fix active item in tab menu (go-gitea#30690)
@wxiaoguang wxiaoguang modified the milestones: 1.23.0, 1.22.0 Apr 27, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/docs modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files modifies/translation size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Discord OAuth broken: OAuth2 Provider discord returned empty or missing fields: [nickname]
4 participants