Commit45420b9

authored

chore: allow removing users from the default org (coder#14699)

* chore: allow removing users from the default orgRemoved as no longer in experimental

1 parentce21b20 commit45420b9Copy full SHA for 45420b9

File tree

-15

lines changed

-15

lines changed

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -116,19 +116,6 @@ func (api API) deleteOrganizationMember(rw http.ResponseWriter, r http.Request`
`116`	`116`	`aReq.Old=member.OrganizationMember.Auditable(member.Username)`
`117`	`117`	`defercommitAudit()`
`118`	`118`
`119`		`-iforganization.IsDefault {`
`120`		`-// Multi-organizations is currently an experiment, which means it is feasible`
`121`		`-// for a deployment to enable, then disable this. To maintain backwards`
`122`		`-// compatibility, this safety is necessary.`
`123`		`-// TODO: Remove this check when multi-organizations is fully supported.`
`124`		`-httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{`
`125`		`-Message:"Removing members from the default organization is not supported.",`
`126`		`-Detail:"Multi-organizations is currently an experiment, and until it is fully supported, the default org should be protected.",`
`127`		`-Validations:nil,`
`128`		`-})`
`129`		`-return`
`130`		`-}`
`131`		`-`
`132`	`119`	`ifmember.UserID==apiKey.UserID {`
`133`	`120`	`httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{Message:"cannot remove self from an organization"})`
`134`	`121`	`return`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func TestAddMember(t *testing.T) {`
`33`	`33`	`funcTestDeleteMember(t*testing.T) {`
`34`	`34`	`t.Parallel()`
`35`	`35`
`36`		`-t.Run("NotAllowed",func(t*testing.T) {`
	`36`	`+t.Run("Allowed",func(t*testing.T) {`
`37`	`37`	`t.Parallel()`
`38`	`38`	`owner:=coderdtest.New(t,nil)`
`39`	`39`	`first:=coderdtest.CreateFirstUser(t,owner)`
`@@ -45,7 +45,7 @@ func TestDeleteMember(t *testing.T) {`
`45`	`45`	`// this test should be updated to check there is no error.`
`46`	`46`	`// nolint:gocritic // must be an owner to see the user`
`47`	`47`	`err:=owner.DeleteOrganizationMember(ctx,first.OrganizationID,user.Username)`
`48`		`-require.ErrorContains(t,err,"Multi-organizations is currently an experiment")`
	`48`	`+require.NoError(t,err)`
`49`	`49`	`})`
`50`	`50`	`}`
`51`	`51`

Comments

(0)