From 1b59a52f26b660ae10e283202f40507fc21b23da Mon Sep 17 00:00:00 2001 From: Fabi <38692350+fgerschwiler@users.noreply.github.com> Date: Thu, 9 Jul 2020 18:39:10 +0200 Subject: [PATCH] fix: return my org on zitadel permission (#441) --- .../eventsourcing/eventstore/user_grant.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/internal/auth/repository/eventsourcing/eventstore/user_grant.go b/internal/auth/repository/eventsourcing/eventstore/user_grant.go index d711e881e..fb59cc99e 100644 --- a/internal/auth/repository/eventsourcing/eventstore/user_grant.go +++ b/internal/auth/repository/eventsourcing/eventstore/user_grant.go @@ -62,7 +62,21 @@ func (repo *UserGrantRepo) SearchMyProjectOrgs(ctx context.Context, request *gra if err != nil { return nil, err } - return grantRespToOrgResp(grants), nil + if len(grants.Result) > 0 { + return grantRespToOrgResp(grants), nil + } + user, err := repo.View.UserByID(ctxData.UserID) + if err != nil { + return nil, err + } + org, err := repo.View.OrgByID(user.ResourceOwner) + if err != nil { + return nil, err + } + return &grant_model.ProjectOrgSearchResponse{Result: []*grant_model.Org{&grant_model.Org{ + OrgID: org.ID, + OrgName: org.Name, + }}}, nil } func (repo *UserGrantRepo) SearchMyZitadelPermissions(ctx context.Context) ([]string, error) {