Skip to content

feat: add a paginated organization members endpoint #16835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Mar 10, 2025
Merged

feat: add a paginated organization members endpoint #16835

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
cea4d3c
feat: add paginated members route
brettkolodny Mar 6, 2025
e97c9db
feat: add request and response types
brettkolodny Mar 6, 2025
34003dc
feat: create new sql query and generate code
brettkolodny Mar 6, 2025
9edb088
fix: add dbauthz tests
brettkolodny Mar 6, 2025
ef40967
feat: implement endpoint
brettkolodny Mar 6, 2025
6aaddaf
fix: correct endpoint documentation
brettkolodny Mar 6, 2025
a724f48
fix: lint errors
brettkolodny Mar 6, 2025
4925592
fix: generated docs from new endpoint
brettkolodny Mar 6, 2025
902538c
fix: remove unneeded comments
brettkolodny Mar 6, 2025
06ff95c
wip
brettkolodny Mar 7, 2025
560305d
Merge branch 'main' into brett/org-members-pagination-backend
brettkolodny Mar 7, 2025
76a4cbf
fix: incorrectly showing type in panic
brettkolodny Mar 7, 2025
737ac9f
fix: update docs
brettkolodny Mar 7, 2025
8910df3
fix: change dbauthz test back to proper one
brettkolodny Mar 7, 2025
0e579a2
fix: un-nest route
brettkolodny Mar 7, 2025
73e356c
fix: add comment
brettkolodny Mar 10, 2025
24332f4
fix: update test to account for dbmem and check for returned member
brettkolodny Mar 10, 2025
7af0b60
fix: update test to check for accurate count
brettkolodny Mar 10, 2025
cdc0322
fix: make dbmem implementation match expected behaior around 0 limit
brettkolodny Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
wip
  • Loading branch information
@brettkolodny
brettkolodny committed Mar 7, 2025
commit 06ff95c196c94d000f85840757128fd72a9f0744
5 changes: 4 additions & 1 deletion coderd/database/dbauthz/dbauthz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3582,7 +3582,10 @@ func (q *querier) OrganizationMembers(ctx context.Context, arg database.Organiza
}

func (q *querier) PaginatedOrganizationMembers(ctx context.Context, arg database.PaginatedOrganizationMembersParams) ([]database.PaginatedOrganizationMembersRow, error) {
return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.PaginatedOrganizationMembers)(ctx, arg)
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceOrganizationMember.InOrg(arg.OrganizationID)); err != nil {
return nil, err
}
Comment on lines +3586 to +3588
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just throw a comment

Suggested change
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceOrganizationMember.InOrg(arg.OrganizationID)); err != nil {
return nil, err
}
// Required to have permission to read all members in the organization
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceOrganizationMember.InOrg(arg.OrganizationID)); err != nil {
return nil, err
}

return q.db.PaginatedOrganizationMembers(ctx, arg)
}

func (q *querier) ReduceWorkspaceAgentShareLevelToAuthenticatedByTemplate(ctx context.Context, templateID uuid.UUID) error {
Expand Down
10 changes: 2 additions & 8 deletions coderd/database/dbauthz/dbauthz_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,18 +987,12 @@ func (s *MethodTestSuite) TestOrganization() {
}))
s.Run("PaginatedOrganizationMembers", s.Subtest(func(db database.Store, check *expects) {
o := dbgen.Organization(s.T(), db, database.Organization{})
u := dbgen.User(s.T(), db, database.User{})
mem := dbgen.OrganizationMember(s.T(), db, database.OrganizationMember{
OrganizationID: o.ID,
UserID: u.ID,
Roles: []string{rbac.RoleOrgAdmin()},
})

check.Args(database.PaginatedOrganizationMembersParams{
OrganizationID: uuid.UUID{},
OrganizationID: o.ID,
LimitOpt: 1,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this different check means we also don't need this field any more

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Accidentally pushed some test code in the test so not sure which one you were looking at but that's needed.

}).Asserts(
mem, policy.ActionRead,
rbac.ResourceOrganizationMember.InOrg(o.ID), policy.ActionRead,
)
}))
s.Run("UpdateMemberRoles", s.Subtest(func(db database.Store, check *expects) {
Expand Down
Loading