8000 feat: support filtering users table by login type by utsavll0 · Pull Request #17238 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat: support filtering users table by login type #17238

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 15 commits into from
Apr 9, 2025
Merged

feat: support filtering users table by login type #17238

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d0e840a
ability to filter users based on login type
utsavll0 Apr 3, 2025
3016e40
update documentation also
utsavll0 Apr 3, 2025
de02f49
add tests
utsavll0 Apr 3, 2025
0bab070
Merge branch 'main' into main
utsavll0 Apr 3, 2025
241c898
change test case
utsavll0 Apr 4, 2025
5ddc42a
filter by multiple login types
utsavll0 Apr 7, 2025
f73e1f2
add filter by logintype to mock db
utsavll0 Apr 7, 2025
b649181
update tests
utsavll0 Apr 7, 2025
15407e0
cleanup tests
utsavll0 Apr 7, 2025
6ae52ce
Merge branch 'main' into main
utsavll0 Apr 7, 2025
38825d8
remove redundant len check
utsavll0 Apr 8, 2025
16e9e45
add test to filter 1 user among many
utsavll0 Apr 8, 2025
571982b
Merge branch 'main' into main
utsavll0 Apr 8, 2025
f524144
doc update
utsavll0 Apr 8, 2025
6f2fc59
capitalize correctly
utsavll0 Apr 8, 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
update tests
  • Loading branch information
@utsavll0
utsavll0 committed Apr 7, 2025
commit b649181eedd044785050dd0a2f4c2c751b93e4af
121 changes: 92 additions & 29 deletions coderd/users_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1902,43 +1902,106 @@ func TestGetUsers(t *testing.T) {
require.Len(t, res.Users, 1)
require.Equal(t, res.Users[0].ID, first.UserID)
})
}

func TestGetUsersFilters(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
first := coderdtest.CreateFirstUser(t, client)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
t.Run("LoginTypeNoneFilter", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
first := coderdtest.CreateFirstUser(t, client)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

// Create a user with a specific role
_, err := client.User(ctx, first.UserID.String())
require.NoError(t, err, "")
_, err := client.CreateUserWithOrgs(ctx, codersdk.CreateUserRequestWithOrgs{
Email: "bob@email.com",
Username: "bob",
OrganizationIDs: []uuid.UUID{first.OrganizationID},
UserLoginType: codersdk.LoginTypeNone,
})
require.NoError(t, err)

_, err = client.CreateUserWithOrgs(ctx, codersdk.CreateUserRequestWithOrgs{
Email: "alice@email.com",
Username: "alice",
Password: "MySecurePassword!",
OrganizationIDs: []uuid.UUID{first.OrganizationID},
UserLoginType: codersdk.LoginTypePassword,
// Test filtering by role
res, err := client.Users(ctx, codersdk.UsersRequest{
LoginType: []codersdk.LoginType{codersdk.LoginTypeNone},
})
require.NoError(t, err, "should not error when filtering by role")
require.Len(t, res.Users, 1, "should find one user with the member role")
require.Equal(t, res.Users[0].Username, "bob", "should return the correct user with member role")
})
require.NoError(t, err)

_, err = client.CreateUserWithOrgs(ctx, codersdk.CreateUserRequestWithOrgs{
Email: "alice123@email.com",
Username: "alice123",
OrganizationIDs: []uuid.UUID{first.OrganizationID},
UserLoginType: codersdk.LoginTypeGithub,
t.Run("LoginTypeMultipleFilter", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
first := coderdtest.CreateFirstUser(t, client)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

_, err := client.CreateUserWithOrgs(ctx, codersdk.CreateUserRequestWithOrgs{
Email: "bob@email.com",
Username: "bob",
OrganizationIDs: []uuid.UUID{first.OrganizationID},
UserLoginType: codersdk.LoginTypeNone,
})
require.NoError(t, err)

_, err = client.CreateUserWithOrgs(ctx, codersdk.CreateUserRequestWithOrgs{
Email: "charlie@email.com",
Username: "charlie",
OrganizationIDs: []uuid.UUID{first.OrganizationID},
UserLoginType: codersdk.LoginTypeGithub,
})
require.NoError(t, err)

// Test filtering by role
res, err := client.Users(ctx, codersdk.UsersRequest{
LoginType: []codersdk.LoginType{codersdk.LoginTypeNone, codersdk.LoginTypeGithub}, // Ensure we're filtering by login type
})
require.NoError(t, err, "should not error when filtering by role")
require.Len(t, res.Users, 2, "should find two users with the specified login types")
usernames := make(map[string]bool)
for _, user := range res.Users {
usernames[user.Username] = true
}
require.True(t, usernames["bob"], "should return the correct user with login type none")
require.True(t, usernames["charlie"], "should return the correct user with login type github")
// Ensure that the user with login type none is indeed in the result
for _, user := range res.Users {
if user.Username == "bob" {
require.Equal(t, user.LoginType, codersdk.LoginTypeNone, "bob should have login type none")
}
if user.Username == "charlie" {
require.Equal(t, user.LoginType, codersdk.LoginTypeGithub, "charlie should have login type github")
}
}
})
require.NoError(t, err)

// Test filtering by role
res, err := client.Users(ctx, codersdk.UsersRequest{
LoginType: "password", // Ensure we're filtering by login type
t.Run("DormantUserWithLoginTypeNone", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
first := coderdtest.CreateFirstUser(t, client)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

_, err := client.CreateUserWithOrgs(ctx, codersdk.CreateUserRequestWithOrgs{
Email: "bob@email.com",
Username: "bob",
OrganizationIDs: []uuid.UUID{first.OrganizationID},
UserLoginType: codersdk.LoginTypeNone,
})
require.NoError(t, err)

_, err = client.UpdateUserStatus(ctx, "bob", codersdk.UserStatusSuspended)
require.NoError(t, err, "should set bob's status to dormant")

// Test filtering by role
res, err := client.Users(ctx, codersdk.UsersRequest{
Status: codersdk.UserStatusSuspended,
LoginType: []codersdk.LoginType{codersdk.LoginTypeNone, codersdk.LoginTypeGithub},
})
require.NoError(t, err, "should not error when filtering by role")
require.Len(t, res.Users, 1, "should find one dormant user with the specified login type")
require.Equal(t, res.Users[0].Username, "bob", "should return the correct dormant user with login type none")
require.Equal(t, res.Users[0].Status, codersdk.UserStatusSuspended, "bob should be in dormant status")
require.Equal(t, res.Users[0].LoginType, codersdk.LoginTypeNone, "bob should have login type none")
})
require.NoError(t, err, "should not error when filtering by role")
require.Len(t, res.Users, 1, "should find one user with the member role")
require.Equal(t, res.Users[0].Username, "alice", "should return the correct user with member role")
}

func TestGetUsersPagination(t *testing.T) {
Expand Down
Loading
0