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

Add error to GetDefaultApplication()

Browse Source
This commit is contained in:
Gucheng Wang
2022-10-09 10:39:33 +08:00
parent a955fb57d6
commit 44ad88353f
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
object/organization.go
View File

@ -218,14 +218,14 @@ func CheckAccountItemModifyRule(accountItem *AccountItem, user *User) (bool, str
return true, ""
}
func GetDefaultApplication(id string) *Application {
func GetDefaultApplication(id string) (*Application, error) {
organization := GetOrganization(id)
if organization == nil {
return nil
return nil, fmt.Errorf("The organization: %s does not exist", id)
}
if organization.DefaultApplication != "" {
return getApplication("admin", organization.DefaultApplication)
return getApplication("admin", organization.DefaultApplication), fmt.Errorf("The default application: %s does not exist", organization.DefaultApplication)
}
applications := []*Application{}
@ -235,7 +235,7 @@ func GetDefaultApplication(id string) *Application {
}
if len(applications) == 0 {
return nil
return nil, fmt.Errorf("The application does not exist")
}
defaultApplication := applications[0]
@ -249,5 +249,5 @@ func GetDefaultApplication(id string) *Application {
extendApplicationWithProviders(defaultApplication)
extendApplicationWithOrg(defaultApplication)
return defaultApplication
return defaultApplication, nil
}