llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-09-09 08:02:55 +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

9
controllers/organization.go
View File

@@ -133,11 +133,12 @@ func (c *ApiController) GetDefaultApplication() {
userId := c.GetSessionUsername() userId := c.GetSessionUsername()
id := c.Input().Get("id") id := c.Input().Get("id")
application := object.GetMaskedApplication(object.GetDefaultApplication(id), userId) application, err := object.GetDefaultApplication(id)
if application == nil { if err != nil {
c.ResponseError("Please set a default application for this organization") c.ResponseError(err.Error())
return return
} }
c.ResponseOk(application) maskedApplication := object.GetMaskedApplication(application, userId)
c.ResponseOk(maskedApplication)
} }

10
object/organization.go
View File

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