Remove option for normalization

Author: kdumontnu

custom/conf/app.example.ini

@@ -1525,8 +1525,10 @@ LEVEL = Info
 ;; userid = use the userid / sub attribute
 ;; nickname = use the nickname attribute
 ;; email = use the username part of the email attribute
-;; email-normalized = use the username part of the email attribute with single-quotes  
-;; removed, and any other non-supported username characters replaced with a `-` character
+;; Note: `nickname` and `email` options will normalize input strings using the following criteria:
+;; - diacritics are removed
+;; - single-quotes are removed
+;; - the characters set `\s,` is replaced with `-`
 ;USERNAME = nickname
 ;;
 ;; Update avatar if available from oauth2 provider.

docs/content/administration/config-cheat-sheet.en-us.md

@@ -595,10 +595,13 @@ And the following unique queues:
 - `OPENID_CONNECT_SCOPES`: **_empty_**: List of additional openid connect scopes. (`openid` is implicitly added)
 - `ENABLE_AUTO_REGISTRATION`: **false**: Automatically create user accounts for new oauth2 users.
 - `USERNAME`: **nickname**: The source of the username for new oauth2 accounts:
-  - userid - use the userid / sub attribute
-  - nickname - use the nickname attribute
-  - email - use the username part of the email attribute
-  - email-normalized - use the username part of the email attribute with diacritics and single-quotes removed, and `\s,` replaced with `-`
+  - `userid` - use the userid / sub attribute
+  - `nickname` - use the nickname attribute
+  - `email` - use the username part of the email attribute
+  - Note: `nickname` and `email` options will normalize input strings using the following criteria:
+    - diacritics are removed
+    - single-quotes are removed
+    - the characters set `\s,` is 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:
   - disabled - show an error

models/user/user_test.go

@@ -553,13 +553,13 @@ func Test_NormalizeUserFromEmail(t *testing.T) {
 	}{
 		{"test", "test", true},
 		{"Sinéad.O'Connor", "Sinead.OConnor", true},
-		{"Æsir", "-sir", false}, // Currently unsupported
+		{"Æsir", "Æsir", false}, // Currently unsupported
 		// \u00e9\u0065\u0301
 		{"éé", "ee", true},
 		{"Awareness Hub", "Awareness-Hub", true},
 		{"double__underscore", "double__underscore", false}, // We should consider squashing double non-alpha characters
 		{".bad.", ".bad.", false},
-		{"new😀user", "new-user", true},
+		{"new😀user", "new😀user", false},
 	}
 	for _, testCase := range testCases {
 		normalizedName, err := user_model.NormalizeUserName(testCase.Input)

modules/setting/oauth2.go

@@ -23,15 +23,11 @@ const (
 	OAuth2UsernameNickname OAuth2UsernameType = "nickname"
 	// OAuth2UsernameEmail username of oauth2 email field will be used as gitea name
 	OAuth2UsernameEmail OAuth2UsernameType = "email"
-	// OAuth2UsernameEmail username of oauth2 email field will be used as gitea name, with
-	// single-quotes removed, and any other non-supported username characters replaced with
-	// a `-` character
-	OAuth2UsernameEmailNormalized OAuth2UsernameType = "email-normalized"
 )
 
 func (username OAuth2UsernameType) isValid() bool {
 	switch username {
-	case OAuth2UsernameUserid, OAuth2UsernameNickname, OAuth2UsernameEmail, OAuth2UsernameEmailNormalized:
+	case OAuth2UsernameUserid, OAuth2UsernameNickname, OAuth2UsernameEmail:
 		return true
 	}
 	return false

routers/web/auth/auth.go

@@ -371,11 +371,9 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember, obeyRe
 func getUserName(gothUser *goth.User) (string, error) {
 	switch setting.OAuth2Client.Username {
 	case setting.OAuth2UsernameEmail:
-		return strings.Split(gothUser.Email, "@")[0], nil
-	case setting.OAuth2UsernameEmailNormalized:
 		return user_model.NormalizeUserName(strings.Split(gothUser.Email, "@")[0])
 	case setting.OAuth2UsernameNickname:
-		return gothUser.NickName, nil
+		return user_model.NormalizeUserName(gothUser.NickName)
 	default: // OAuth2UsernameUserid
 		return gothUser.UserID, nil
 	}