Skip to content

feat: Backend api for filtering users using filter query string #2553

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 10 commits into from
Jun 24, 2022
Merged

feat: Backend api for filtering users using filter query string #2553

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
503df2a
User search query string
Emyrk Jun 16, 2022
3385b38
Merge remote-tracking branch 'origin/main' into stevenmasley/users_fi…
Emyrk Jun 16, 2022
9b3c239
Add rbac_role filter option
Emyrk Jun 16, 2022
4b1b201
Add role filter
Emyrk Jun 21, 2022
43158ee
Merge remote-tracking branch 'origin/main' into stevenmasley/users_fi…
Emyrk Jun 21, 2022
350204d
Unit test user filter
Emyrk Jun 21, 2022
925d7ea
Merge remote-tracking branch 'origin/main' into stevenmasley/users_fi…
Emyrk Jun 22, 2022
23be7b9
Fix fake get users
Emyrk Jun 22, 2022
1a6b9df
Fix rbac unit test
Emyrk Jun 22, 2022
9250f9a
Default to all users
Emyrk Jun 22, 2022
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
Fix rbac unit test
  • Loading branch information
@Emyrk
Emyrk committed Jun 22, 2022
commit 1a6b9df24e8867c860f34e3d40c5d9da28243f8d
3 changes: 2 additions & 1 deletion coderd/coderd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,10 +338,11 @@ func TestAuthorizeAllEndpoints(t *testing.T) {
AssertAction: rbac.ActionRead,
AssertObject: workspaceRBACObj,
},
"POST:/api/v2/users/{user}/organizations/": {
"POST:/api/v2/users/{user}/organizations": {
AssertAction: rbac.ActionCreate,
AssertObject: rbac.ResourceOrganization,
},
"GET:/api/v2/users": {StatusCode: http.StatusOK, AssertObject: rbac.ResourceUser},

// These endpoints need payloads to get to the auth part. Payloads will be required
"PUT:/api/v2/users/{user}/roles": {StatusCode: http.StatusBadRequest, NoAuthorize: true},
Expand Down
2 changes: 1 addition & 1 deletion coderd/database/modelmethods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ func (f File) RBACObject() rbac.Object {
// If you are trying to get the RBAC object for the UserData, use
// rbac.ResourceUserData
func (u User) RBACObject() rbac.Object {
return rbac.ResourceFile.WithID(u.ID.String())
return rbac.ResourceUser.WithID(u.ID.String())
}