Merge branch 'SM-1571-DisableSMAdsForUsers' of https://github.com/bitwarden/server into SM-1571-DisableSMAdsForUsers

util/Migrator/DbScripts/2025-10-30_00_OrganizationReport_UpdateMetrics.sql

@@ -0,0 +1,39 @@
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_UpdateMetrics]
+    @Id UNIQUEIDENTIFIER,
+    @ApplicationCount INT,
+    @ApplicationAtRiskCount INT,
+    @CriticalApplicationCount INT,
+    @CriticalApplicationAtRiskCount INT,
+    @MemberCount INT,
+    @MemberAtRiskCount INT,
+    @CriticalMemberCount INT,
+    @CriticalMemberAtRiskCount INT,
+    @PasswordCount INT,
+    @PasswordAtRiskCount INT,
+    @CriticalPasswordCount INT,
+    @CriticalPasswordAtRiskCount INT,
+    @RevisionDate DATETIME2(7)
+AS
+BEGIN
+    SET NOCOUNT ON;
+
+    UPDATE 
+        [dbo].[OrganizationReport]
+    SET
+        [ApplicationCount] = @ApplicationCount,
+        [ApplicationAtRiskCount] = @ApplicationAtRiskCount,
+        [CriticalApplicationCount] = @CriticalApplicationCount,
+        [CriticalApplicationAtRiskCount] = @CriticalApplicationAtRiskCount,
+        [MemberCount] = @MemberCount,
+        [MemberAtRiskCount] = @MemberAtRiskCount,
+        [CriticalMemberCount] = @CriticalMemberCount,
+        [CriticalMemberAtRiskCount] = @CriticalMemberAtRiskCount,
+        [PasswordCount] = @PasswordCount,
+        [PasswordAtRiskCount] = @PasswordAtRiskCount,
+        [CriticalPasswordCount] = @CriticalPasswordCount,
+        [CriticalPasswordAtRiskCount] = @CriticalPasswordAtRiskCount,
+        [RevisionDate] = @RevisionDate
+    WHERE 
+        [Id] = @Id
+
+END

util/MsSql/backup-db.sql

@@ -2,6 +2,18 @@
 DECLARE @DatabaseName varchar(100)
 SET @DatabaseName = 'vault'
 
+-- Check if database is in FULL recovery and has never had a t-log backup
+IF EXISTS (
+    SELECT 1 FROM sys.databases
+    WHERE name = @DatabaseName AND recovery_model = 1  -- 1 = FULL
+) AND NOT EXISTS (
+    SELECT 1 FROM msdb.dbo.backupset
+    WHERE database_name = @DatabaseName AND type = 'L'  -- L = Transaction Log
+)
+BEGIN   
+    EXEC('ALTER DATABASE [' + @DatabaseName + '] SET RECOVERY SIMPLE')
+END
+
 -- Database name without spaces for saving the backup files.
 DECLARE @DatabaseNameSafe varchar(100)
 SET @DatabaseNameSafe = 'vault'