Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-02 17:20:53 +02:00
Code Issues Activity

Improve oauth2 client "preferred username field" logic and the error handling (#30622)

Browse Source 
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.
This commit is contained in:
wxiaoguang authored and GitHub committed 2024-04-25 11:22:32 +00:00
1 parent d0bfc978de
commit bffbbf5470
16 files changed
+173 -68
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

templates/user/auth/link_account.tmpl
+4 -7
View File
@@ -17,15 +17,12 @@
</overflow-menu>
<div class="ui middle very relaxed page grid">
<div class="column">
<div class="ui tab {{if not .user_exists}}active{{end}}"
data-tab="auth-link-signup-tab">
<div class="ui tab {{if not .user_exists}}active{{end}}" data-tab="auth-link-signup-tab">
{{if .AutoRegistrationFailedPrompt}}<div class="ui message">{{.AutoRegistrationFailedPrompt}}</div>{{end}}
{{template "user/auth/signup_inner" .}}
</div>
<div class="ui tab {{if .user_exists}}active{{end}}"
data-tab="auth-link-signin-tab">
<div class="ui user signin container icon">
{{template "user/auth/signin_inner" .}}
</div>
<div class="ui tab {{if .user_exists}}active{{end}}" data-tab="auth-link-signin-tab">
{{template "user/auth/signin_inner" .}}
</div>
</div>
</div>