[PM-38224] Add claimed domain functionality to seeder (#7735)

Author: eliykat

util/Seeder/Factories/OrganizationDomainSeeder.cs

@@ -1,5 +1,5 @@
-using Bit.Core.Utilities;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Core.Entities;
+using Bit.Core.Utilities;
 
 namespace Bit.Seeder.Factories;
 

util/Seeder/Models/SeedPreset.cs

@@ -25,6 +25,7 @@ internal record SeedPresetOrganization
     public string? Fixture { get; init; }
     public string? Name { get; init; }
     public string? Domain { get; init; }
+    public List<string>? ClaimedDomains { get; init; }
     public int? Seats { get; init; }
     public string? PlanType { get; init; }
     public bool? UseAutomaticUserConfirmation { get; init; }

util/Seeder/Options/OrganizationVaultOptions.cs

@@ -20,6 +20,11 @@ public class OrganizationVaultOptions
     /// </summary>
     public required string Domain { get; init; }
 
+    /// <summary>
+    /// Claimed (verified) domains to seed for the organization. Each becomes a verified <see cref="Bit.Core.Entities.OrganizationDomain"/> row.
+    /// </summary>
+    public IReadOnlyList<string> ClaimedDomains { get; init; } = [];
+
     /// <summary>
     /// Number of member users to create.
     /// </summary>

util/Seeder/Pipeline/BulkCommitter.cs

@@ -12,6 +12,7 @@
 using EfGroupUser = Bit.Infrastructure.EntityFramework.Models.GroupUser;
 using EfOrganization = Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization;
 using EfOrganizationApiKey = Bit.Infrastructure.EntityFramework.Models.OrganizationApiKey;
+using EfOrganizationDomain = Bit.Infrastructure.EntityFramework.Models.OrganizationDomain;
 using EfOrganizationUser = Bit.Infrastructure.EntityFramework.Models.OrganizationUser;
 using EfUser = Bit.Infrastructure.EntityFramework.Models.User;
 
@@ -40,6 +41,8 @@ internal void Commit(SeederContext context)
     {
         MapCopyAndClear<Core.AdminConsole.Entities.Organization, EfOrganization>(context.Organizations);
 
+        MapCopyAndClear<Core.Entities.OrganizationDomain, EfOrganizationDomain>(context.OrganizationDomains);
+
         MapAndCopy<Core.Entities.OrganizationApiKey, EfOrganizationApiKey>(context.OrganizationApiKey);
 
         MapCopyAndClear<Core.Entities.User, EfUser>(context.Users);

util/Seeder/Pipeline/PresetLoader.cs

@@ -87,7 +87,7 @@ private static void BuildIndividualRecipe(string presetName, SeedPreset preset,
     /// Builds a recipe from preset configuration, resolving fixtures and generation counts.
     /// </summary>
     /// <remarks>
-    /// Resolution order: Org → OrgApiKey → Roster → Owner (if no roster owner) → Generator → Users → Groups → Collections → Folders → Ciphers → CipherCollections → CipherFolders → CipherFavorites → PersonalCiphers
+    /// Resolution order: Org → OrgApiKey → ClaimedDomains → Roster → Owner (if no roster owner) → Generator → Users → Groups → Collections → Folders → Ciphers → CipherCollections → CipherFolders → CipherFavorites → PersonalCiphers
     /// </remarks>
     private static void BuildRecipe(string presetName, SeedPreset preset, ISeedReader reader, IServiceCollection services)
     {
@@ -117,6 +117,11 @@ private static void BuildRecipe(string presetName, SeedPreset preset, ISeedReade
 
         builder.AddOrganizationApiKey();
 
+        if (org.ClaimedDomains is { Count: > 0 })
+        {
+            builder.WithOrganizationDomain(org.ClaimedDomains);
+        }
+
         if (preset.Roster?.Fixture is not null)
         {
             builder.UseRoster(preset.Roster.Fixture, reader);

util/Seeder/Pipeline/RecipeBuilderExtensions.cs

@@ -76,6 +76,39 @@ public static RecipeBuilder AddOrganizationApiKey(this RecipeBuilder builder)
         return builder;
     }
 
+    /// <summary>
+    /// Seed one or more claimed (verified) organization domains.
+    /// Domain names are trimmed; empty entries are dropped and duplicates removed case-insensitively.
+    /// </summary>
+    /// <param name="builder">The recipe builder</param>
+    /// <param name="domainNames">Domain names to seed. Empty (or all-empty/whitespace) is a no-op.</param>
+    /// <returns>The builder for fluent chaining</returns>
+    /// <exception cref="InvalidOperationException">Thrown when no organization exists.</exception>
+    public static RecipeBuilder WithOrganizationDomain(
+        this RecipeBuilder builder,
+        IReadOnlyList<string> domainNames)
+    {
+        if (!builder.HasOrg)
+        {
+            throw new InvalidOperationException(
+                "Organization domains require an organization. Call UseOrganization() or CreateOrganization() first.");
+        }
+
+        var unique = domainNames
+            .Select(d => d.Trim())
+            .Where(d => !string.IsNullOrWhiteSpace(d))
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .ToList();
+
+        if (unique.Count == 0)
+        {
+            return builder;
+        }
+
+        builder.AddStep(_ => new CreateOrganizationDomainsStep(unique));
+        return builder;
+    }
+
     /// <summary>
     /// Add an organization owner user with admin privileges.
     /// </summary>

util/Seeder/Pipeline/RecipeOrchestrator.cs

@@ -64,6 +64,12 @@ internal PipelineExecutionResult Execute(OrganizationVaultOptions options)
 
         builder.CreateOrganization(options.Name, options.Domain, options.Users + 1, options.PlanType, options.Overrides);
         builder.AddOrganizationApiKey();
+
+        if (options.ClaimedDomains.Count > 0)
+        {
+            builder.WithOrganizationDomain(options.ClaimedDomains);
+        }
+
         builder.AddOwner();
         builder.WithGenerator(options.Domain);
         builder.AddUsers(options.Users, options.RealisticStatusMix);

util/Seeder/Pipeline/SeederContext.cs

@@ -56,6 +56,8 @@ public sealed class SeederContext(IServiceProvider services)
 
     internal List<Organization> Organizations { get; } = [];
 
+    internal List<OrganizationDomain> OrganizationDomains { get; } = [];
+
     internal List<User> Users { get; } = [];
 
     internal List<OrganizationUser> OrganizationUsers { get; } = [];

util/Seeder/Seeds/schemas/preset.schema.json

@@ -30,6 +30,12 @@
           "type": "string",
           "description": "Organization domain (used with inline creation and generator seeding)."
         },
+        "claimedDomains": {
+          "type": "array",
+          "items": { "type": "string", "minLength": 1 },
+          "uniqueItems": true,
+          "description": "Claimed (verified) organization domains to seed. Each becomes a verified OrganizationDomain row."
+        },
         "seats": {
           "type": "integer",
           "minimum": 1,

util/Seeder/Steps/CreateOrganizationDomainsStep.cs

@@ -0,0 +1,17 @@
+using Bit.Seeder.Factories;
+using Bit.Seeder.Pipeline;
+
+namespace Bit.Seeder.Steps;
+
+internal sealed class CreateOrganizationDomainsStep(IReadOnlyList<string> domainNames) : IStep
+{
+    public void Execute(SeederContext context)
+    {
+        var orgId = context.RequireOrgId();
+
+        foreach (var name in domainNames)
+        {
+            context.OrganizationDomains.Add(OrganizationDomainSeeder.Create(orgId, name));
+        }
+    }
+}