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

Remove user's PhonePrefix.

Browse Source
This commit is contained in:
Yang Luo
2021-05-15 13:54:23 +08:00
parent 43db2de8d8
commit 2ea5e7ec78
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
controllers/account.go
View File

@ -37,7 +37,6 @@ type RequestForm struct {
Password string `json:"password"` Password string `json:"password"`
Name string `json:"name"` Name string `json:"name"`
Email string `json:"email"` Email string `json:"email"`
PhonePrefix string `json:"phonePrefix"`
Phone string `json:"phone"` Phone string `json:"phone"`
Affiliation string `json:"affiliation"` Affiliation string `json:"affiliation"`
@ -87,7 +86,7 @@ func (c *ApiController) Signup() {
} }
userId := fmt.Sprintf("%s/%s", form.Organization, form.Username) userId := fmt.Sprintf("%s/%s", form.Organization, form.Username)
msg := object.CheckUserSignup(form.Organization, form.Username, form.Password, form.Name, form.Email, form.PhonePrefix, form.Phone, form.Affiliation) msg := object.CheckUserSignup(form.Organization, form.Username, form.Password, form.Name, form.Email, form.Phone, form.Affiliation)
if msg != "" { if msg != "" {
resp = Response{Status: "error", Msg: msg, Data: ""} resp = Response{Status: "error", Msg: msg, Data: ""}
} else { } else {

14
object/check.go
View File

@ -27,20 +27,22 @@ func init() {
reWhiteSpace, _ = regexp.Compile("\\s") reWhiteSpace, _ = regexp.Compile("\\s")
} }
func CheckUserSignup(organization string, username string, password string, displayName string, email string, phonePrefix string, phone string, affiliation string) string { func CheckUserSignup(organizationName string, username string, password string, displayName string, email string, phone string, affiliation string) string {
organization := getOrganization("admin", organizationName)
if len(username) == 0 { if len(username) == 0 {
return "username cannot be blank" return "username cannot be blank"
} else if len(password) == 0 { } else if len(password) == 0 {
return "password cannot be blank" return "password cannot be blank"
} else if getOrganization("admin", organization) == nil { } else if organization == nil {
return "organization does not exist" return "organization does not exist"
} else if reWhiteSpace.MatchString(username) { } else if reWhiteSpace.MatchString(username) {
return "username cannot contain white spaces" return "username cannot contain white spaces"
} else if HasUserByField(organization, "name", username) { } else if HasUserByField(organizationName, "name", username) {
return "username already exists" return "username already exists"
} else if HasUserByField(organization, "email", email) { } else if HasUserByField(organizationName, "email", email) {
return "email already exists" return "email already exists"
} else if HasUserByField(organization, "phone", phone) { } else if HasUserByField(organizationName, "phone", phone) {
return "phone already exists" return "phone already exists"
} else if displayName == "" { } else if displayName == "" {
return "displayName cannot be blank" return "displayName cannot be blank"
@ -48,7 +50,7 @@ func CheckUserSignup(organization string, username string, password string, disp
return "affiliation cannot be blank" return "affiliation cannot be blank"
} else if !util.IsEmailValid(email) { } else if !util.IsEmailValid(email) {
return "email is invalid" return "email is invalid"
} else if phonePrefix == "86" && !util.IsPhoneCnValid(phone) { } else if organization.PhonePrefix == "86" && !util.IsPhoneCnValid(phone) {
return "phone number is invalid" return "phone number is invalid"
} else { } else {
return "" return ""

1
original/sync.go
View File

@ -45,7 +45,6 @@ func createUserFromOriginalUser(originalUser *User) *object.User {
DisplayName: originalUser.Name, DisplayName: originalUser.Name,
Avatar: getFullAvatarUrl(originalUser.Avatar), Avatar: getFullAvatarUrl(originalUser.Avatar),
Email: "", Email: "",
PhonePrefix: "86",
Phone: originalUser.Cellphone, Phone: originalUser.Cellphone,
Affiliation: "", Affiliation: "",
IsAdmin: false, IsAdmin: false,