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

87
object/syncer.go
View File

@ -55,66 +55,61 @@ type Syncer struct {
Adapter *Adapter `xorm:"-" json:"-"`
}
func GetSyncerCount(owner, organization, field, value string) int {
func GetSyncerCount(owner, organization, field, value string) (int64, error) {
session := GetSession(owner, -1, -1, field, value, "", "")
count, err := session.Count(&Syncer{Organization: organization})
if err != nil {
panic(err)
}
return int(count)
return session.Count(&Syncer{Organization: organization})
}
func GetSyncers(owner string) []*Syncer {
func GetSyncers(owner string) ([]*Syncer, error) {
syncers := []*Syncer{}
err := adapter.Engine.Desc("created_time").Find(&syncers, &Syncer{Owner: owner})
if err != nil {
panic(err)
return syncers, err
}
return syncers
return syncers, nil
}
func GetOrganizationSyncers(owner, organization string) []*Syncer {
func GetOrganizationSyncers(owner, organization string) ([]*Syncer, error) {
syncers := []*Syncer{}
err := adapter.Engine.Desc("created_time").Find(&syncers, &Syncer{Owner: owner, Organization: organization})
if err != nil {
panic(err)
return syncers, err
}
return syncers
return syncers, nil
}
func GetPaginationSyncers(owner, organization string, offset, limit int, field, value, sortField, sortOrder string) []*Syncer {
func GetPaginationSyncers(owner, organization string, offset, limit int, field, value, sortField, sortOrder string) ([]*Syncer, error) {
syncers := []*Syncer{}
session := GetSession(owner, offset, limit, field, value, sortField, sortOrder)
err := session.Find(&syncers, &Syncer{Organization: organization})
if err != nil {
panic(err)
return syncers, err
}
return syncers
return syncers, nil
}
func getSyncer(owner string, name string) *Syncer {
func getSyncer(owner string, name string) (*Syncer, error) {
if owner == "" || name == "" {
return nil
return nil, nil
}
syncer := Syncer{Owner: owner, Name: name}
existed, err := adapter.Engine.Get(&syncer)
if err != nil {
panic(err)
return &syncer, err
}
if existed {
return &syncer
return &syncer, nil
} else {
return nil
return nil, nil
}
}
func GetSyncer(id string) *Syncer {
func GetSyncer(id string) (*Syncer, error) {
owner, name := util.GetOwnerAndNameFromId(id)
return getSyncer(owner, name)
}
@ -137,10 +132,12 @@ func GetMaskedSyncers(syncers []*Syncer) []*Syncer {
return syncers
}
func UpdateSyncer(id string, syncer *Syncer) bool {
func UpdateSyncer(id string, syncer *Syncer) (bool, error) {
owner, name := util.GetOwnerAndNameFromId(id)
if getSyncer(owner, name) == nil {
return false
if s, err := getSyncer(owner, name); err != nil {
return false, err
} else if s == nil {
return false, nil
}
session := adapter.Engine.ID(core.PK{owner, name}).AllCols()
@ -149,56 +146,66 @@ func UpdateSyncer(id string, syncer *Syncer) bool {
}
affected, err := session.Update(syncer)
if err != nil {
panic(err)
return false, err
}
if affected == 1 {
addSyncerJob(syncer)
err = addSyncerJob(syncer)
if err != nil {
return false, err
}
}
return affected != 0
return affected != 0, nil
}
func updateSyncerErrorText(syncer *Syncer, line string) bool {
s := getSyncer(syncer.Owner, syncer.Name)
func updateSyncerErrorText(syncer *Syncer, line string) (bool, error) {
s, err := getSyncer(syncer.Owner, syncer.Name)
if err != nil {
return false, err
}
if s == nil {
return false
return false, nil
}
s.ErrorText = s.ErrorText + line
affected, err := adapter.Engine.ID(core.PK{s.Owner, s.Name}).Cols("error_text").Update(s)
if err != nil {
panic(err)
return false, err
}
return affected != 0
return affected != 0, nil
}
func AddSyncer(syncer *Syncer) bool {
func AddSyncer(syncer *Syncer) (bool, error) {
affected, err := adapter.Engine.Insert(syncer)
if err != nil {
panic(err)
return false, err
}
if affected == 1 {
addSyncerJob(syncer)
err = addSyncerJob(syncer)
if err != nil {
return false, err
}
}
return affected != 0
return affected != 0, nil
}
func DeleteSyncer(syncer *Syncer) bool {
func DeleteSyncer(syncer *Syncer) (bool, error) {
affected, err := adapter.Engine.ID(core.PK{syncer.Owner, syncer.Name}).Delete(&Syncer{})
if err != nil {
panic(err)
return false, err
}
if affected == 1 {
deleteSyncerJob(syncer)
}
return affected != 0
return affected != 0, nil
}
func (syncer *Syncer) GetId() string {