Skip to content

fix: Suspended users cannot authenticate #1849

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 18 commits into from
May 31, 2022
Merged

fix: Suspended users cannot authenticate #1849

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8a2b6c2
fix: Suspended users cannot authenticate
Emyrk May 27, 2022
43dece2
Merge remote-tracking branch 'origin/main' into stevenmasley/suspende…
Emyrk May 27, 2022
87f28a2
Add unit test for log into suspended account
Emyrk May 27, 2022
047c234
Formatting
Emyrk May 27, 2022
d2bc5b8
feat: UI Shows suspended error logging into suspended account
Emyrk May 27, 2022
cc9b573
Merge remote-tracking branch 'origin/main' into stevenmasley/suspende…
Emyrk May 27, 2022
8654dd1
cleanup
Emyrk May 27, 2022
489b2fe
fix: Show suspended users in the UI
Emyrk May 27, 2022
15a9b36
Fix column order
Emyrk May 27, 2022
55c5fe6
Currently "activate" on ui does nothing
Emyrk May 27, 2022
c5f33a5
Linting fixes
Emyrk May 27, 2022
f9a47a9
Account for no status filters sent
Emyrk May 27, 2022
71ba332
Linting fix eslint
Emyrk May 27, 2022
54f44d9
Shfmt
Emyrk May 27, 2022
8dbf464
Fix BE error message
Emyrk May 27, 2022
60ac7e4
Add correct error message
Emyrk May 27, 2022
f738fa2
Merge remote-tracking branch 'origin/main' into stevenmasley/suspende…
Emyrk May 27, 2022
df96f3d
change 'active' route to 'activate'
Emyrk May 31, 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
Account for no status filters sent
  • Loading branch information
@Emyrk
Emyrk committed May 27, 2022
commit f9a47a93bb9546da368c5acf1a0bc76344783f93
24 changes: 14 additions & 10 deletions coderd/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,19 +107,23 @@ func (api *API) postFirstUser(rw http.ResponseWriter, r *http.Request) {
func (api *API) users(rw http.ResponseWriter, r *http.Request) {
var (
searchName = r.URL.Query().Get("search")
statusFilters = strings.Split(r.URL.Query().Get("status"), ",")
statusFilters = r.URL.Query().Get("status")
)

statuses := make([]database.UserStatus, 0)
for _, filter := range statusFilters {
switch database.UserStatus(filter) {
case database.UserStatusSuspended, database.UserStatusActive:
statuses = append(statuses, database.UserStatus(filter))
default:
httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
Message: fmt.Sprintf("%q is not a valid user status", filter),
})
return

if statusFilters != "" {
// Split on commas if present to account for it being a list
for _, filter := range strings.Split(statusFilters, ",") {
switch database.UserStatus(filter) {
case database.UserStatusSuspended, database.UserStatusActive:
statuses = append(statuses, database.UserStatus(filter))
default:
httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
Message: fmt.Sprintf("%q is not a valid user status", filter),
})
return
}
}
}

Expand Down