mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 11:04:25 +00:00
f3e6f3b23b
* feat(command): remove org * refactor: imports, unused code, error handling * reduce org removed in action * add org deletion to projections * add org removal to projections * add org removal to projections * org removed projection * lint import * projections * fix: table names in tests * fix: table names in tests * logging * add org state * fix(domain): add Owner removed to object details * feat(ListQuery): add with owner removed * fix(org-delete): add bool to functions to select with owner removed * fix(org-delete): add bools to user grants with events to determine if dependencies lost owner * fix(org-delete): add unit tests for owner removed and org removed events * fix(org-delete): add handling of org remove for grants and members * fix(org-delete): correction of unit tests for owner removed * fix(org-delete): update projections, unit tests and get functions * fix(org-delete): add change date to authnkeys and owner removed to org metadata * fix(org-delete): include owner removed for login names * fix(org-delete): some column fixes in projections and build for queries with owner removed * indexes * fix(org-delete): include review changes * fix(org-delete): change user projection name after merge * fix(org-delete): include review changes for project grant where no project owner is necessary * fix(org-delete): include auth and adminapi tables with owner removed information * fix(org-delete): cleanup username and orgdomain uniqueconstraints when org is removed * fix(org-delete): add permissions for org.remove * remove unnecessary unique constraints * fix column order in primary keys * fix(org-delete): include review changes * fix(org-delete): add owner removed indexes and chang setup step to create tables * fix(org-delete): move PK order of instance_id and change added user_grant from review * fix(org-delete): no params for prepareUserQuery * change to step 6 * merge main * fix(org-delete): OldUserName rename to private * fix linting * cleanup * fix: remove org test * create prerelease * chore: delete org-delete as prerelease Co-authored-by: Stefan Benz <stefan@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
461 lines
11 KiB
Go
461 lines
11 KiB
Go
package query
|
|
|
|
import (
|
|
"database/sql"
|
|
"database/sql/driver"
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"testing"
|
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
)
|
|
|
|
var (
|
|
membershipsStmt = regexp.QuoteMeta(
|
|
"SELECT memberships.user_id" +
|
|
", memberships.roles" +
|
|
", memberships.creation_date" +
|
|
", memberships.change_date" +
|
|
", memberships.sequence" +
|
|
", memberships.resource_owner" +
|
|
", memberships.org_id" +
|
|
", memberships.id" +
|
|
", memberships.project_id" +
|
|
", memberships.grant_id" +
|
|
", projections.project_grants3.granted_org_id" +
|
|
", projections.projects3.name" +
|
|
", projections.orgs.name" +
|
|
", COUNT(*) OVER ()" +
|
|
" FROM (" +
|
|
"SELECT members.user_id" +
|
|
", members.roles" +
|
|
", members.creation_date" +
|
|
", members.change_date" +
|
|
", members.sequence" +
|
|
", members.resource_owner" +
|
|
", members.instance_id" +
|
|
", members.org_id" +
|
|
", NULL::TEXT AS id" +
|
|
", NULL::TEXT AS project_id" +
|
|
", NULL::TEXT AS grant_id" +
|
|
" FROM projections.org_members3 AS members" +
|
|
" WHERE members.owner_removed = $1 AND members.user_owner_removed = $2" +
|
|
" UNION ALL " +
|
|
"SELECT members.user_id" +
|
|
", members.roles" +
|
|
", members.creation_date" +
|
|
", members.change_date" +
|
|
", members.sequence" +
|
|
", members.resource_owner" +
|
|
", members.instance_id" +
|
|
", NULL::TEXT AS org_id" +
|
|
", members.id" +
|
|
", NULL::TEXT AS project_id" +
|
|
", NULL::TEXT AS grant_id" +
|
|
" FROM projections.instance_members3 AS members" +
|
|
" WHERE members.owner_removed = $3 AND members.user_owner_removed = $4" +
|
|
" UNION ALL " +
|
|
"SELECT members.user_id" +
|
|
", members.roles" +
|
|
", members.creation_date" +
|
|
", members.change_date" +
|
|
", members.sequence" +
|
|
", members.resource_owner" +
|
|
", members.instance_id" +
|
|
", NULL::TEXT AS org_id" +
|
|
", NULL::TEXT AS id" +
|
|
", members.project_id" +
|
|
", NULL::TEXT AS grant_id" +
|
|
" FROM projections.project_members3 AS members" +
|
|
" WHERE members.owner_removed = $5 AND members.user_owner_removed = $6" +
|
|
" UNION ALL " +
|
|
"SELECT members.user_id" +
|
|
", members.roles" +
|
|
", members.creation_date" +
|
|
", members.change_date" +
|
|
", members.sequence" +
|
|
", members.resource_owner" +
|
|
", members.instance_id" +
|
|
", NULL::TEXT AS org_id" +
|
|
", NULL::TEXT AS id" +
|
|
", members.project_id" +
|
|
", members.grant_id" +
|
|
" FROM projections.project_grant_members3 AS members" +
|
|
" WHERE members.granted_org_removed = $7 AND members.owner_removed = $8 AND members.user_owner_removed = $9" +
|
|
") AS memberships" +
|
|
" LEFT JOIN projections.projects3 ON memberships.project_id = projections.projects3.id AND memberships.instance_id = projections.projects3.instance_id" +
|
|
" LEFT JOIN projections.orgs ON memberships.org_id = projections.orgs.id AND memberships.instance_id = projections.orgs.instance_id" +
|
|
" LEFT JOIN projections.project_grants3 ON memberships.grant_id = projections.project_grants3.grant_id AND memberships.instance_id = projections.project_grants3.instance_id")
|
|
membershipCols = []string{
|
|
"user_id",
|
|
"roles",
|
|
"creation_date",
|
|
"change_date",
|
|
"sequence",
|
|
"resource_owner",
|
|
"org_id",
|
|
"instance_id",
|
|
"project_id",
|
|
"grant_id",
|
|
"granted_org_id",
|
|
"name", //project name
|
|
"name", //org name
|
|
"count",
|
|
}
|
|
)
|
|
|
|
func Test_MembershipPrepares(t *testing.T) {
|
|
type want struct {
|
|
sqlExpectations sqlExpectation
|
|
err checkErr
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
prepare interface{}
|
|
want want
|
|
object interface{}
|
|
}{
|
|
{
|
|
name: "prepareMembershipsQuery no result",
|
|
prepare: prepareMembershipWrapper(false),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
nil,
|
|
nil,
|
|
),
|
|
},
|
|
object: &Memberships{Memberships: []*Membership{}},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery one org member",
|
|
prepare: prepareMembershipWrapper(false),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
membershipCols,
|
|
[][]driver.Value{
|
|
{
|
|
"user-id",
|
|
database.StringArray{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
"org-id",
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
"org-name",
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Memberships{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
Memberships: []*Membership{
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.StringArray{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
Org: &OrgMembership{OrgID: "org-id", Name: "org-name"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery one instance member",
|
|
prepare: prepareMembershipWrapper(false),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
membershipCols,
|
|
[][]driver.Value{
|
|
{
|
|
"user-id",
|
|
database.StringArray{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
"iam-id",
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Memberships{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
Memberships: []*Membership{
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.StringArray{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
IAM: &IAMMembership{IAMID: "iam-id", Name: "iam-id"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery one project member",
|
|
prepare: prepareMembershipWrapper(false),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
membershipCols,
|
|
[][]driver.Value{
|
|
{
|
|
"user-id",
|
|
database.StringArray{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
nil,
|
|
"project-id",
|
|
nil,
|
|
nil,
|
|
"project-name",
|
|
nil,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Memberships{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
Memberships: []*Membership{
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.StringArray{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
Project: &ProjectMembership{ProjectID: "project-id", Name: "project-name"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery one project grant member",
|
|
prepare: prepareMembershipWrapper(false),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
membershipCols,
|
|
[][]driver.Value{
|
|
{
|
|
"user-id",
|
|
database.StringArray{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
nil,
|
|
"project-id",
|
|
"grant-id",
|
|
"granted-org-id",
|
|
"project-name",
|
|
nil,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Memberships{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
Memberships: []*Membership{
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.StringArray{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
ProjectGrant: &ProjectGrantMembership{
|
|
GrantID: "grant-id",
|
|
ProjectID: "project-id",
|
|
ProjectName: "project-name",
|
|
GrantedOrgID: "granted-org-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery one for each member type",
|
|
prepare: prepareMembershipWrapper(false),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
membershipCols,
|
|
[][]driver.Value{
|
|
{
|
|
"user-id",
|
|
database.StringArray{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
"org-id",
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
"org-name",
|
|
},
|
|
{
|
|
"user-id",
|
|
database.StringArray{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
"iam-id",
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
},
|
|
{
|
|
"user-id",
|
|
database.StringArray{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
nil,
|
|
"project-id",
|
|
nil,
|
|
nil,
|
|
"project-name",
|
|
nil,
|
|
},
|
|
{
|
|
"user-id",
|
|
database.StringArray{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
nil,
|
|
"project-id",
|
|
"grant-id",
|
|
"granted-org-id",
|
|
"project-name",
|
|
nil,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Memberships{
|
|
SearchResponse: SearchResponse{
|
|
Count: 4,
|
|
},
|
|
Memberships: []*Membership{
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.StringArray{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
Org: &OrgMembership{OrgID: "org-id", Name: "org-name"},
|
|
},
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.StringArray{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
IAM: &IAMMembership{IAMID: "iam-id", Name: "iam-id"},
|
|
},
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.StringArray{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
Project: &ProjectMembership{ProjectID: "project-id", Name: "project-name"},
|
|
},
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.StringArray{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
ProjectGrant: &ProjectGrantMembership{
|
|
ProjectID: "project-id",
|
|
GrantID: "grant-id",
|
|
ProjectName: "project-name",
|
|
GrantedOrgID: "granted-org-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery sql err",
|
|
prepare: prepareMembershipWrapper(false),
|
|
want: want{
|
|
sqlExpectations: mockQueryErr(
|
|
membershipsStmt,
|
|
sql.ErrConnDone,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !errors.Is(err, sql.ErrConnDone) {
|
|
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: nil,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
assertPrepare(t, tt.prepare, tt.object, tt.want.sqlExpectations, tt.want.err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func prepareMembershipWrapper(withOwnerRemoved bool) func() (sq.SelectBuilder, func(*sql.Rows) (*Memberships, error)) {
|
|
builder, _, fun := prepareMembershipsQuery(withOwnerRemoved)
|
|
return func() (sq.SelectBuilder, func(*sql.Rows) (*Memberships, error)) {
|
|
return builder, fun
|
|
}
|
|
}
|