Merge branch 'ac/pm-12490/create-organization-enable-command' of http…

…s://github.com/bitwarden/server into ac/pm-12490/create-organization-enable-command
bitwarden · Jan 24, 2025 · d3b751a · d3b751a
2 parents 36dedcb + e380aec
commit d3b751a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 49 deletions.
diff --git a/dev/migrate.ps1 b/dev/migrate.ps1
@@ -7,13 +7,11 @@ param(
   [switch]$mysql,
   [switch]$mssql,
   [switch]$sqlite,
-  [switch]$selfhost,
-  [switch]$test
+  [switch]$selfhost
 )
 
 # Abort on any error
 $ErrorActionPreference = "Stop"
-$currentDir = Get-Location
 
 if (!$all -and !$postgres -and !$mysql -and !$sqlite) {
   $mssql = $true;
@@ -27,62 +25,36 @@ if ($all -or $postgres -or $mysql -or $sqlite) {
   }
 }
 
-function Get-UserSecrets {
-  # The dotnet cli command sometimes adds //BEGIN and //END comments to the output, Where-Object removes comments
-  # to ensure a valid json
-  return dotnet user-secrets list --json --project "$currentDir/../src/Api" | Where-Object { $_ -notmatch "^//" } | ConvertFrom-Json
-}
-
 if ($all -or $mssql) {
-  if ($all -or !$test) {
-    if ($selfhost) {
-      $msSqlConnectionString = $(Get-UserSecrets).'dev:selfHostOverride:globalSettings:sqlServer:connectionString'
-      $envName = "self-host"
-    } else {
-      $msSqlConnectionString = $(Get-UserSecrets).'globalSettings:sqlServer:connectionString'
-      $envName = "cloud"
-    }
-
-    Write-Host "Starting Microsoft SQL Server Migrations for $envName"
-    dotnet run --project ../util/MsSqlMigratorUtility/ "$msSqlConnectionString"
+  function Get-UserSecrets {
+    # The dotnet cli command sometimes adds //BEGIN and //END comments to the output, Where-Object removes comments
+    # to ensure a valid json
+    return dotnet user-secrets list --json --project ../src/Api | Where-Object { $_ -notmatch "^//" } | ConvertFrom-Json
   }
 
-  if ($all -or $test) {
-    $testMsSqlConnectionString = $(Get-UserSecrets).'databases:3:connectionString'
-    if ($testMsSqlConnectionString) {
-      $testEnvName = "test databases"
-      Write-Host "Starting Microsoft SQL Server Migrations for $testEnvName"
-      dotnet run --project ../util/MsSqlMigratorUtility/ "$testMsSqlConnectionString"
-    } else {
-      Write-Host "Connection string for a test MSSQL database not found in secrets.json!"
-    }
+  if ($selfhost) {
+    $msSqlConnectionString = $(Get-UserSecrets).'dev:selfHostOverride:globalSettings:sqlServer:connectionString'
+    $envName = "self-host"
+  } else {
+    $msSqlConnectionString = $(Get-UserSecrets).'globalSettings:sqlServer:connectionString'
+    $envName = "cloud"
   }
+
+  Write-Host "Starting Microsoft SQL Server Migrations for $envName"
+
+  dotnet run --project ../util/MsSqlMigratorUtility/ "$msSqlConnectionString"
 }
 
-Foreach ($item in @(
-    @($mysql, "MySQL", "MySqlMigrations", "mySql", 2),
-    @($postgres, "PostgreSQL", "PostgresMigrations", "postgreSql", 0),
-    @($sqlite, "SQLite", "SqliteMigrations", "sqlite", 1)
-)) {
+$currentDir = Get-Location
+
+Foreach ($item in @(@($mysql, "MySQL", "MySqlMigrations"), @($postgres, "PostgreSQL", "PostgresMigrations"), @($sqlite, "SQLite", "SqliteMigrations"))) {
   if (!$item[0] -and !$all) {
     continue
   }
 
+  Write-Host "Starting $($item[1]) Migrations"
   Set-Location "$currentDir/../util/$($item[2])/"
-  if(!$test -or $all) {
-    Write-Host "Starting $($item[1]) Migrations"
-    $connectionString = $(Get-UserSecrets)."globalSettings:$($item[3]):connectionString"
-    dotnet ef database update --connection "$connectionString"
-  }
-  if ($test -or $all) {
-    $testConnectionString = $(Get-UserSecrets)."databases:$($item[4]):connectionString"
-    if ($testConnectionString) {
-      Write-Host "Starting $($item[1]) Migrations for test databases"
-      dotnet ef database update --connection "$testConnectionString"
-    } else {
-      Write-Host "Connection string for a test $($item[1]) database not found in secrets.json!"
-    }
-  }
+  dotnet ef database update
 }
 
 Set-Location "$currentDir"
diff --git a/dev/secrets.json.example b/dev/secrets.json.example
@@ -21,7 +21,7 @@
       "connectionString": "server=localhost;uid=root;pwd=SET_A_PASSWORD_HERE_123;database=vault_dev"
     },
     "sqlite": {
-      "connectionString": "Data Source=/path/to/bitwardenServer/repository/server/dev/db/bitwarden.db"
+      "connectionString": "Data Source=/path/to/bitwardenServer/repository/server/dev/db/bitwarden.sqlite"
     },
     "identityServer": {
       "certificateThumbprint": "<your Identity certificate thumbprint with no spaces>"

diff --git a/src/Billing/Services/Implementations/SubscriptionUpdatedHandler.cs b/src/Billing/Services/Implementations/SubscriptionUpdatedHandler.cs
@@ -2,6 +2,7 @@
 using Bit.Core.AdminConsole.OrganizationFeatures.Organizations.Interfaces;
 using Bit.Billing.Jobs;
 using Bit.Core;
+using Bit.Core.AdminConsole.OrganizationFeatures.Organizations.Interfaces;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Platform.Push;
 using Bit.Core.Repositories;