llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-02 11:20: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

64
object/model.go
View File

@ -32,56 +32,51 @@ type Model struct {
IsEnabled bool `json:"isEnabled"`
}
func GetModelCount(owner, field, value string) int {
func GetModelCount(owner, field, value string) (int64, error) {
session := GetSession(owner, -1, -1, field, value, "", "")
count, err := session.Count(&Model{})
if err != nil {
panic(err)
}
return int(count)
return session.Count(&Model{})
}
func GetModels(owner string) []*Model {
func GetModels(owner string) ([]*Model, error) {
models := []*Model{}
err := adapter.Engine.Desc("created_time").Find(&models, &Model{Owner: owner})
if err != nil {
panic(err)
return models, err
}
return models
return models, nil
}
func GetPaginationModels(owner string, offset, limit int, field, value, sortField, sortOrder string) []*Model {
func GetPaginationModels(owner string, offset, limit int, field, value, sortField, sortOrder string) ([]*Model, error) {
models := []*Model{}
session := GetSession(owner, offset, limit, field, value, sortField, sortOrder)
err := session.Find(&models)
if err != nil {
panic(err)
return models, err
}
return models
return models, nil
}
func getModel(owner string, name string) *Model {
func getModel(owner string, name string) (*Model, error) {
if owner == "" || name == "" {
return nil
return nil, nil
}
m := Model{Owner: owner, Name: name}
existed, err := adapter.Engine.Get(&m)
if err != nil {
panic(err)
return &m, err
}
if existed {
return &m
return &m, nil
} else {
return nil
return nil, nil
}
}
func GetModel(id string) *Model {
func GetModel(id string) (*Model, error) {
owner, name := util.GetOwnerAndNameFromId(id)
return getModel(owner, name)
}
@ -92,48 +87,53 @@ func UpdateModelWithCheck(id string, modelObj *Model) error {
if err != nil {
return err
}
UpdateModel(id, modelObj)
_, err = UpdateModel(id, modelObj)
if err != nil {
return err
}
return nil
}
func UpdateModel(id string, modelObj *Model) bool {
func UpdateModel(id string, modelObj *Model) (bool, error) {
owner, name := util.GetOwnerAndNameFromId(id)
if getModel(owner, name) == nil {
return false
if m, err := getModel(owner, name); err != nil {
return false, err
} else if m == nil {
return false, nil
}
if name != modelObj.Name {
err := modelChangeTrigger(name, modelObj.Name)
if err != nil {
return false
return false, err
}
}
affected, err := adapter.Engine.ID(core.PK{owner, name}).AllCols().Update(modelObj)
if err != nil {
panic(err)
return false, err
}
return affected != 0
return affected != 0, err
}
func AddModel(model *Model) bool {
func AddModel(model *Model) (bool, error) {
affected, err := adapter.Engine.Insert(model)
if err != nil {
panic(err)
return false, err
}
return affected != 0
return affected != 0, nil
}
func DeleteModel(model *Model) bool {
func DeleteModel(model *Model) (bool, error) {
affected, err := adapter.Engine.ID(core.PK{model.Owner, model.Name}).Delete(&Model{})
if err != nil {
panic(err)
return false, err
}
return affected != 0
return affected != 0, nil
}
func (model *Model) GetId() string {