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

feat: return most backend API errors to frontend (#1836)

Browse Source 
* feat: return most backend API errros to frontend

Signed-off-by: yehong <239859435@qq.com>

* refactor: reduce int type change

Signed-off-by: yehong <239859435@qq.com>

* feat: return err backend in token.go

Signed-off-by: yehong <239859435@qq.com>

---------

Signed-off-by: yehong <239859435@qq.com>
This commit is contained in:
yehong
2023-05-30 15:49:39 +08:00
committed by GitHub
parent 34151c0095
commit 02e692a300
105 changed files with 3788 additions and 1734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
object/user_upload.go
View File

@ -22,15 +22,18 @@ import (
"github.com/casdoor/casdoor/xlsx"
)
func getUserMap(owner string) map[string]*User {
func getUserMap(owner string) (map[string]*User, error) {
m := map[string]*User{}
users := GetUsers(owner)
users, err := GetUsers(owner)
if err != nil {
return m, err
}
for _, user := range users {
m[user.GetId()] = user
}
return m
return m, nil
}
func parseLineItem(line *[]string, i int) string {
@ -70,10 +73,14 @@ func parseListItem(lines *[]string, i int) []string {
return trimmedItems
}
func UploadUsers(owner string, fileId string) bool {
func UploadUsers(owner string, fileId string) (bool, error) {
table := xlsx.ReadXlsxFile(fileId)
oldUserMap := getUserMap(owner)
oldUserMap, err := getUserMap(owner)
if err != nil {
return false, err
}
newUsers := []*User{}
for index, line := range table {
if index == 0 || parseLineItem(&line, 0) == "" {
@ -135,7 +142,7 @@ func UploadUsers(owner string, fileId string) bool {
}
if len(newUsers) == 0 {
return false
return false, nil
}
return AddUsersInBatch(newUsers)
}