TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 03:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: queries (#2548)

Browse Source 
* fix(second_factors): correct query, rename method

* fix(multi_factors): correct query, correct naming

* fix(project_grant): add project_id to queries

* fix: simplify project id query constructor
This commit is contained in:
Silvan
2021-10-22 13:13:55 +02:00
committed by GitHub
parent b1caef81da
commit 22cfad8cb0
5 changed files with 59 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/query/project_grant.go
View File

@@ -156,7 +156,7 @@ func (q *Queries) SearchProjectGrantsByProjectIDAndRoleKey(ctx context.Context,
SearchRequest: SearchRequest{},
Queries: make([]SearchQuery, 2),
}
searchQuery.Queries[0], err = NewProjectGrantProjectIDSearchQuery(TextEquals, projectID)
searchQuery.Queries[0], err = NewProjectGrantProjectIDSearchQuery(projectID)
if err != nil {
return nil, err
}
@@ -167,8 +167,8 @@ func (q *Queries) SearchProjectGrantsByProjectIDAndRoleKey(ctx context.Context,
return q.SearchProjectGrants(ctx, searchQuery)
}
func NewProjectGrantProjectIDSearchQuery(method TextComparison, value string) (SearchQuery, error) {
return NewTextQuery(ProjectGrantColumnProjectID, value, method)
func NewProjectGrantProjectIDSearchQuery(value string) (SearchQuery, error) {
return NewTextQuery(ProjectGrantColumnProjectID, value, TextEquals)
}
func NewProjectGrantIDsSearchQuery(values []string) (SearchQuery, error) {
@@ -194,32 +194,32 @@ func NewProjectGrantGrantedOrgIDSearchQuery(value string) (SearchQuery, error) {
return NewTextQuery(ProjectGrantColumnGrantedOrgID, value, TextEquals)
}
func (r *ProjectGrantSearchQueries) AppendMyResourceOwnerQuery(orgID string) error {
func (q *ProjectGrantSearchQueries) AppendMyResourceOwnerQuery(orgID string) error {
query, err := NewProjectGrantResourceOwnerSearchQuery(orgID)
if err != nil {
return err
}
r.Queries = append(r.Queries, query)
q.Queries = append(q.Queries, query)
return nil
}
func (r *ProjectGrantSearchQueries) AppendGrantedOrgQuery(orgID string) error {
func (q *ProjectGrantSearchQueries) AppendGrantedOrgQuery(orgID string) error {
query, err := NewProjectGrantGrantedOrgIDSearchQuery(orgID)
if err != nil {
return err
}
r.Queries = append(r.Queries, query)
q.Queries = append(q.Queries, query)
return nil
}
func (r ProjectGrantSearchQueries) AppendPermissionQueries(permissions []string) error {
func (q *ProjectGrantSearchQueries) AppendPermissionQueries(permissions []string) error {
if !authz.HasGlobalPermission(permissions) {
ids := authz.GetAllPermissionCtxIDs(permissions)
query, err := NewProjectGrantIDsSearchQuery(ids)
if err != nil {
return err
}
r.Queries = append(r.Queries, query)
q.Queries = append(q.Queries, query)
}
return nil
}