Skip to content

Commit a7899cf

Browse files
EmyrkEmyrk
committed
:
1 parent f5c4040 commit a7899cf

File tree

1 file changed

+26
-31
lines changed

1 file changed

+26
-31
lines changed

‎coderd/authzquery/organization_test.go

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,34 +33,29 @@ func (suite *MethodTestSuite) TestOrganization() {
3333
})
3434
suite.Run("GetOrganizationIDsByMemberIDs", func() {
3535
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
36-
o := dbgen.Organization(t, db, database.Organization{})
37-
u := dbgen.User(t, db, database.User{})
38-
var _ = o.ID
39-
// TODO: Implement this and do rbac check
40-
//mem := dbgen.OrganizationMember(t, db, database.OrganizationMember{OrganizationID: o.ID, UserID: u.ID})
41-
return methodCase(inputs([]uuid.UUID{u.ID}), asserts())
36+
oa := dbgen.Organization(t, db, database.Organization{})
37+
ob := dbgen.Organization(t, db, database.Organization{})
38+
ma := dbgen.OrganizationMember(t, db, database.OrganizationMember{OrganizationID: oa.ID})
39+
mb := dbgen.OrganizationMember(t, db, database.OrganizationMember{OrganizationID: ob.ID})
40+
return methodCase(inputs([]uuid.UUID{ma.UserID, mb.UserID}),
41+
asserts(rbac.ResourceUser.WithID(ma.UserID), rbac.ActionRead, rbac.ResourceUser.WithID(mb.UserID), rbac.ActionRead))
4242
})
4343
})
4444
suite.Run("GetOrganizationMemberByUserID", func() {
4545
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
46-
o := dbgen.Organization(t, db, database.Organization{})
47-
u := dbgen.User(t, db, database.User{})
48-
// TODO: Implement this and do rbac check
49-
//mem := dbgen.OrganizationMember(t, db, database.OrganizationMember{OrganizationID: o.ID, UserID: u.ID})
46+
mem := dbgen.OrganizationMember(t, db, database.OrganizationMember{})
5047
return methodCase(inputs(database.GetOrganizationMemberByUserIDParams{
51-
OrganizationID: o.ID,
52-
UserID: u.ID,
53-
}), asserts())
48+
OrganizationID: mem.OrganizationID,
49+
UserID: mem.UserID,
50+
}), asserts(mem, rbac.ActionRead))
5451
})
5552
})
5653
suite.Run("GetOrganizationMembershipsByUserID", func() {
5754
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
58-
o := dbgen.Organization(t, db, database.Organization{})
5955
u := dbgen.User(t, db, database.User{})
60-
var _ = o.ID
61-
// TODO: Implement this and do rbac check
62-
//mem := dbgen.OrganizationMember(t, db, database.OrganizationMember{OrganizationID: o.ID, UserID: u.ID})
63-
return methodCase(inputs(u.ID), asserts())
56+
a := dbgen.OrganizationMember(t, db, database.OrganizationMember{UserID: u.ID})
57+
b := dbgen.OrganizationMember(t, db, database.OrganizationMember{UserID: u.ID})
58+
return methodCase(inputs(u.ID), asserts(a, rbac.ActionRead, b, rbac.ActionRead))
6459
})
6560
})
6661
suite.Run("GetOrganizations", func() {
@@ -72,12 +67,12 @@ func (suite *MethodTestSuite) TestOrganization() {
7267
})
7368
suite.Run("GetOrganizationsByUserID", func() {
7469
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
75-
o := dbgen.Organization(t, db, database.Organization{})
7670
u := dbgen.User(t, db, database.User{})
77-
var _ = o.ID
78-
// TODO: Implement this and do rbac check
79-
//mem := dbgen.OrganizationMember(t, db, database.OrganizationMember{OrganizationID: o.ID, UserID: u.ID})
80-
return methodCase(inputs(u.ID), asserts(u, rbac.ActionRead))
71+
a := dbgen.Organization(t, db, database.Organization{})
72+
_ = dbgen.OrganizationMember(t, db, database.OrganizationMember{UserID: u.ID, OrganizationID: a.ID})
73+
b := dbgen.Organization(t, db, database.Organization{})
74+
_ = dbgen.OrganizationMember(t, db, database.OrganizationMember{UserID: u.ID, OrganizationID: b.ID})
75+
return methodCase(inputs(u.ID), asserts(a, rbac.ActionRead, b, rbac.ActionRead))
8176
})
8277
})
8378
suite.Run("InsertOrganization", func() {
@@ -107,20 +102,20 @@ func (suite *MethodTestSuite) TestOrganization() {
107102
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
108103
o := dbgen.Organization(t, db, database.Organization{})
109104
u := dbgen.User(t, db, database.User{})
110-
// TODO: Implement this and do rbac check
111-
//mem := dbgen.OrganizationMember(t, db, database.OrganizationMember{
112-
// OrganizationID: o.ID,
113-
// UserID: u.ID,
114-
// Roles: []string{rbac.RoleOrgAdmin(o.ID)},
115-
//})
105+
mem := dbgen.OrganizationMember(t, db, database.OrganizationMember{
106+
OrganizationID: o.ID,
107+
UserID: u.ID,
108+
Roles: []string{rbac.RoleOrgAdmin(o.ID)},
109+
})
116110

117111
return methodCase(inputs(database.UpdateMemberRolesParams{
118112
GrantedRoles: []string{},
119113
UserID: u.ID,
120114
OrgID: o.ID,
121115
}), asserts(
122-
rbac.ResourceRoleAssignment.InOrg(o.ID), rbac.ActionDelete,
123-
rbac.ResourceOrganizationMember.InOrg(o.ID).WithID(u.ID), rbac.ActionCreate,
116+
mem, rbac.ActionRead,
117+
rbac.ResourceRoleAssignment.InOrg(o.ID), rbac.ActionCreate, // org-mem
118+
rbac.ResourceRoleAssignment.InOrg(o.ID), rbac.ActionDelete, // org-admin
124119
))
125120
})
126121
})

0 commit comments

Comments
 (0)