From b98ce19211546c6e082053734b03caecedd8e569 Mon Sep 17 00:00:00 2001 From: Mr Forest Date: Wed, 16 Nov 2022 00:39:05 +0800 Subject: [PATCH] feat: fix bug in GetDefaultApplication() that caused login error for other orgs (#1299) * fix:fix bug in GetDefaultApplication * fix:fix bug in GetDefaultApplication --- object/organization.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/object/organization.go b/object/organization.go index 900d9e4f..9315f61c 100644 --- a/object/organization.go +++ b/object/organization.go @@ -222,7 +222,12 @@ func GetDefaultApplication(id string) (*Application, error) { } if organization.DefaultApplication != "" { - return getApplication("admin", organization.DefaultApplication), fmt.Errorf("The default application: %s does not exist", organization.DefaultApplication) + defaultApplication := getApplication("admin", organization.DefaultApplication) + if defaultApplication == nil { + return nil, fmt.Errorf("The default application: %s does not exist", organization.DefaultApplication) + } else { + return defaultApplication, nil + } } applications := []*Application{}