Revert "fix: assign new oauth users to default org"

This reverts commit 872f4a2.
coder · Emyrk · Feb 16, 2024 · Feb 14, 2024 · Feb 15, 2024 · Feb 15, 2024
commit acda012a14165daacce89b1d8df0e38ba52d467c
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -1016,12 +1016,6 @@ func (q *querier) GetDERPMeshKey(ctx context.Context) (string, error) {
 	return q.db.GetDERPMeshKey(ctx)
 }
 
-func (q *querier) GetDefaultOrganization(ctx context.Context) (database.Organization, error) {
-	return fetch(q.log, q.auth, func(ctx context.Context, _ any) (database.Organization, error) {
-		return q.db.GetDefaultOrganization(ctx)
-	})(ctx, nil)
-}
-
 func (q *querier) GetDefaultProxyConfig(ctx context.Context) (database.GetDefaultProxyConfigRow, error) {
 	// No authz checks
 	return q.db.GetDefaultProxyConfig(ctx)

diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -570,10 +570,6 @@ func (s *MethodTestSuite) TestOrganization() {
 		o := dbgen.Organization(s.T(), db, database.Organization{})
 		check.Args(o.ID).Asserts(o, rbac.ActionRead).Returns(o)
 	}))
-	s.Run("GetDefaultOrganization", s.Subtest(func(db database.Store, check *expects) {
-		o := dbgen.Organization(s.T(), db, database.Organization{})
-		check.Args().Asserts(o, rbac.ActionRead).Returns(o)
-	}))
 	s.Run("GetOrganizationByName", s.Subtest(func(db database.Store, check *expects) {
 		o := dbgen.Organization(s.T(), db, database.Organization{})
 		check.Args(o.Name).Asserts(o, rbac.ActionRead).Returns(o)

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -1657,18 +1657,6 @@ func (q *FakeQuerier) GetDERPMeshKey(_ context.Context) (string, error) {
 	return q.derpMeshKey, nil
 }
 
-func (q *FakeQuerier) GetDefaultOrganization(_ context.Context) (database.Organization, error) {
-	q.mutex.RLock()
-	defer q.mutex.RUnlock()
-
-	for _, org := range q.organizations {
-		if org.IsDefault {
-			return org, nil
-		}
-	}
-	return database.Organization{}, sql.ErrNoRows
-}
-
 func (q *FakeQuerier) GetDefaultProxyConfig(_ context.Context) (database.GetDefaultProxyConfigRow, error) {
 	return database.GetDefaultProxyConfigRow{
 		DisplayName: q.defaultProxyDisplayName,
@@ -5297,7 +5285,6 @@ func (q *FakeQuerier) InsertOrganization(_ context.Context, arg database.InsertO
 		Name:      arg.Name,
 		CreatedAt: arg.CreatedAt,
 		UpdatedAt: arg.UpdatedAt,
-		IsDefault: len(q.organizations) == 0,
 	}
 	q.organizations = append(q.organizations, organization)
 	return organization, nil

diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
@@ -494,34 +494,6 @@ func TestUserChangeLoginType(t *testing.T) {
 	require.Equal(t, bobExpPass, bob.HashedPassword, "hashed password should not change")
 }
 
-func TestDefaultOrg(t *testing.T) {
-	t.Parallel()
-	if testing.Short() {
-		t.SkipNow()
-	}
-
-	sqlDB := testSQLDB(t)
-	err := migrations.Up(sqlDB)
-	require.NoError(t, err)
-	db := database.New(sqlDB)
-	ctx := context.Background()
-
-	// Should start with 0 orgs
-	all, err := db.GetOrganizations(ctx)
-	require.NoError(t, err)
-	require.Len(t, all, 0)
-
-	org, err := db.InsertOrganization(ctx, database.InsertOrganizationParams{
-		ID:          uuid.New(),
-		Name:        "default",
-		Description: "",
-		CreatedAt:   dbtime.Now(),
-		UpdatedAt:   dbtime.Now(),
-	})
-	require.NoError(t, err)
-	require.True(t, org.IsDefault, "first org should always be default")
-}
-
 type tvArgs struct {
 	Status database.ProvisionerJobStatus
 	// CreateWorkspace is true if we should create a workspace for the template version

diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/organizations.sql b/coderd/database/queries/organizations.sql
@@ -1,13 +1,3 @@
--- name: GetDefaultOrganization :one
-SELECT
-	*
-FROM
-	organizations
-WHERE
-	is_default = true
-LIMIT
-	1;
-
 -- name: GetOrganizations :many
 SELECT
 	*
@@ -49,7 +39,6 @@ WHERE
 
 -- name: InsertOrganization :one
 INSERT INTO
-	organizations (id, "name", description, created_at, updated_at, is_default)
+	organizations (id, "name", description, created_at, updated_at)
 VALUES
-	-- If no organizations exist, and this is the first, make it the default.
-	($1, $2, $3, $4, $5, (SELECT TRUE FROM organizations LIMIT 1) IS NULL) RETURNING *;
+	($1, $2, $3, $4, $5) RETURNING *;
diff --git a/coderd/database/unique_constraint.go b/coderd/database/unique_constraint.go
diff --git a/coderd/organizations.go b/coderd/organizations.go
@@ -118,6 +118,5 @@ func convertOrganization(organization database.Organization) codersdk.Organizati
 		Name:      organization.Name,
 		CreatedAt: organization.CreatedAt,
 		UpdatedAt: organization.UpdatedAt,
-		IsDefault: organization.IsDefault,
 	}
 }
diff --git a/coderd/organizations_test.go b/coderd/organizations_test.go
@@ -24,14 +24,6 @@ func TestOrganizationsByUser(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, orgs)
 	require.Len(t, orgs, 1)
-	require.True(t, orgs[0].IsDefault, "first org is always default")
-
-	// Make an extra org, and it should not be defaulted.
-	notDefault, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-		Name: "another",
-	})
-	require.NoError(t, err)
-	require.False(t, notDefault.IsDefault, "only 1 default org allowed")
 }
 
 func TestOrganizationByUserAndName(t *testing.T) {

diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -1343,12 +1343,13 @@ func (api *API) oauthLogin(r *http.Request, params *oauthLoginParams) ([]*http.C
 		if user.ID == uuid.Nil {
 			var organizationID uuid.UUID
 			//nolint:gocritic
-			organization, _ := tx.GetDefaultOrganization(dbauthz.AsSystemRestricted(ctx))
-
-			// Add the user to the default organization.
-			// Once multi-organization we should check some configuration to see
-			// if we should add the user to a different organization.
-			organizationID = organization.ID
+			organizations, _ := tx.GetOrganizations(dbauthz.AsSystemRestricted(ctx))
+			if len(organizations) > 0 {
+				// Add the user to the first organization. Once multi-organization
+				// support is added, we should enable a configuration map of user
+				// email to organization.
+				organizationID = organizations[0].ID
+			}
 
 			//nolint:gocritic
 			_, err := tx.GetUserByEmailOrUsername(dbauthz.AsSystemRestricted(ctx), database.GetUserByEmailOrUsernameParams{
@@ -1394,7 +1395,7 @@ func (api *API) oauthLogin(r *http.Request, params *oauthLoginParams) ([]*http.C
 				// All of the userauth tests depend on this being able to create
 				// the first organization. It shouldn't be possible in normal
 				// operation.
-				CreateOrganization: organizationID == uuid.Nil,
+				CreateOrganization: len(organizations) == 0,
 				LoginType:          params.LoginType,
 			})
 			if err != nil {