Commit9edb088

committed

fix: add dbauthz tests

1 parent34003dc commit9edb088Copy full SHA for 9edb088

File tree

+52

-2

lines changed

+52

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3582,7 +3582,7 @@ func (q *querier) OrganizationMembers(ctx context.Context, arg database.Organiza`
`3582`	`3582`	`}`
`3583`	`3583`
`3584`	`3584`	`func (q*querier)PaginatedOrganizationMembers(ctx context.Context,arg database.PaginatedOrganizationMembersParams) ([]database.PaginatedOrganizationMembersRow,error) {`
`3585`		`-panic("not implemented")`
	`3585`	`+returnfetchWithPostFilter(q.auth,policy.ActionRead,q.db.PaginatedOrganizationMembers)(ctx,arg)`
`3586`	`3586`	`}`
`3587`	`3587`
`3588`	`3588`	`func (q*querier)ReduceWorkspaceAgentShareLevelToAuthenticatedByTemplate(ctx context.Context,templateID uuid.UUID)error {`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -985,6 +985,22 @@ func (s *MethodTestSuite) TestOrganization() {`
`985`	`985`	`mem,policy.ActionRead,`
`986`	`986`	`)`
`987`	`987`	`}))`
	`988`	`+s.Run("PaginatedOrganizationMembers",s.Subtest(func(db database.Store,check*expects) {`
	`989`	`+o:=dbgen.Organization(s.T(),db, database.Organization{})`
	`990`	`+u:=dbgen.User(s.T(),db, database.User{})`
	`991`	`+mem:=dbgen.OrganizationMember(s.T(),db, database.OrganizationMember{`
	`992`	`+OrganizationID:o.ID,`
	`993`	`+UserID:u.ID,`
	`994`	`+Roles: []string{rbac.RoleOrgAdmin()},`
	`995`	`+})`
	`996`	`+`
	`997`	`+check.Args(database.PaginatedOrganizationMembersParams{`
	`998`	`+OrganizationID: uuid.UUID{},`
	`999`	`+LimitOpt:1,`
	`1000`	`+}).Asserts(`
	`1001`	`+mem,policy.ActionRead,`
	`1002`	`+)`
	`1003`	`+}))`
`988`	`1004`	`s.Run("UpdateMemberRoles",s.Subtest(func(db database.Store,check*expects) {`
`989`	`1005`	`o:=dbgen.Organization(s.T(),db, database.Organization{})`
`990`	`1006`	`u:=dbgen.User(s.T(),db, database.User{})`

Lines changed: 31 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9590,7 +9590,37 @@ func (q *FakeQuerier) PaginatedOrganizationMembers(ctx context.Context, arg data`
`9590`	`9590`	`returnnil,err`
`9591`	`9591`	`}`
`9592`	`9592`
`9593`		`-panic("not implemented")`
	`9593`	`+q.mutex.RLock()`
	`9594`	`+deferq.mutex.RUnlock()`
	`9595`	`+`
	`9596`	`+tmp:=make([]database.PaginatedOrganizationMembersRow,0)`
	`9597`	`+`
	`9598`	`+skippedMembers:=0`
	`9599`	`+for_,organizationMember:=rangeq.organizationMembers {`
	`9600`	`+ifarg.OrganizationID!=uuid.Nil&&organizationMember.OrganizationID!=arg.OrganizationID {`
	`9601`	`+continue`
	`9602`	`+}`
	`9603`	`+`
	`9604`	`+ifskippedMembers<int(arg.OffsetOpt) {`
	`9605`	`+skippedMembers+=1`
	`9606`	`+continue`
	`9607`	`+}`
	`9608`	`+`
	`9609`	`+iflen(tmp)>=int(arg.LimitOpt) {`
	`9610`	`+break`
	`9611`	`+}`
	`9612`	`+`
	`9613`	`+user,_:=q.getUserByIDNoLock(organizationMember.UserID)`
	`9614`	`+tmp=append(tmp, database.PaginatedOrganizationMembersRow{`
	`9615`	`+OrganizationMember:organizationMember,`
	`9616`	`+Username:user.Username,`
	`9617`	`+AvatarURL:user.AvatarURL,`
	`9618`	`+Name:user.Name,`
	`9619`	`+Email:user.Email,`
	`9620`	`+GlobalRoles:user.RBACRoles,`
	`9621`	`+})`
	`9622`	`+}`
	`9623`	`+returntmp,nil`
`9594`	`9624`	`}`
`9595`	`9625`
`9596`	`9626`	`func (q*FakeQuerier)ReduceWorkspaceAgentShareLevelToAuthenticatedByTemplate(_ context.Context,templateID uuid.UUID)error {`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,10 @@ func (m OrganizationMembersRow) RBACObject() rbac.Object {`
`256`	`256`	`returnm.OrganizationMember.RBACObject()`
`257`	`257`	`}`
`258`	`258`
	`259`	`+func (mPaginatedOrganizationMembersRow)RBACObject() rbac.Object {`
	`260`	`+returnm.OrganizationMember.RBACObject()`
	`261`	`+}`
	`262`	`+`
`259`	`263`	`func (mGetOrganizationIDsByMemberIDsRow)RBACObject() rbac.Object {`
`260`	`264`	`// TODO: This feels incorrect as we are really returning a list of orgmembers.`
`261`	`265`	`// This return type should be refactored to return a list of orgmembers, not this`

Comments

(0)