Add preferred_username setting option

SimonErm · SimonErm · commit 117dab6b83b9 · 2024-04-15T17:34:26.000+02:00
diff --git a/modules/setting/oauth2.go b/modules/setting/oauth2.go
@@ -22,11 +22,13 @@ const (
 	OAuth2UsernameNickname OAuth2UsernameType = "nickname"
 	// OAuth2UsernameEmail username of oauth2 email field will be used as gitea name
 	OAuth2UsernameEmail OAuth2UsernameType = "email"
+	// OAuth2UsernameEmail username of oauth2 preferred_username field will be used as gitea name
+	OAuth2UsernamePreferredUsername OAuth2UsernameType = "preferred_username"
 )
 
 func (username OAuth2UsernameType) isValid() bool {
 	switch username {
-	case OAuth2UsernameUserid, OAuth2UsernameNickname, OAuth2UsernameEmail:
+	case OAuth2UsernameUserid, OAuth2UsernameNickname, OAuth2UsernameEmail, OAuth2UsernamePreferredUsername:
 		return true
 	}
 	return false

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,13 @@ const (`
`22`	`22`	`OAuth2UsernameNickname OAuth2UsernameType = "nickname"`
`23`	`23`	`// OAuth2UsernameEmail username of oauth2 email field will be used as gitea name`
`24`	`24`	`OAuth2UsernameEmail OAuth2UsernameType = "email"`
	`25`	`+ // OAuth2UsernameEmail username of oauth2 preferred_username field will be used as gitea name`
	`26`	`+ OAuth2UsernamePreferredUsername OAuth2UsernameType = "preferred_username"`
`25`	`27`	`)`
`26`	`28`
`27`	`29`	`func (username OAuth2UsernameType) isValid() bool {`
`28`	`30`	`switch username {`
`29`		`- case OAuth2UsernameUserid, OAuth2UsernameNickname, OAuth2UsernameEmail:`
	`31`	`+ case OAuth2UsernameUserid, OAuth2UsernameNickname, OAuth2UsernameEmail, OAuth2UsernamePreferredUsername:`
`30`	`32`	`return true`
`31`	`33`	`}`
`32`	`34`	`return false`