@@ -14,6 +14,7 @@ import (
1414"github.com/coder/coder/v2/coderd/database/db2sdk"
1515"github.com/coder/coder/v2/coderd/httpapi"
1616"github.com/coder/coder/v2/coderd/httpmw"
17+ "github.com/coder/coder/v2/coderd/prebuilds"
1718"github.com/coder/coder/v2/codersdk"
1819)
1920
@@ -165,16 +166,19 @@ func (api *API) patchGroup(rw http.ResponseWriter, r *http.Request) {
165166aReq .Old = group .Auditable (currentMembers )
166167
167168for _ ,id := range users {
168- if _ ,err := uuid .Parse (id );err != nil {
169+ uid ,err := uuid .Parse (id )
170+ if err != nil {
169171httpapi .Write (ctx ,rw ,http .StatusBadRequest , codersdk.Response {
170172Message :fmt .Sprintf ("ID %q must be a valid user UUID." ,id ),
171173})
172174return
173175}
174- _ ,err := database .ExpectOne (api .Database .OrganizationMembers (ctx , database.OrganizationMembersParams {
176+
177+ isSystemUser := uid == prebuilds .SystemUserID
178+ _ ,err = database .ExpectOne (api .Database .OrganizationMembers (ctx , database.OrganizationMembersParams {
175179OrganizationID :group .OrganizationID ,
176- UserID :uuid . MustParse ( id ) ,
177- IncludeSystem :false ,
180+ UserID :uid ,
181+ IncludeSystem :isSystemUser ,
178182}))
179183if errors .Is (err ,sql .ErrNoRows ) {
180184httpapi .Write (ctx ,rw ,http .StatusBadRequest , codersdk.Response {