Fix default org sync behavior

Emyrk · Emyrk · commit 71daa455e6c9 · 2024-11-07T15:40:17.000-06:00
diff --git a/coderd/idpsync/organization.go b/coderd/idpsync/organization.go
@@ -52,16 +52,11 @@ func (s AGPLIDPSync) OrganizationSyncSettings(ctx context.Context, db database.S
 			return nil, xerrors.Errorf("resolve org sync settings: %w", err)
 		}
 
-		// Default to an empty config
-		orgSettings = &OrganizationSyncSettings{}
-
-		if s.DeploymentSyncSettings.OrganizationField != "" {
-			// Use static settings if set
-			orgSettings = &OrganizationSyncSettings{
-				Field:         s.DeploymentSyncSettings.OrganizationField,
-				Mapping:       s.DeploymentSyncSettings.OrganizationMapping,
-				AssignDefault: s.DeploymentSyncSettings.OrganizationAssignDefault,
-			}
+		// Default to the statically assigned settings if they exist.
+		orgSettings = &OrganizationSyncSettings{
+			Field:         s.DeploymentSyncSettings.OrganizationField,
+			Mapping:       s.DeploymentSyncSettings.OrganizationMapping,
+			AssignDefault: s.DeploymentSyncSettings.OrganizationAssignDefault,
 		}
 	}
 	return orgSettings, nil
