chore!: allow CreateUser to accept multiple organizations (#14383)

* chore: allow CreateUser to accept multiple organizations In a multi-org deployment, it makes more sense to allow for multiple org memberships to be assigned at create. The legacy param will still be honored. * Handle sdk deprecation better by maintaining cli functions
2026-09-24 15:04:27 +08:00 · 2024-08-23 21:23:51 +00:00
parent af125c3795
commit c8eacc6df7
28 changed files with 597 additions and 367 deletions
@@ -0,0 +1,149 @@
+package codersdk_test
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/v2/coderd/coderdtest"
+	"github.com/coder/coder/v2/codersdk"
+)
+
+func TestDeprecatedCreateUserRequest(t *testing.T) {
+	t.Parallel()
+
+	t.Run("DefaultOrganization", func(t *testing.T) {
+		t.Parallel()
+
+		input := `
+{
+   "email":"alice@coder.com",
+   "password":"hunter2",
+   "username":"alice",
+   "name":"alice",
+   "organization_id":"00000000-0000-0000-0000-000000000000",
+   "disable_login":false,
+   "login_type":"none"
+}
+`
+		var req codersdk.CreateUserRequestWithOrgs
+		err := json.Unmarshal([]byte(input), &req)
+		require.NoError(t, err)
+		require.Equal(t, req.Email, "alice@coder.com")
+		require.Equal(t, req.Password, "hunter2")
+		require.Equal(t, req.Username, "alice")
+		require.Equal(t, req.Name, "alice")
+		require.Equal(t, req.OrganizationIDs, []uuid.UUID{uuid.Nil})
+		require.Equal(t, req.UserLoginType, codersdk.LoginTypeNone)
+	})
+
+	t.Run("MultipleOrganizations", func(t *testing.T) {
+		t.Parallel()
+
+		input := `
+{
+   "email":"alice@coder.com",
+   "password":"hunter2",
+   "username":"alice",
+   "name":"alice",
+   "organization_id":"00000000-0000-0000-0000-000000000000",
+   "organization_ids":["a618cb03-99fb-4380-adb6-aa801629a4cf","8309b0dc-44ea-435d-a9ff-72cb302835e4"],
+   "disable_login":false,
+   "login_type":"none"
+}
+`
+		var req codersdk.CreateUserRequestWithOrgs
+		err := json.Unmarshal([]byte(input), &req)
+		require.NoError(t, err)
+		require.Equal(t, req.Email, "alice@coder.com")
+		require.Equal(t, req.Password, "hunter2")
+		require.Equal(t, req.Username, "alice")
+		require.Equal(t, req.Name, "alice")
+		require.ElementsMatch(t, req.OrganizationIDs,
+			[]uuid.UUID{
+				uuid.Nil,
+				uuid.MustParse("a618cb03-99fb-4380-adb6-aa801629a4cf"),
+				uuid.MustParse("8309b0dc-44ea-435d-a9ff-72cb302835e4"),
+			})
+
+		require.Equal(t, req.UserLoginType, codersdk.LoginTypeNone)
+	})
+
+	t.Run("OmittedOrganizations", func(t *testing.T) {
+		t.Parallel()
+
+		input := `
+{
+   "email":"alice@coder.com",
+   "password":"hunter2",
+   "username":"alice",
+   "name":"alice",
+   "disable_login":false,
+   "login_type":"none"
+}
+`
+		var req codersdk.CreateUserRequestWithOrgs
+		err := json.Unmarshal([]byte(input), &req)
+		require.NoError(t, err)
+
+		require.Empty(t, req.OrganizationIDs)
+	})
+}
+
+func TestCreateUserRequestJSON(t *testing.T) {
+	t.Parallel()
+
+	marshalTest := func(t *testing.T, req codersdk.CreateUserRequestWithOrgs) {
+		t.Helper()
+		data, err := json.Marshal(req)
+		require.NoError(t, err)
+		var req2 codersdk.CreateUserRequestWithOrgs
+		err = json.Unmarshal(data, &req2)
+		require.NoError(t, err)
+		require.Equal(t, req, req2)
+	}
+
+	t.Run("MultipleOrganizations", func(t *testing.T) {
+		t.Parallel()
+
+		req := codersdk.CreateUserRequestWithOrgs{
+			Email:           coderdtest.RandomName(t),
+			Username:        coderdtest.RandomName(t),
+			Name:            coderdtest.RandomName(t),
+			Password:        "",
+			UserLoginType:   codersdk.LoginTypePassword,
+			OrganizationIDs: []uuid.UUID{uuid.New(), uuid.New()},
+		}
+		marshalTest(t, req)
+	})
+
+	t.Run("SingleOrganization", func(t *testing.T) {
+		t.Parallel()
+
+		req := codersdk.CreateUserRequestWithOrgs{
+			Email:           coderdtest.RandomName(t),
+			Username:        coderdtest.RandomName(t),
+			Name:            coderdtest.RandomName(t),
+			Password:        "",
+			UserLoginType:   codersdk.LoginTypePassword,
+			OrganizationIDs: []uuid.UUID{uuid.New()},
+		}
+		marshalTest(t, req)
+	})
+
+	t.Run("NoOrganization", func(t *testing.T) {
+		t.Parallel()
+
+		req := codersdk.CreateUserRequestWithOrgs{
+			Email:           coderdtest.RandomName(t),
+			Username:        coderdtest.RandomName(t),
+			Name:            coderdtest.RandomName(t),
+			Password:        "",
+			UserLoginType:   codersdk.LoginTypePassword,
+			OrganizationIDs: []uuid.UUID{},
+		}
+		marshalTest(t, req)
+	})
+}