diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-04-25 19:22:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-25 11:22:32 +0000 |
| commit | bffbbf547063fa170cc52ae2e757d5badb336632 (patch) | |
| tree | de5e17bfdbc504c7c9788ebcd09978340e241b40 /options | |
| parent | d0bfc978de802683b9a44720b7f5a8a8394d38be (diff) | |
| download | gitea-bffbbf547063fa170cc52ae2e757d5badb336632.tar.gz gitea-bffbbf547063fa170cc52ae2e757d5badb336632.zip | |
Improve oauth2 client "preferred username field" logic and the error handling (#30622)
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.
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4f17b1a6db..fb591be393 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -436,6 +436,7 @@ oauth_signin_submit = Link Account oauth.signin.error = There was an error processing the authorization request. If this error persists, please contact the site administrator. oauth.signin.error.access_denied = The authorization request was denied. oauth.signin.error.temporarily_unavailable = Authorization failed because the authentication server is temporarily unavailable. Please try again later. +oauth_callback_unable_auto_reg = Auto Registration is enabled, but OAuth2 Provider %[1]s returned missing fields: %[2]s, unable to create an account automatically, please create or link to an account, or contact the site administrator. openid_connect_submit = Connect openid_connect_title = Connect to an existing account openid_connect_desc = The chosen OpenID URI is unknown. Associate it with a new account here. |