Skip to content

Commit f9a47a9

Browse files
committed
Account for no status filters sent
1 parent c5f33a5 commit f9a47a9

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

coderd/users.go

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,19 +107,23 @@ func (api *API) postFirstUser(rw http.ResponseWriter, r *http.Request) {
107107
func (api *API) users(rw http.ResponseWriter, r *http.Request) {
108108
var (
109109
searchName = r.URL.Query().Get("search")
110-
statusFilters = strings.Split(r.URL.Query().Get("status"), ",")
110+
statusFilters = r.URL.Query().Get("status")
111111
)
112112

113113
statuses := make([]database.UserStatus, 0)
114-
for _, filter := range statusFilters {
115-
switch database.UserStatus(filter) {
116-
case database.UserStatusSuspended, database.UserStatusActive:
117-
statuses = append(statuses, database.UserStatus(filter))
118-
default:
119-
httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
120-
Message: fmt.Sprintf("%q is not a valid user status", filter),
121-
})
122-
return
114+
115+
if statusFilters != "" {
116+
// Split on commas if present to account for it being a list
117+
for _, filter := range strings.Split(statusFilters, ",") {
118+
switch database.UserStatus(filter) {
119+
case database.UserStatusSuspended, database.UserStatusActive:
120+
statuses = append(statuses, database.UserStatus(filter))
121+
default:
122+
httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
123+
Message: fmt.Sprintf("%q is not a valid user status", filter),
124+
})
125+
return
126+
}
123127
}
124128
}
125129

0 commit comments

Comments
 (0)