TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-04-26 06:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: project grant join (#2525)

Browse Source 
* fix: project grant join granted org name

* fix: search granted projects
This commit is contained in:
Fabi 2021-10-18 17:45:38 +02:00 committed by GitHub
parent 040b53305c
commit 25c009ad0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/grpc/management/project.go
View File

@ -63,7 +63,7 @@ func (s *Server) ListGrantedProjects(ctx context.Context, req *mgmt_pb.ListGrant
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = queries.AppendMyResourceOwnerQuery(authz.GetCtxData(ctx).OrgID) err = queries.AppendGrantedOrgQuery(authz.GetCtxData(ctx).OrgID)
if err != nil { if err != nil {
return nil, err return nil, err
} }

19
internal/query/project_grant.go
View File

@ -190,6 +190,10 @@ func NewProjectGrantResourceOwnerSearchQuery(value string) (SearchQuery, error)
return NewTextQuery(ProjectGrantColumnResourceOwner, value, TextEquals) return NewTextQuery(ProjectGrantColumnResourceOwner, value, TextEquals)
} }
func NewProjectGrantGrantedOrgIDSearchQuery(value string) (SearchQuery, error) {
return NewTextQuery(ProjectGrantColumnGrantedOrgID, value, TextEquals)
}
func (r *ProjectGrantSearchQueries) AppendMyResourceOwnerQuery(orgID string) error { func (r *ProjectGrantSearchQueries) AppendMyResourceOwnerQuery(orgID string) error {
query, err := NewProjectGrantResourceOwnerSearchQuery(orgID) query, err := NewProjectGrantResourceOwnerSearchQuery(orgID)
if err != nil { if err != nil {
@ -199,6 +203,15 @@ func (r *ProjectGrantSearchQueries) AppendMyResourceOwnerQuery(orgID string) err
return nil return nil
} }
func (r *ProjectGrantSearchQueries) AppendGrantedOrgQuery(orgID string) error {
query, err := NewProjectGrantGrantedOrgIDSearchQuery(orgID)
if err != nil {
return err
}
r.Queries = append(r.Queries, query)
return nil
}
func (r ProjectGrantSearchQueries) AppendPermissionQueries(permissions []string) error { func (r ProjectGrantSearchQueries) AppendPermissionQueries(permissions []string) error {
if !authz.HasGlobalPermission(permissions) { if !authz.HasGlobalPermission(permissions) {
ids := authz.GetAllPermissionCtxIDs(permissions) ids := authz.GetAllPermissionCtxIDs(permissions)
@ -240,7 +253,7 @@ func prepareProjectGrantQuery() (sq.SelectBuilder, func(*sql.Row) (*ProjectGrant
From(projectGrantsTable.identifier()).PlaceholderFormat(sq.Dollar). From(projectGrantsTable.identifier()).PlaceholderFormat(sq.Dollar).
LeftJoin(join(ProjectColumnID, ProjectGrantColumnProjectID)). LeftJoin(join(ProjectColumnID, ProjectGrantColumnProjectID)).
LeftJoin(join(resourceOwnerIDColumn, ProjectGrantColumnResourceOwner)). LeftJoin(join(resourceOwnerIDColumn, ProjectGrantColumnResourceOwner)).
LeftJoin(join(grantedOrgIDColumn, ProjectGrantColumnResourceOwner)), LeftJoin(join(grantedOrgIDColumn, ProjectGrantColumnGrantedOrgID)),
func(row *sql.Row) (*ProjectGrant, error) { func(row *sql.Row) (*ProjectGrant, error) {
p := new(ProjectGrant) p := new(ProjectGrant)
err := row.Scan( err := row.Scan(
@ -289,8 +302,8 @@ func prepareProjectGrantsQuery() (sq.SelectBuilder, func(*sql.Rows) (*ProjectGra
From(projectGrantsTable.identifier()).PlaceholderFormat(sq.Dollar). From(projectGrantsTable.identifier()).PlaceholderFormat(sq.Dollar).
LeftJoin(join(ProjectColumnID, ProjectGrantColumnProjectID)). LeftJoin(join(ProjectColumnID, ProjectGrantColumnProjectID)).
LeftJoin(join(resourceOwnerIDColumn, ProjectGrantColumnResourceOwner)). LeftJoin(join(resourceOwnerIDColumn, ProjectGrantColumnResourceOwner)).
LeftJoin(join(grantedOrgIDColumn, ProjectGrantColumnResourceOwner)), LeftJoin(join(grantedOrgIDColumn, ProjectGrantColumnGrantedOrgID)),
func(rows *sql.Rows) (*ProjectGrants, error) { func(rows *sql.Rows) (*ProjectGrants, error) {
projects := make([]*ProjectGrant, 0) projects := make([]*ProjectGrant, 0)
var count uint64 var count uint64
for rows.Next() { for rows.Next() {