llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: skip username restriction for new users coming from OAuth providers. (#1225)

Browse Source
This commit is contained in:
Gucheng
2022-10-17 18:01:01 +08:00
committed by GitHub
parent 50a52de856
commit 146aec9ee8
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
object/check.go
View File

@ -59,6 +59,11 @@ func CheckUserSignup(application *Application, organization *Organization, usern
if reWhiteSpace.MatchString(username) {
return "username cannot contain white spaces"
}
msg := CheckUsername(username)
if msg != "" {
return msg
}
if HasUserByField(organization.Name, "name", username) {
return "username already exists"
}
@ -314,16 +319,16 @@ func CheckAccessPermission(userId string, application *Application) (bool, error
return allowed, err
}
func CheckUsername(name string) string {
if name == "" {
func CheckUsername(username string) string {
if username == "" {
return "Empty username."
} else if len(name) > 39 {
} else if len(username) > 39 {
return "Username is too long (maximum is 39 characters)."
}
// https://stackoverflow.com/questions/58726546/github-username-convention-using-regex
re, _ := regexp.Compile("^[a-zA-Z0-9]+((?:-[a-zA-Z0-9]+)|(?:_[a-zA-Z0-9]+))*$")
if !re.MatchString(name) {
if !re.MatchString(username) {
return "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline."
}