TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-02-28 20:57:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow project grants without roles in database (#3786)

Browse Source
This commit is contained in:
Livio Spring 2022-06-09 11:48:54 +02:00 committed by GitHub
parent a377f2816c
commit 7f34ce1891
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/auth/repository/eventsourcing/eventstore/auth_request.go
View File

@ -97,7 +97,7 @@ type orgViewProvider interface {
type userGrantProvider interface { type userGrantProvider interface {
ProjectByOIDCClientID(context.Context, string) (*query.Project, error) ProjectByOIDCClientID(context.Context, string) (*query.Project, error)
UserGrantsByProjectAndUserID(string, string) ([]*query.UserGrant, error) UserGrantsByProjectAndUserID(context.Context, string, string) ([]*query.UserGrant, error)
} }
type projectProvider interface { type projectProvider interface {
@ -1266,7 +1266,7 @@ func userGrantRequired(ctx context.Context, request *domain.AuthRequest, user *u
if !project.ProjectRoleCheck { if !project.ProjectRoleCheck {
return false, nil return false, nil
} }
grants, err := userGrantProvider.UserGrantsByProjectAndUserID(project.ID, user.ID) grants, err := userGrantProvider.UserGrantsByProjectAndUserID(ctx, project.ID, user.ID)
if err != nil { if err != nil {
return false, err return false, err
} }

2
internal/auth/repository/eventsourcing/eventstore/auth_request_test.go
View File

@ -195,7 +195,7 @@ func (m *mockUserGrants) ProjectByOIDCClientID(ctx context.Context, s string) (*
return &query.Project{ProjectRoleCheck: m.roleCheck}, nil return &query.Project{ProjectRoleCheck: m.roleCheck}, nil
} }
func (m *mockUserGrants) UserGrantsByProjectAndUserID(s string, s2 string) ([]*query.UserGrant, error) { func (m *mockUserGrants) UserGrantsByProjectAndUserID(ctx context.Context, s string, s2 string) ([]*query.UserGrant, error) {
var grants []*query.UserGrant var grants []*query.UserGrant
if m.userGrants > 0 { if m.userGrants > 0 {
grants = make([]*query.UserGrant, m.userGrants) grants = make([]*query.UserGrant, m.userGrants)

4
internal/auth/repository/eventsourcing/repository.go
View File

@ -115,7 +115,7 @@ type queryViewWrapper struct {
*auth_view.View *auth_view.View
} }
func (q queryViewWrapper) UserGrantsByProjectAndUserID(projectID, userID string) ([]*query.UserGrant, error) { func (q queryViewWrapper) UserGrantsByProjectAndUserID(ctx context.Context, projectID, userID string) ([]*query.UserGrant, error) {
userGrantProjectID, err := query.NewUserGrantProjectIDSearchQuery(projectID) userGrantProjectID, err := query.NewUserGrantProjectIDSearchQuery(projectID)
if err != nil { if err != nil {
return nil, err return nil, err
@ -125,7 +125,7 @@ func (q queryViewWrapper) UserGrantsByProjectAndUserID(projectID, userID string)
return nil, err return nil, err
} }
queries := &query.UserGrantsQueries{Queries: []query.SearchQuery{userGrantUserID, userGrantProjectID}} queries := &query.UserGrantsQueries{Queries: []query.SearchQuery{userGrantUserID, userGrantProjectID}}
grants, err := q.Queries.UserGrants(context.TODO(), queries) grants, err := q.Queries.UserGrants(ctx, queries)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
internal/query/projection/project_grant.go
View File

@ -47,7 +47,7 @@ func NewProjectGrantProjection(ctx context.Context, config crdb.StatementHandler
crdb.NewColumn(ProjectGrantColumnInstanceID, crdb.ColumnTypeText), crdb.NewColumn(ProjectGrantColumnInstanceID, crdb.ColumnTypeText),
crdb.NewColumn(ProjectGrantColumnProjectID, crdb.ColumnTypeText), crdb.NewColumn(ProjectGrantColumnProjectID, crdb.ColumnTypeText),
crdb.NewColumn(ProjectGrantColumnGrantedOrgID, crdb.ColumnTypeText), crdb.NewColumn(ProjectGrantColumnGrantedOrgID, crdb.ColumnTypeText),
crdb.NewColumn(ProjectGrantColumnRoleKeys, crdb.ColumnTypeTextArray), crdb.NewColumn(ProjectGrantColumnRoleKeys, crdb.ColumnTypeTextArray, crdb.Nullable()),
}, },
crdb.NewPrimaryKey(ProjectGrantColumnInstanceID, ProjectGrantColumnGrantID), crdb.NewPrimaryKey(ProjectGrantColumnInstanceID, ProjectGrantColumnGrantID),
crdb.WithIndex(crdb.NewIndex("ro_idx", []string{ProjectGrantColumnResourceOwner})), crdb.WithIndex(crdb.NewIndex("ro_idx", []string{ProjectGrantColumnResourceOwner})),