chore: update organization sync tests

coder · Emyrk · Nov 8, 2024 · Nov 6, 2024 · Nov 7, 2024 · Nov 7, 2024
commit fce98c6463e4c2bcb6d5cd3d8dcf0bef111aaac1
diff --git a/coderd/idpsync/organization.go b/coderd/idpsync/organization.go
@@ -39,6 +39,16 @@ func (s AGPLIDPSync) AssignDefaultOrganization() bool {
 	return s.OrganizationAssignDefault
 }
 
+func (s AGPLIDPSync) UpdateOrganizationSettings(ctx context.Context, db database.Store, settings OrganizationSyncSettings) error {
+	rlv := s.Manager.Resolver(db)
+	err := s.SyncSettings.Organization.SetRuntimeValue(ctx, rlv, &settings)
+	if err != nil {
+		return xerrors.Errorf("update organization sync settings: %w", err)
+	}
+
+	return nil
+}
+
 func (s AGPLIDPSync) OrganizationSyncSettings(ctx context.Context, db database.Store) (*OrganizationSyncSettings, error) {
 	rlv := s.Manager.Resolver(db)
 	orgSettings, err := s.SyncSettings.Organization.Resolve(ctx, rlv)

diff --git a/coderd/idpsync/organizations_test.go b/coderd/idpsync/organizations_test.go
@@ -16,27 +16,6 @@ import (
 func TestParseOrganizationClaims(t *testing.T) {
 	t.Parallel()
 
-	t.Run("SingleOrgDeployment", func(t *testing.T) {
-		t.Parallel()
-
-		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
-			runtimeconfig.NewManager(),
-			idpsync.DeploymentSyncSettings{
-				OrganizationField:         "",
-				OrganizationMapping:       nil,
-				OrganizationAssignDefault: true,
-			})
-
-		ctx := testutil.Context(t, testutil.WaitMedium)
-
-		params, err := s.ParseOrganizationClaims(ctx, jwt.MapClaims{})
-		require.Nil(t, err)
-
-		require.Empty(t, params.Organizations)
-		require.True(t, params.IncludeDefault)
-		require.False(t, params.SyncEntitled)
-	})
-
 	t.Run("AGPL", func(t *testing.T) {
 		t.Parallel()
 
@@ -56,8 +35,6 @@ func TestParseOrganizationClaims(t *testing.T) {
 		params, err := s.ParseOrganizationClaims(ctx, jwt.MapClaims{})
 		require.Nil(t, err)
 
-		require.Empty(t, params.Organizations)
-		require.False(t, params.IncludeDefault)
 		require.False(t, params.SyncEntitled)
 	})
 }
diff --git a/enterprise/coderd/enidpsync/organizations.go b/enterprise/coderd/enidpsync/organizations.go
@@ -35,5 +35,6 @@ func (e EnterpriseIDPSync) ParseOrganizationClaims(ctx context.Context, mergedCl
 	return idpsync.OrganizationParams{
 		// Return true if entitled
 		SyncEntitled: true,
+		MergedClaims: mergedClaims,
 	}, nil
 }
diff --git a/enterprise/coderd/enidpsync/organizations_test.go b/enterprise/coderd/enidpsync/organizations_test.go
@@ -34,17 +34,19 @@ type Expectations struct {
 	Name   string
 	Claims jwt.MapClaims
 	// Parse
-	ParseError     func(t *testing.T, httpErr *idpsync.HTTPError)
-	ExpectedParams idpsync.OrganizationParams
+	ParseError      func(t *testing.T, httpErr *idpsync.HTTPError)
+	ExpectedParams  idpsync.OrganizationParams
+	ExpectedEnabled bool
 	// Mutate allows mutating the user before syncing
 	Mutate func(t *testing.T, db database.Store, user database.User)
 	Sync   ExpectedUser
 }
 
 type OrganizationSyncTestCase struct {
-	Settings     idpsync.DeploymentSyncSettings
-	Entitlements *entitlements.Set
-	Exps         []Expectations
+	Settings        idpsync.DeploymentSyncSettings
+	RuntimeSettings *idpsync.OrganizationSyncSettings
+	Entitlements    *entitlements.Set
+	Exps            []Expectations
 }
 
 func TestOrganizationSync(t *testing.T) {
@@ -100,10 +102,9 @@ func TestOrganizationSync(t *testing.T) {
 							Name:   "NoOrganizations",
 							Claims: jwt.MapClaims{},
 							ExpectedParams: idpsync.OrganizationParams{
-								SyncEntitled:   false,
-								IncludeDefault: true,
-								Organizations:  []uuid.UUID{},
+								SyncEntitled: true,
 							},
+							ExpectedEnabled: false,
 							Sync: ExpectedUser{
 								Organizations: []uuid.UUID{},
 							},
@@ -112,10 +113,9 @@ func TestOrganizationSync(t *testing.T) {
 							Name:   "AlreadyInOrgs",
 							Claims: jwt.MapClaims{},
 							ExpectedParams: idpsync.OrganizationParams{
-								SyncEntitled:   false,
-								IncludeDefault: true,
-								Organizations:  []uuid.UUID{},
+								SyncEntitled: true,
 							},
+							ExpectedEnabled: false,
 							Mutate: func(t *testing.T, db database.Store, user database.User) {
 								dbgen.OrganizationMember(t, db, database.OrganizationMember{
 									UserID:         user.ID,
@@ -157,10 +157,9 @@ func TestOrganizationSync(t *testing.T) {
 							Name:   "NoOrganizations",
 							Claims: jwt.MapClaims{},
 							ExpectedParams: idpsync.OrganizationParams{
-								SyncEntitled:   true,
-								IncludeDefault: true,
-								Organizations:  []uuid.UUID{},
+								SyncEntitled: true,
 							},
+							ExpectedEnabled: true,
 							Sync: ExpectedUser{
 								Organizations: []uuid.UUID{def.ID},
 							},
@@ -171,10 +170,9 @@ func TestOrganizationSync(t *testing.T) {
 								"organizations": []string{"second", "extra"},
 							},
 							ExpectedParams: idpsync.OrganizationParams{
-								SyncEntitled:   true,
-								IncludeDefault: true,
-								Organizations:  []uuid.UUID{two.ID},
+								SyncEntitled: true,
 							},
+							ExpectedEnabled: true,
 							Mutate: func(t *testing.T, db database.Store, user database.User) {
 								dbgen.OrganizationMember(t, db, database.OrganizationMember{
 									UserID:         user.ID,
@@ -196,12 +194,9 @@ func TestOrganizationSync(t *testing.T) {
 								"organizations": []string{"second", "extra", "first", "third", "second", "second"},
 							},
 							ExpectedParams: idpsync.OrganizationParams{
-								SyncEntitled:   true,
-								IncludeDefault: true,
-								Organizations: []uuid.UUID{
-									two.ID, one.ID, three.ID,
-								},
+								SyncEntitled: true,
 							},
+							ExpectedEnabled: true,
 							Mutate: func(t *testing.T, db database.Store, user database.User) {
 								dbgen.OrganizationMember(t, db, database.OrganizationMember{
 									UserID:         user.ID,
@@ -220,6 +215,72 @@ func TestOrganizationSync(t *testing.T) {
 				}
 			},
 		},
+		{
+			Name: "DynamicSettings",
+			Case: func(t *testing.T, db database.Store) OrganizationSyncTestCase {
+				def, _ := db.GetDefaultOrganization(context.Background())
+				one := dbgen.Organization(t, db, database.Organization{})
+				two := dbgen.Organization(t, db, database.Organization{})
+				three := dbgen.Organization(t, db, database.Organization{})
+				return OrganizationSyncTestCase{
+					Entitlements: entitled,
+					Settings: idpsync.DeploymentSyncSettings{
+						OrganizationField: "organizations",
+						OrganizationMapping: map[string][]uuid.UUID{
+							"first":  {one.ID},
+							"second": {two.ID},
+							"third":  {three.ID},
+						},
+						OrganizationAssignDefault: true,
+					},
+					// Override
+					RuntimeSettings: &idpsync.OrganizationSyncSettings{
+						OrganizationField: "dynamic",
+						OrganizationMapping: map[string][]uuid.UUID{
+							"third": {three.ID},
+						},
+						OrganizationAssignDefault: false,
+					},
+					Exps: []Expectations{
+						{
+							Name:   "NoOrganizations",
+							Claims: jwt.MapClaims{},
+							ExpectedParams: idpsync.OrganizationParams{
+								SyncEntitled: true,
+							},
+							ExpectedEnabled: true,
+							Sync: ExpectedUser{
+								Organizations: []uuid.UUID{},
+							},
+						},
+						{
+							Name: "AlreadyInOrgs",
+							Claims: jwt.MapClaims{
+								"organizations": []string{"second", "extra"},
+								"dynamic":       []string{"third"},
+							},
+							ExpectedParams: idpsync.OrganizationParams{
+								SyncEntitled: true,
+							},
+							ExpectedEnabled: true,
+							Mutate: func(t *testing.T, db database.Store, user database.User) {
+								dbgen.OrganizationMember(t, db, database.OrganizationMember{
+									UserID:         user.ID,
+									OrganizationID: def.ID,
+								})
+								dbgen.OrganizationMember(t, db, database.OrganizationMember{
+									UserID:         user.ID,
+									OrganizationID: one.ID,
+								})
+							},
+							Sync: ExpectedUser{
+								Organizations: []uuid.UUID{three.ID},
+							},
+						},
+					},
+				}
+			},
+		},
 	}
 
 	for _, tc := range testCases {
@@ -238,6 +299,11 @@ func TestOrganizationSync(t *testing.T) {
 
 			// Create a new sync object
 			sync := enidpsync.NewSync(logger, runtimeconfig.NewManager(), caseData.Entitlements, caseData.Settings)
+			if caseData.RuntimeSettings != nil {
+				err := sync.UpdateOrganizationSettings(ctx, rdb, *caseData.RuntimeSettings)
+				require.NoError(t, err)
+			}
+
 			for _, exp := range caseData.Exps {
 				t.Run(exp.Name, func(t *testing.T) {
 					params, httpErr := sync.ParseOrganizationClaims(ctx, exp.Claims)
@@ -248,11 +314,7 @@ func TestOrganizationSync(t *testing.T) {
 					require.Nil(t, httpErr, "no parse error")
 
 					require.Equal(t, exp.ExpectedParams.SyncEntitled, params.SyncEntitled, "match enabled")
-					require.Equal(t, exp.ExpectedParams.IncludeDefault, params.IncludeDefault, "match include default")
-					if exp.ExpectedParams.Organizations == nil {
-						exp.ExpectedParams.Organizations = []uuid.UUID{}
-					}
-					require.ElementsMatch(t, exp.ExpectedParams.Organizations, params.Organizations, "match organizations")
+					require.Equal(t, exp.ExpectedEnabled, sync.OrganizationSyncEnabled(context.Background(), rdb))
 
 					user := dbgen.User(t, db, database.User{})
 					if exp.Mutate != nil {