Fix admin oauth2 custom URL settings #31246
Merged
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
pull-request-size
bot
added
the
size/M
wxiaoguang
added
type/bug
backport/v1.22
wxiaoguang
force-pushed
the
fix-admin-auth
branch
from
50a1962
to
b4b6a76
Compare
pull-request-size
bot
added
size/S
silverwind
approved these changes
Jun 4, 2024
GiteaBot
added
lgtm/need 1
yardenshoham
approved these changes
Jun 4, 2024
GiteaBot
added
lgtm/done
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Jun 4, 2024
wxiaoguang
added a commit
that referenced
this pull request
Jun 4, 2024
Backport #31246 by wxiaoguang Fix #31244 Co-authored-by: wxiaoguang <[email protected]>
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Jun 5, 2024
* giteaofficial/main: Add `lint-go-gopls` (go-gitea#30729) Make blockquote attention recognize more syntaxes (go-gitea#31240) Fix admin oauth2 custom URL settings (go-gitea#31246) Replace `gt-word-break` with `tw-break-anywhere` (go-gitea#31183) Make pasted "img" tag has the same behavior as markdown image (go-gitea#31235) Remove .segment from .project-column (go-gitea#31204) Fix overflow on push notification (go-gitea#31179) Fix NuGet Package API for $filter with Id equality (go-gitea#31188) Fix overflow on notifications (go-gitea#31178) Update chroma to v2.14.0 (go-gitea#31177) Update air package path (go-gitea#31233) Bump `@github/relative-time-element` to v4.4.1 (go-gitea#31232)
silverwind
added a commit
to silverwind/gitea
that referenced
this pull request
Jun 6, 2024
* origin/main: (231 commits) Allow including `Reviewed-on`/`Reviewed-by` lines for custom merge messages (go-gitea#31211) Add `MAX_ROWS` option for CSV rendering (go-gitea#30268) Update `golang.org/x/net` (go-gitea#31260) Add replacement module for `mholt/archiver` (go-gitea#31267) Fix Activity Page Contributors dropdown (go-gitea#31264) Optimize runner-tags layout to enhance visual experience (go-gitea#31258) fix: allow actions artifacts storage migration to complete succesfully (go-gitea#31251) Add `lint-go-gopls` (go-gitea#30729) Make blockquote attention recognize more syntaxes (go-gitea#31240) Fix admin oauth2 custom URL settings (go-gitea#31246) Replace `gt-word-break` with `tw-break-anywhere` (go-gitea#31183) Make pasted "img" tag has the same behavior as markdown image (go-gitea#31235) Remove .segment from .project-column (go-gitea#31204) Fix overflow on push notification (go-gitea#31179) Fix NuGet Package API for $filter with Id equality (go-gitea#31188) Fix overflow on notifications (go-gitea#31178) Update chroma to v2.14.0 (go-gitea#31177) Update air package path (go-gitea#31233) Bump `@github/relative-time-element` to v4.4.1 (go-gitea#31232) Add option for mailer to override mail headers (go-gitea#27860) ...
DennisRasey
pushed a commit
to DennisRasey/forgejo
that referenced
this pull request
Jun 21, 2024
#4059 was unfortunately incomplete: some custom_url fields are currently shown, even if they are not used by the provider. Moreover the `Use Custom URLs Instead of Default URLs` is always checked by default. Manual testing: - go to http://localhost:3000/admin/auths - click on `Add authentication source` - Choose `Authentication type`: `OAuth2` - Choose `OAuth2 provider`: `GitLab` - verify that the `Use Custom URLs Instead of Default URLs` option is **initially unchecked** - enable the `Use Custom URLs Instead of Default URLs` checkbox - verify that only the fields "Authorize", "Token" and "Profile" URLs are shown (no "Email URL", nor "Tenant"). - Switch the `OAuth2 provider` to `Azure AD v2` - verify that the `Use Custom URLs Instead of Default URLs` option is **initially checked** - verify that only the field "Tenant" is shown (with the default "organizations").  Note: this is loosely based on the upstream fix go-gitea/gitea#31246 which I initially overlooked. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4194 Reviewed-by: Earl Warren <[email protected]> Co-authored-by: oliverpool <[email protected]> Co-committed-by: oliverpool <[email protected]>
DennisRasey
pushed a commit
to DennisRasey/forgejo
that referenced
this pull request
Jun 21, 2024
#4059 was unfortunately incomplete: some custom_url fields are currently shown, even if they are not used by the provider. Moreover the `Use Custom URLs Instead of Default URLs` is always checked by default. Manual testing: - go to http://localhost:3000/admin/auths - click on `Add authentication source` - Choose `Authentication type`: `OAuth2` - Choose `OAuth2 provider`: `GitLab` - verify that the `Use Custom URLs Instead of Default URLs` option is **initially unchecked** - enable the `Use Custom URLs Instead of Default URLs` checkbox - verify that only the fields "Authorize", "Token" and "Profile" URLs are shown (no "Email URL", nor "Tenant"). - Switch the `OAuth2 provider` to `Azure AD v2` - verify that the `Use Custom URLs Instead of Default URLs` option is **initially checked** - verify that only the field "Tenant" is shown (with the default "organizations").  Note: this is loosely based on the upstream fix go-gitea/gitea#31246 which I initially overlooked. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4194 Reviewed-by: Earl Warren <[email protected]> Co-authored-by: oliverpool <[email protected]> Co-committed-by: oliverpool <[email protected]> (cherry picked from commit 65f8c22)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fix #31244 (Regression of #30115)