llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling for object/user.go

Browse Source
This commit is contained in:
Yang Luo 2023-10-31 13:20:44 +08:00
parent febb27f765
commit ac00713c20
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
object/user.go
View File

@ -561,7 +561,7 @@ func UpdateUser(id string, user *User, columns []string, isAdmin bool) (bool, er
return false, err return false, err
} }
if oldUser == nil { if oldUser == nil {
return false, nil return false, fmt.Errorf("the user: %s is not found", id)
} }
if name != user.Name { if name != user.Name {
@ -642,7 +642,7 @@ func UpdateUserForAllFields(id string, user *User) (bool, error) {
} }
if oldUser == nil { if oldUser == nil {
return false, nil return false, fmt.Errorf("the user: %s is not found", id)
} }
if name != user.Name { if name != user.Name {
@ -688,12 +688,15 @@ func AddUser(user *User) (bool, error) {
} }
if user.Owner == "" || user.Name == "" { if user.Owner == "" || user.Name == "" {
return false, nil return false, fmt.Errorf("the user's owner and name should not be empty")
} }
organization, _ := GetOrganizationByUser(user) organization, err := GetOrganizationByUser(user)
if err != nil {
return false, err
}
if organization == nil { if organization == nil {
return false, nil return false, fmt.Errorf("the organization: %s is not found", user.Owner)
} }
if organization.DefaultPassword != "" && user.Password == "123" { if organization.DefaultPassword != "" && user.Password == "123" {
@ -738,9 +741,8 @@ func AddUser(user *User) (bool, error) {
} }
func AddUsers(users []*User) (bool, error) { func AddUsers(users []*User) (bool, error) {
var err error
if len(users) == 0 { if len(users) == 0 {
return false, nil return false, fmt.Errorf("no users are provided")
} }
// organization := GetOrganizationByUser(users[0]) // organization := GetOrganizationByUser(users[0])
@ -748,7 +750,7 @@ func AddUsers(users []*User) (bool, error) {
// this function is only used for syncer or batch upload, so no need to encrypt the password // this function is only used for syncer or batch upload, so no need to encrypt the password
// user.UpdateUserPassword(organization) // user.UpdateUserPassword(organization)
err = user.UpdateUserHash() err := user.UpdateUserHash()
if err != nil { if err != nil {
return false, err return false, err
} }
@ -772,12 +774,12 @@ func AddUsers(users []*User) (bool, error) {
} }
func AddUsersInBatch(users []*User) (bool, error) { func AddUsersInBatch(users []*User) (bool, error) {
batchSize := conf.GetConfigBatchSize()
if len(users) == 0 { if len(users) == 0 {
return false, nil return false, fmt.Errorf("no users are provided")
} }
batchSize := conf.GetConfigBatchSize()
affected := false affected := false
for i := 0; i < len(users); i += batchSize { for i := 0; i < len(users); i += batchSize {
start := i start := i
@ -947,7 +949,7 @@ func (user *User) GetPreferredMfaProps(masked bool) *MfaProps {
func AddUserkeys(user *User, isAdmin bool) (bool, error) { func AddUserkeys(user *User, isAdmin bool) (bool, error) {
if user == nil { if user == nil {
return false, nil return false, fmt.Errorf("the user is not found")
} }
user.AccessKey = util.GenerateId() user.AccessKey = util.GenerateId()