diff --git a/util/DbSeederUtility/DbSeederUtility.csproj b/util/DbSeederUtility/DbSeederUtility.csproj index ab3ac933c6..1b31551201 100644 --- a/util/DbSeederUtility/DbSeederUtility.csproj +++ b/util/DbSeederUtility/DbSeederUtility.csproj @@ -8,6 +8,7 @@ Bit.DbSeederUtility DbSeeder true + 2294c6ba-7cd0-4293-a797-3882e41c61cb diff --git a/util/DbSeederUtility/Program.cs b/util/DbSeederUtility/Program.cs index 27b5ff5a1a..37e7ac2760 100644 --- a/util/DbSeederUtility/Program.cs +++ b/util/DbSeederUtility/Program.cs @@ -11,73 +11,23 @@ public class Program // Ensure global settings are loaded var globalSettings = GlobalSettingsFactory.GlobalSettings; - // Set the current directory to the seeder directory for consistent seed paths - var seederDirectory = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), "..", "seeder")); - Directory.SetCurrentDirectory(seederDirectory); - return new AppRunner() .Run(args); } - [Command("generate", Description = "Generate seed data as JSON files")] - public int Generate( + [Command("organization", Description = "Seed an organization and organization users")] + public int Organization( + [Option('n', "Name", Description = "Name of organization")] + string name, + [Option('u', "users", Description = "Number of users to generate")] int users, - [Option('c', "ciphers-per-user", Description = "Number of ciphers per user to generate")] - int ciphersPerUser, - - [Option('n', "seed-name", Description = "Name for the seed data files")] - string seedName + [Option('d', "domain", Description = "Email domain for users")] + string domain ) { - // Execute the generate command var generateCommand = new GenerateCommand(); - return generateCommand.Execute(users, ciphersPerUser, seedName, false) ? 0 : 1; - } - - [Command("load", Description = "Load seed data from JSON files into the database")] - public int Load( - [Option('n', "seed-name", Description = "Name of the seed data to load")] - string seedName, - - [Option('t', "timestamp", Description = "Specific timestamp of the seed data to load (defaults to most recent)")] - string? timestamp = null, - - [Option('d', "dry-run", Description = "Validate the seed data without actually loading it")] - bool dryRun = false - ) - { - // Execute the load command - var loadCommand = new LoadCommand(); - return loadCommand.Execute(seedName, timestamp, dryRun) ? 0 : 1; - } - - [Command("generate-direct-load", Description = "Generate seed data and load it directly into the database without creating JSON files")] - public int GenerateDirectLoad( - [Option('u', "users", Description = "Number of users to generate")] - int users, - - [Option('c', "ciphers-per-user", Description = "Number of ciphers per user to generate")] - int ciphersPerUser, - - [Option('n', "seed-name", Description = "Name identifier for this seed operation")] - string seedName - ) - { - // Execute the generate command with loadImmediately=true - var generateCommand = new GenerateCommand(); - return generateCommand.Execute(users, ciphersPerUser, seedName, true) ? 0 : 1; - } - - [Command("extract", Description = "Extract data from the database into seed files")] - public int Extract( - [Option('n', "seed-name", Description = "Name for the extracted seed")] - string seedName - ) - { - // Execute the extract command - var extractCommand = new ExtractCommand(); - return extractCommand.Execute(seedName) ? 0 : 1; + return generateCommand.Execute(name, users, domain) ? 0 : 1; } } diff --git a/util/Seeder/Commands/ExtractCommand.cs b/util/Seeder/Commands/ExtractCommand.cs deleted file mode 100644 index 4c6457fb5f..0000000000 --- a/util/Seeder/Commands/ExtractCommand.cs +++ /dev/null @@ -1,117 +0,0 @@ -using Bit.Core.Enums; -using Bit.Seeder.Services; -using Bit.Seeder.Settings; -using Microsoft.AspNetCore.DataProtection; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace Bit.Seeder.Commands; - -public class ExtractCommand -{ - public bool Execute(string seedName) - { - try - { - // Create service provider with necessary services - var services = new ServiceCollection(); - ConfigureServices(services); - var serviceProvider = services.BuildServiceProvider(); - - // Get the necessary services - var seederService = serviceProvider.GetRequiredService(); - var logger = serviceProvider.GetRequiredService>(); - - logger.LogInformation($"Extracting data from database to seed: {seedName}"); - - // Execute the extract operation - seederService.ExtractSeedsAsync(seedName).GetAwaiter().GetResult(); - - logger.LogInformation("Seed extraction completed successfully"); - return true; - } - catch (Exception ex) - { - Console.WriteLine($"Error extracting seeds: {ex.Message}"); - if (ex.InnerException != null) - { - Console.WriteLine($"Inner exception: {ex.InnerException.Message}"); - } - Console.WriteLine($"Stack trace: {ex.StackTrace}"); - return false; - } - } - - private void ConfigureServices(ServiceCollection services) - { - // Add logging - services.AddLogging(builder => - { - builder.AddConsole(); - builder.SetMinimumLevel(LogLevel.Information); - }); - - // Add JSON file configuration for other app settings not in GlobalSettings - var configuration = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"}.json", optional: true, reloadOnChange: true) - .AddEnvironmentVariables() - .AddUserSecrets("Bit.Seeder") - .Build(); - - services.AddSingleton(configuration); - - // Get global settings - var globalSettings = GlobalSettingsFactory.GlobalSettings; - services.AddSingleton(globalSettings); - - // Configure database provider - var provider = globalSettings.DatabaseProvider.ToLowerInvariant() switch - { - "postgres" or "postgresql" => SupportedDatabaseProviders.Postgres, - "mysql" or "mariadb" => SupportedDatabaseProviders.MySql, - "sqlite" => SupportedDatabaseProviders.Sqlite, - _ => SupportedDatabaseProviders.SqlServer - }; - - var connectionString = provider switch - { - SupportedDatabaseProviders.Postgres => globalSettings.PostgreSql?.ConnectionString, - SupportedDatabaseProviders.MySql => globalSettings.MySql?.ConnectionString, - SupportedDatabaseProviders.Sqlite => globalSettings.Sqlite?.ConnectionString, - _ => globalSettings.SqlServer?.ConnectionString - }; - - // Register database context - services.AddDbContext(options => - { - switch (provider) - { - case SupportedDatabaseProviders.Postgres: - options.UseNpgsql(connectionString); - break; - case SupportedDatabaseProviders.MySql: - options.UseMySql(connectionString!, ServerVersion.AutoDetect(connectionString!)); - break; - case SupportedDatabaseProviders.Sqlite: - options.UseSqlite(connectionString!); - break; - default: - options.UseSqlServer(connectionString!); - break; - } - }); - - // Add Data Protection services - services.AddDataProtection() - .SetApplicationName("Bitwarden"); - - // Register other services - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - } -} diff --git a/util/Seeder/Commands/GenerateCommand.cs b/util/Seeder/Commands/GenerateCommand.cs index e150510700..7d07dc405b 100644 --- a/util/Seeder/Commands/GenerateCommand.cs +++ b/util/Seeder/Commands/GenerateCommand.cs @@ -1,56 +1,82 @@ -using Bit.Seeder.Services; +using Bit.Core.Billing.Enums; +using Bit.Core.Enums; +using Bit.Infrastructure.EntityFramework.AdminConsole.Models; +using Bit.Infrastructure.EntityFramework.Models; +using Bit.Seeder.Services; using Bit.Seeder.Settings; +using Bit.SharedWeb.Utilities; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using DatabaseContext = Bit.Infrastructure.EntityFramework.Repositories.DatabaseContext; namespace Bit.Seeder.Commands; public class GenerateCommand { - public bool Execute(int users, int ciphersPerUser, string seedName, bool loadImmediately = false) + public bool Execute(string name, int users, string domain) { - try + // Create service provider with necessary services + var services = new ServiceCollection(); + ConfigureServices(services); + var serviceProvider = services.BuildServiceProvider(); + + var logger = serviceProvider.GetRequiredService>(); + + var organization = new Organization { - // Create service provider with necessary services - var services = new ServiceCollection(); - ConfigureServices(services); - var serviceProvider = services.BuildServiceProvider(); + Id = Guid.NewGuid(), + Name = name, + BillingEmail = $"billing@{domain}", + Plan = "Enterprise (Annually)", + PlanType = PlanType.EnterpriseAnnually, + Seats = users, - // Get the seeder service - var seederService = serviceProvider.GetRequiredService(); - var logger = serviceProvider.GetRequiredService>(); + // Currently hardcoded to the values from https://github.com/bitwarden/sdk-internal/blob/main/crates/bitwarden-core/src/client/test_accounts.rs. + // TODO: These should be dynamically generated by the SDK. + PublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmIJbGMk6eZqVE7UxhZ46Weu2jKciqOiOkSVYtGvs61rfe9AXxtLaaZEKN4d4DmkZcF6dna2eXNxZmb7U4pwlttye8ksqISe6IUAZQox7auBpjopdCEPhKRg3BD/u8ks9UxSxgWe+fpebjt6gd5hsl1/5HOObn7SeU6EEU04cp3/eH7a4OTdXxB8oN62HGV9kM/ubM1goILgjoSJDbihMK0eb7b8hPHwcA/YOgKKiu/N3FighccdSMD5Pk+HfjacsFNZQa2EsqW09IvvSZ+iL6HQeZ1vwc/6TO1J7EOfJZFQcjoEL9LVI693efYoMZSmrPEWziZ4PvwpOOGo6OObyMQIDAQAB", + PrivateKey = "2.6FggyKVyaKQsfohi5yqgbg==|UU2JeafOB41L5UscGmf4kq15JGDf3Bkf67KECiehTODzbWctVLTgyDk0Qco8/6CMN6nZGXjxR2A4r5ExhmwRNsNxd77G+MprkmiJz+7w33ROZ1ouQO5XjD3wbQ3ssqNiTKId6yAUPBvuAZRixVApauTuADc8QWGixqCQcqZzmU7YSBBIPf652/AEYr4Tk64YihoE39pHiK8MRbTLdRt3EF4LSMugPAPM24vCgUv3w1TD3Fj6sDg/6oi3flOV9SJZX4vCiUXbDNEuD/p2aQrEXVbaxweFOHjTe7F4iawjXw3nG3SO8rUBHcxbhDDVx5rjYactbW5QvHWiyla6uLb6o8WHBneg2EjTEwAHOZE/rBjcqmAJb2sVp1E0Kwq8ycGmL69vmqJPC1GqVTohAQvmEkaxIPpfq24Yb9ZPrADA7iEXBKuAQ1FphFUVgJBJGJbd60sOV1Rz1T+gUwS4wCNQ4l3LG1S22+wzUVlEku5DXFnT932tatqTyWEthqPqLCt6dL1+qa94XLpeHagXAx2VGe8n8IlcADtxqS+l8xQ4heT12WO9kC316vqvg1mnsI56faup9hb3eT9ZpKyxSBGYOphlTWfV1Y/v64f5PYvTo4aL0IYHyLY/9Qi72vFmOpPeHBYgD5t3j+H2CsiU1PkYsBggOmD7xW8FDuT6HWVvwhEJqeibVPK0Lhyj6tgvlSIAvFUaSMFPlmwFNmwfj/AHUhr9KuTfsBFTZ10yy9TZVgf+EofwnrxHBaWUgdD40aHoY1VjfG33iEuajb6buxG3pYFyPNhJNzeLZisUKIDRMQpUHrsE22EyrFFran3tZGdtcyIEK4Q1F0ULYzJ6T9iY25/ZgPy3pEAAMZCtqo3s+GjX295fWIHfMcnjMgNUHPjExjWBHa+ggK9iQXkFpBVyYB1ga/+0eiIhiek3PlgtvpDrqF7TsLK+ROiBw2GJ7uaO3EEXOj2GpNBuEJ5CdodhZkwzhwMcSatgDHkUuNVu0iVbF6/MxVdOxWXKO+jCYM6PZk/vAhLYqpPzu2T2Uyz4nkDs2Tiq61ez6FoCrzdHIiyIxVTzUQH8G9FgSmtaZ7GCbqlhnurYgcMciwPzxg0hpAQT+NZw1tVEii9vFSpJJbGJqNhORKfKh/Mu1P/9LOQq7Y0P2FIR3x/eUVEQ7CGv2jVtO5ryGSmKeq/P9Fr54wTPaNiqN2K+leACUznCdUWw8kZo/AsBcrOe4OkRX6k8LC3oeJXy06DEToatxEvPYemUauhxiXRw8nfNMqc4LyJq2bbT0zCgJHoqpozPdNg6AYWcoIobgAGu7ZQGq+oE1MT3GZxotMPe/NUJiAc5YE9Thb5Yf3gyno71pyqPTVl/6IQuh4SUz7rkgwF/aVHEnr4aUYNoc0PEzd2Me0jElsA3GAneq1I/wngutOWgTViTK4Nptr5uIzMVQs9H1rOMJNorP8b02t1NDu010rSsib9GaaJJq4r4iy46laQOxWoU0ex26arYnk+jw4833WSCTVBIprTgizZ+fKjoY0xwXvI2oOvGNEUCtGFvKFORTaQrlaXZIg1toa2BBVNicyONbwnI3KIu3MgGJ2SlCVXJn8oHFppVHFCdwgN1uDzGiKAhjvr0sZTUtXin2f2CszPTbbo=|fUhbVKrr8CSKE7TZJneXpDGraj5YhRrq9ESo206S+BY=", + }; - logger.LogInformation($"Generating seeds for {users} users with {ciphersPerUser} ciphers per user"); - logger.LogInformation($"Seed name: {seedName}"); - - // Execute the appropriate action based on whether we need to load immediately - if (loadImmediately) - { - // Generate and load directly without creating intermediate files - seederService.GenerateAndLoadSeedsAsync(users, ciphersPerUser, seedName).GetAwaiter().GetResult(); - logger.LogInformation("Seeds generated and loaded directly to database"); - } - else - { - // Only generate seeds and save to files - string timestamp = DateTime.Now.ToString("yyyyMMdd_HHmmss"); - seederService.GenerateSeedsAsync(users, ciphersPerUser, seedName).GetAwaiter().GetResult(); - logger.LogInformation("Seed generation completed successfully"); - } - - return true; - } - catch (Exception ex) + var user = new User { - Console.WriteLine($"Error generating seeds: {ex.Message}"); - if (ex.InnerException != null) - { - Console.WriteLine($"Inner exception: {ex.InnerException.Message}"); - } - Console.WriteLine($"Stack trace: {ex.StackTrace}"); - return false; + Id = Guid.NewGuid(), + Email = $"admin@{domain}", + MasterPassword = "AQAAAAIAAYagAAAAEBATmF66OHMpHuHKc1CsGZQ1ltHUHyhYK+7e4re3bVFi16SOpLpDfzdFswnvFQs2Rg==", + SecurityStamp = "4830e359-e150-4eae-be2a-996c81c5e609", + Key = "2.z/eLKFhd62qy9RzXu3UHgA==|fF6yNupiCIguFKSDTB3DoqcGR0Xu4j+9VlnMyT5F3PaWIcGhzQKIzxdB95nhslaCQv3c63M7LBnvzVo1J9SUN85RMbP/57bP1HvhhU1nvL8=|IQPtf8v7k83MFZEhazSYXSdu98BBU5rqtvC4keVWyHM=", + PublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Ww2chogqCpaAR7Uw448am4b7vDFXiM5kXjFlGfXBlrAdAqTTggEvTDlMNYqPlCo+mBM6iFmTTUY9rpZBvFskMnKvsvpJ47/fehAH2o2e3Ulv/5NFevaVCMCmpkBDtbMbO1A4a3btdRtCP8DsKWMefHauEpaoLxNTLWnOIZVfCMjsSgx2EvULHAZPTtbFwm4+UVKniM4ds4jvOsD85h4jn2aLs/jWJXFfxN8iVSqEqpC2TBvsPdyHb49xQoWWfF0Z6BiNqeNGKEU9Uos1pjL+kzhEzzSpH31PZT/ufJ/oo4+93wrUt57hb6f0jxiXhwd5yQ+9F6wVwpbfkq0IwhjOwIDAQAB", + PrivateKey = "2.yN7l00BOlUE0Sb0M//Q53w==|EwKG/BduQRQ33Izqc/ogoBROIoI5dmgrxSo82sgzgAMIBt3A2FZ9vPRMY+GWT85JiqytDitGR3TqwnFUBhKUpRRAq4x7rA6A1arHrFp5Tp1p21O3SfjtvB3quiOKbqWk6ZaU1Np9HwqwAecddFcB0YyBEiRX3VwF2pgpAdiPbSMuvo2qIgyob0CUoC/h4Bz1be7Qa7B0Xw9/fMKkB1LpOm925lzqosyMQM62YpMGkjMsbZz0uPopu32fxzDWSPr+kekNNyLt9InGhTpxLmq1go/pXR2uw5dfpXc5yuta7DB0EGBwnQ8Vl5HPdDooqOTD9I1jE0mRyuBpWTTI3FRnu3JUh3rIyGBJhUmHqGZvw2CKdqHCIrQeQkkEYqOeJRJVdBjhv5KGJifqT3BFRwX/YFJIChAQpebNQKXe/0kPivWokHWwXlDB7S7mBZzhaAPidZvnuIhalE2qmTypDwHy22FyqV58T8MGGMchcASDi/QXI6kcdpJzPXSeU9o+NC68QDlOIrMVxKFeE7w7PvVmAaxEo0YwmuAzzKy9QpdlK0aab/xEi8V4iXj4hGepqAvHkXIQd+r3FNeiLfllkb61p6WTjr5urcmDQMR94/wYoilpG5OlybHdbhsYHvIzYoLrC7fzl630gcO6t4nM24vdB6Ymg9BVpEgKRAxSbE62Tqacxqnz9AcmgItb48NiR/He3n3ydGjPYuKk/ihZMgEwAEZvSlNxYONSbYrIGDtOY+8Nbt6KiH3l06wjZW8tcmFeVlWv+tWotnTY9IqlAfvNVTjtsobqtQnvsiDjdEVtNy/s2ci5TH+NdZluca2OVEr91Wayxh70kpM6ib4UGbfdmGgCo74gtKvKSJU0rTHakQ5L9JlaSDD5FamBRyI0qfL43Ad9qOUZ8DaffDCyuaVyuqk7cz9HwmEmvWU3VQ+5t06n/5kRDXttcw8w+3qClEEdGo1KeENcnXCB32dQe3tDTFpuAIMLqwXs6FhpawfZ5kPYvLPczGWaqftIs/RXJ/EltGc0ugw2dmTLpoQhCqrcKEBDoYVk0LDZKsnzitOGdi9mOWse7Se8798ib1UsHFUjGzISEt6upestxOeupSTOh0v4+AjXbDzRUyogHww3V+Bqg71bkcMxtB+WM+pn1XNbVTyl9NR040nhP7KEf6e9ruXAtmrBC2ah5cFEpLIot77VFZ9ilLuitSz+7T8n1yAh1IEG6xxXxninAZIzi2qGbH69O5RSpOJuJTv17zTLJQIIc781JwQ2TTwTGnx5wZLbffhCasowJKd2EVcyMJyhz6ru0PvXWJ4hUdkARJs3Xu8dus9a86N8Xk6aAPzBDqzYb1vyFIfBxP0oO8xFHgd30Cgmz8UrSE3qeWRrF8ftrI6xQnFjHBGWD/JWSvd6YMcQED0aVuQkuNW9ST/DzQThPzRfPUoiL10yAmV7Ytu4fR3x2sF0Yfi87YhHFuCMpV/DsqxmUizyiJuD938eRcH8hzR/VO53Qo3UIsqOLcyXtTv6THjSlTopQ+JOLOnHm1w8dzYbLN44OG44rRsbihMUQp+wUZ6bsI8rrOnm9WErzkbQFbrfAINdoCiNa6cimYIjvvnMTaFWNymqY1vZxGztQiMiHiHYwTfwHTXrb9j0uPM=|09J28iXv9oWzYtzK2LBT6Yht4IT4MijEkk0fwFdrVQ4=", + ApiKey = "7gp59kKHt9kMlks0BuNC4IjNXYkljR", + + Kdf = KdfType.PBKDF2_SHA256, + KdfIterations = 600_000, + }; + + var orgUser = new OrganizationUser + { + Id = Guid.NewGuid(), + OrganizationId = organization.Id, + UserId = user.Id, + Key = "4.rY01mZFXHOsBAg5Fq4gyXuklWfm6mQASm42DJpx05a+e2mmp+P5W6r54WU2hlREX0uoTxyP91bKKwickSPdCQQ58J45LXHdr9t2uzOYyjVzpzebFcdMw1eElR9W2DW8wEk9+mvtWvKwu7yTebzND+46y1nRMoFydi5zPVLSlJEf81qZZ4Uh1UUMLwXz+NRWfixnGXgq2wRq1bH0n3mqDhayiG4LJKgGdDjWXC8W8MMXDYx24SIJrJu9KiNEMprJE+XVF9nQVNijNAjlWBqkDpsfaWTUfeVLRLctfAqW1blsmIv4RQ91PupYJZDNc8nO9ZTF3TEVM+2KHoxzDJrLs2Q==", + Type = OrganizationUserType.Admin, + Status = OrganizationUserStatusType.Confirmed + }; + + using (var scope = serviceProvider.CreateScope()) + { + var scopedServices = scope.ServiceProvider; + var db = scopedServices.GetRequiredService(); + + db.Add(organization); + db.Add(user); + db.Add(orgUser); + + db.SaveChanges(); } + + return true; + } private void ConfigureServices(ServiceCollection services) @@ -70,6 +96,7 @@ public class GenerateCommand services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddDbContext(); + + services.AddDatabaseRepositories(globalSettings); } } diff --git a/util/Seeder/Commands/LoadCommand.cs b/util/Seeder/Commands/LoadCommand.cs deleted file mode 100644 index 02c02d742d..0000000000 --- a/util/Seeder/Commands/LoadCommand.cs +++ /dev/null @@ -1,85 +0,0 @@ -using Bit.Seeder.Services; -using Bit.Seeder.Settings; -using Microsoft.AspNetCore.DataProtection; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace Bit.Seeder.Commands; - -public class LoadCommand -{ - public bool Execute(string seedName, string? timestamp = null, bool dryRun = false) - { - try - { - // Create service provider with necessary services - var services = new ServiceCollection(); - ConfigureServices(services); - var serviceProvider = services.BuildServiceProvider(); - - // Get the necessary services - var seederService = serviceProvider.GetRequiredService(); - var databaseService = serviceProvider.GetRequiredService(); - var logger = serviceProvider.GetRequiredService>(); - - logger.LogInformation($"Loading seeds named: {seedName}"); - if (!string.IsNullOrEmpty(timestamp)) - { - logger.LogInformation($"Using specific timestamp: {timestamp}"); - } - - if (dryRun) - { - logger.LogInformation("DRY RUN: No actual changes will be made to the database"); - // Perform validation here if needed - logger.LogInformation("Seed loading validation completed"); - return true; - } - - // Execute the load operation - seederService.LoadSeedsAsync(seedName, timestamp).GetAwaiter().GetResult(); - - logger.LogInformation("Seed loading completed successfully"); - return true; - } - catch (Exception ex) - { - // Display the full exception details - Console.WriteLine($"Error loading seeds: {ex.Message}"); - - if (ex.InnerException != null) - { - Console.WriteLine($"Inner exception: {ex.InnerException.Message}"); - - if (ex.InnerException.InnerException != null) - { - Console.WriteLine($"Inner inner exception: {ex.InnerException.InnerException.Message}"); - } - } - - Console.WriteLine($"Stack trace: {ex.StackTrace}"); - - return false; - } - } - - private void ConfigureServices(ServiceCollection services) - { - // Load configuration using the GlobalSettingsFactory - var globalSettings = GlobalSettingsFactory.GlobalSettings; - - // Register services - services.AddLogging(builder => builder.AddConsole()); - services.AddSingleton(globalSettings); - - // Add Data Protection services - services.AddDataProtection() - .SetApplicationName("Bitwarden"); - - // Register DatabaseContext and services - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddDbContext(); - } -} diff --git a/util/Seeder/Seeder.csproj b/util/Seeder/Seeder.csproj index a7acb3acf7..51f58bc10a 100644 --- a/util/Seeder/Seeder.csproj +++ b/util/Seeder/Seeder.csproj @@ -34,6 +34,7 @@ + diff --git a/util/Seeder/Services/DatabaseContext.cs b/util/Seeder/Services/DatabaseContext.cs index f45eea1c5c..b4eb51dc2d 100644 --- a/util/Seeder/Services/DatabaseContext.cs +++ b/util/Seeder/Services/DatabaseContext.cs @@ -1,6 +1,6 @@ using Bit.Core.Entities; +using Bit.Core.Settings; using Bit.Core.Vault.Entities; -using Bit.Seeder.Settings; using Microsoft.EntityFrameworkCore; namespace Bit.Seeder.Services; diff --git a/util/Seeder/Settings/GlobalSettings.cs b/util/Seeder/Settings/GlobalSettings.cs deleted file mode 100644 index 8f64c2e275..0000000000 --- a/util/Seeder/Settings/GlobalSettings.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace Bit.Seeder.Settings; - -public class GlobalSettings -{ - public bool SelfHosted { get; set; } - public string DatabaseProvider { get; set; } = string.Empty; - public SqlSettings SqlServer { get; set; } = new SqlSettings(); - public SqlSettings PostgreSql { get; set; } = new SqlSettings(); - public SqlSettings MySql { get; set; } = new SqlSettings(); - public SqlSettings Sqlite { get; set; } = new SqlSettings(); - - public class SqlSettings - { - public string ConnectionString { get; set; } = string.Empty; - } -} diff --git a/util/Seeder/Settings/GlobalSettingsFactory.cs b/util/Seeder/Settings/GlobalSettingsFactory.cs index 48486da665..4b593327ca 100644 --- a/util/Seeder/Settings/GlobalSettingsFactory.cs +++ b/util/Seeder/Settings/GlobalSettingsFactory.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.Configuration; +using Bit.Core.Settings; +using Microsoft.Extensions.Configuration; namespace Bit.Seeder.Settings;