aboutsummaryrefslogtreecommitdiffstats
path: root/docs/content
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2024-04-25 19:22:32 +0800
committerGitHub <noreply@github.com>2024-04-25 11:22:32 +0000
commitbffbbf547063fa170cc52ae2e757d5badb336632 (patch)
treede5e17bfdbc504c7c9788ebcd09978340e241b40 /docs/content
parentd0bfc978de802683b9a44720b7f5a8a8394d38be (diff)
downloadgitea-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 'docs/content')
-rw-r--r--docs/content/administration/config-cheat-sheet.en-us.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/content/administration/config-cheat-sheet.en-us.md b/docs/content/administration/config-cheat-sheet.en-us.md
index b295ddf53a..14f562fc21 100644
--- a/docs/content/administration/config-cheat-sheet.en-us.md
+++ b/docs/content/administration/config-cheat-sheet.en-us.md
@@ -612,7 +612,7 @@ And the following unique queues:
- `email` - use the username part of the email attribute
- Note: `nickname`, `preferred_username` and `email` options will normalize input strings using the following criteria:
- diacritics are removed
- - the characters in the set `['´\x60]` are removed
+ - the characters in the set ```['´`]``` are removed
- the characters in the set `[\s~+]` are replaced with `-`
- `UPDATE_AVATAR`: **false**: Update avatar if available from oauth2 provider. Update will be performed on each login.
- `ACCOUNT_LINKING`: **login**: How to handle if an account / email already exists: