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

feat: fix username checks when organization.UseEmailAsUsername is enabled (#3329)

Browse Source 
* feat: Username support email format

* feat: Only fulfill the first requirement

* fix: Improve code robustness
This commit is contained in:
Luckery
2024-11-05 20:38:47 +08:00
committed by GitHub
parent 457c6098a4
commit 0818de85d1
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
util/validation.go
View File

@ -25,10 +25,11 @@ import (
)
var (
rePhone *regexp.Regexp
ReWhiteSpace *regexp.Regexp
ReFieldWhiteList *regexp.Regexp
ReUserName *regexp.Regexp
rePhone *regexp.Regexp
ReWhiteSpace *regexp.Regexp
ReFieldWhiteList *regexp.Regexp
ReUserName *regexp.Regexp
ReUserNameWithEmail *regexp.Regexp
)
func init() {
@ -36,6 +37,7 @@ func init() {
ReWhiteSpace, _ = regexp.Compile(`\s`)
ReFieldWhiteList, _ = regexp.Compile(`^[A-Za-z0-9]+$`)
ReUserName, _ = regexp.Compile("^[a-zA-Z0-9]+([-._][a-zA-Z0-9]+)*$")
ReUserNameWithEmail, _ = regexp.Compile(`^([a-zA-Z0-9]+([-._][a-zA-Z0-9]+)*)|([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})$`) // Add support for email formats
}
func IsEmailValid(email string) bool {