[PM-18555] Main part of notifications refactor (#5757)

* More tests * More tests * Add non-guid tests * Introduce slimmer services * Implement IPushEngine on services * Implement IPushEngine * Fix tests * Format * Switch to `Guid` on `PushSendRequestModel` * Remove TODOs
2025-06-30 15:42:48 -05:00 · 2025-06-17 13:30:56 -04:00
parent 6dc26f4be6
commit 6800bc57f3
23 changed files with 1271 additions and 2408 deletions
--- a/test/Core.Test/Models/Api/Request/PushSendRequestModelTests.cs
+++ b/test/Core.Test/Models/Api/Request/PushSendRequestModelTests.cs
@ -11,16 +11,14 @@ namespace Bit.Core.Test.Models.Api.Request;

 public class PushSendRequestModelTests
 {
-    [Theory]
-    [RepeatingPatternBitAutoData([null, "", " "], [null, "", " "], [null, "", " "])]
-    public void Validate_UserIdOrganizationIdInstallationIdNullOrEmpty_Invalid(string? userId, string? organizationId,
-        string? installationId)
+    [Fact]
+    public void Validate_UserIdOrganizationIdInstallationIdNull_Invalid()
    {
-        var model = new PushSendRequestModel
+        var model = new PushSendRequestModel<string>
        {
-            UserId = userId,
-            OrganizationId = organizationId,
-            InstallationId = installationId,
+            UserId = null,
+            OrganizationId = null,
+            InstallationId = null,
            Type = PushType.SyncCiphers,
            Payload = "test"
        };
@ -32,16 +30,14 @@ public class PushSendRequestModelTests
            result => result.ErrorMessage == "UserId or OrganizationId or InstallationId is required.");
    }

-    [Theory]
-    [RepeatingPatternBitAutoData([null, "", " "], [null, "", " "])]
-    public void Validate_UserIdProvidedOrganizationIdInstallationIdNullOrEmpty_Valid(string? organizationId,
-        string? installationId)
+    [Fact]
+    public void Validate_UserIdProvidedOrganizationIdInstallationIdNull_Valid()
    {
-        var model = new PushSendRequestModel
+        var model = new PushSendRequestModel<string>
        {
-            UserId = Guid.NewGuid().ToString(),
-            OrganizationId = organizationId,
-            InstallationId = installationId,
+            UserId = Guid.NewGuid(),
+            OrganizationId = null,
+            InstallationId = null,
            Type = PushType.SyncCiphers,
            Payload = "test"
        };
@ -51,16 +47,14 @@ public class PushSendRequestModelTests
        Assert.Empty(results);
    }

-    [Theory]
-    [RepeatingPatternBitAutoData([null, "", " "], [null, "", " "])]
-    public void Validate_OrganizationIdProvidedUserIdInstallationIdNullOrEmpty_Valid(string? userId,
-        string? installationId)
+    [Fact]
+    public void Validate_OrganizationIdProvidedUserIdInstallationIdNull_Valid()
    {
-        var model = new PushSendRequestModel
+        var model = new PushSendRequestModel<string>
        {
-            UserId = userId,
-            OrganizationId = Guid.NewGuid().ToString(),
-            InstallationId = installationId,
+            UserId = null,
+            OrganizationId = Guid.NewGuid(),
+            InstallationId = null,
            Type = PushType.SyncCiphers,
            Payload = "test"
        };
@ -70,16 +64,14 @@ public class PushSendRequestModelTests
        Assert.Empty(results);
    }

-    [Theory]
-    [RepeatingPatternBitAutoData([null, "", " "], [null, "", " "])]
-    public void Validate_InstallationIdProvidedUserIdOrganizationIdNullOrEmpty_Valid(string? userId,
-        string? organizationId)
+    [Fact]
+    public void Validate_InstallationIdProvidedUserIdOrganizationIdNull_Valid()
    {
-        var model = new PushSendRequestModel
+        var model = new PushSendRequestModel<string>
        {
-            UserId = userId,
-            OrganizationId = organizationId,
-            InstallationId = Guid.NewGuid().ToString(),
+            UserId = null,
+            OrganizationId = null,
+            InstallationId = Guid.NewGuid(),
            Type = PushType.SyncCiphers,
            Payload = "test"
        };
@ -94,10 +86,10 @@ public class PushSendRequestModelTests
    [BitAutoData("Type")]
    public void Validate_RequiredFieldNotProvided_Invalid(string requiredField)
    {
-        var model = new PushSendRequestModel
+        var model = new PushSendRequestModel<string>
        {
-            UserId = Guid.NewGuid().ToString(),
-            OrganizationId = Guid.NewGuid().ToString(),
+            UserId = Guid.NewGuid(),
+            OrganizationId = Guid.NewGuid(),
            Type = PushType.SyncCiphers,
            Payload = "test"
        };
@ -115,7 +107,7 @@ public class PushSendRequestModelTests

        var serialized = JsonSerializer.Serialize(dictionary, JsonHelpers.IgnoreWritingNull);
        var jsonException =
-            Assert.Throws<JsonException>(() => JsonSerializer.Deserialize<PushSendRequestModel>(serialized));
+            Assert.Throws<JsonException>(() => JsonSerializer.Deserialize<PushSendRequestModel<string>>(serialized));
        Assert.Contains($"missing required properties, including the following: {requiredField}",
            jsonException.Message);
    }
@ -123,15 +115,15 @@ public class PushSendRequestModelTests
    [Fact]
    public void Validate_AllFieldsPresent_Valid()
    {
-        var model = new PushSendRequestModel
+        var model = new PushSendRequestModel<string>
        {
-            UserId = Guid.NewGuid().ToString(),
-            OrganizationId = Guid.NewGuid().ToString(),
+            UserId = Guid.NewGuid(),
+            OrganizationId = Guid.NewGuid(),
            Type = PushType.SyncCiphers,
            Payload = "test payload",
            Identifier = Guid.NewGuid().ToString(),
            ClientType = ClientType.All,
-            DeviceId = Guid.NewGuid().ToString()
+            DeviceId = Guid.NewGuid()
        };

        var results = Validate(model);
@ -139,7 +131,7 @@ public class PushSendRequestModelTests
        Assert.Empty(results);
    }

-    private static List<ValidationResult> Validate(PushSendRequestModel model)
+    private static List<ValidationResult> Validate<T>(PushSendRequestModel<T> model)
    {
        var results = new List<ValidationResult>();
        Validator.TryValidateObject(model, new ValidationContext(model), results, true);
--- a/test/Core.Test/NotificationHub/NotificationHubPushNotificationServiceTests.cs
+++ b/test/Core.Test/NotificationHub/NotificationHubPushNotificationServiceTests.cs
@ -5,12 +5,11 @@ using Bit.Core.Auth.Entities;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Models;
-using Bit.Core.Models.Data;
 using Bit.Core.NotificationCenter.Entities;
 using Bit.Core.NotificationCenter.Enums;
 using Bit.Core.NotificationHub;
+using Bit.Core.Platform.Push;
 using Bit.Core.Repositories;
-using Bit.Core.Settings;
 using Bit.Core.Test.NotificationCenter.AutoFixture;
 using Bit.Core.Tools.Entities;
 using Bit.Core.Vault.Entities;
@ -33,483 +32,6 @@ public class NotificationHubPushNotificationServiceTests
    private static readonly DateTime _now = DateTime.UtcNow;
    private static readonly Guid _installationId = Guid.Parse("da73177b-513f-4444-b582-595c890e1022");

-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize]
-    public async Task PushNotificationAsync_GlobalInstallationIdDefault_NotSent(
-        SutProvider<NotificationHubPushNotificationService> sutProvider, Notification notification)
-    {
-        sutProvider.GetDependency<IGlobalSettings>().Installation.Id = default;
-
-        await sutProvider.Sut.PushNotificationAsync(notification);
-
-        await sutProvider.GetDependency<INotificationHubPool>()
-            .Received(0)
-            .AllClients
-            .Received(0)
-            .SendTemplateNotificationAsync(Arg.Any<IDictionary<string, string>>(), Arg.Any<string>());
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize]
-    public async Task PushNotificationAsync_GlobalInstallationIdSetClientTypeAll_SentToInstallationId(
-        SutProvider<NotificationHubPushNotificationService> sutProvider, Notification notification, Guid installationId)
-    {
-        sutProvider.GetDependency<IGlobalSettings>().Installation.Id = installationId;
-        notification.ClientType = ClientType.All;
-        var expectedNotification = ToNotificationPushNotification(notification, null, installationId);
-
-        await sutProvider.Sut.PushNotificationAsync(notification);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification,
-            expectedNotification,
-            $"(template:payload && installationId:{installationId})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(ClientType.Browser)]
-    [BitAutoData(ClientType.Desktop)]
-    [BitAutoData(ClientType.Web)]
-    [BitAutoData(ClientType.Mobile)]
-    [NotificationCustomize]
-    public async Task PushNotificationAsync_GlobalInstallationIdSetClientTypeNotAll_SentToInstallationIdAndClientType(
-        ClientType clientType, SutProvider<NotificationHubPushNotificationService> sutProvider,
-        Notification notification, Guid installationId)
-    {
-        sutProvider.GetDependency<IGlobalSettings>().Installation.Id = installationId;
-        notification.ClientType = clientType;
-        var expectedNotification = ToNotificationPushNotification(notification, null, installationId);
-
-        await sutProvider.Sut.PushNotificationAsync(notification);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification,
-            expectedNotification,
-            $"(template:payload && installationId:{installationId} && clientType:{clientType})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(false)]
-    [BitAutoData(true)]
-    [NotificationCustomize(false)]
-    public async Task PushNotificationAsync_UserIdProvidedClientTypeAll_SentToUser(
-        bool organizationIdNull, SutProvider<NotificationHubPushNotificationService> sutProvider,
-        Notification notification)
-    {
-        if (organizationIdNull)
-        {
-            notification.OrganizationId = null;
-        }
-
-        notification.ClientType = ClientType.All;
-        var expectedNotification = ToNotificationPushNotification(notification, null, null);
-
-        await sutProvider.Sut.PushNotificationAsync(notification);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification,
-            expectedNotification,
-            $"(template:payload_userId:{notification.UserId})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(ClientType.Browser)]
-    [BitAutoData(ClientType.Desktop)]
-    [BitAutoData(ClientType.Web)]
-    [BitAutoData(ClientType.Mobile)]
-    [NotificationCustomize(false)]
-    public async Task PushNotificationAsync_UserIdProvidedOrganizationIdNullClientTypeNotAll_SentToUser(
-        ClientType clientType, SutProvider<NotificationHubPushNotificationService> sutProvider,
-        Notification notification)
-    {
-        notification.OrganizationId = null;
-        notification.ClientType = clientType;
-        var expectedNotification = ToNotificationPushNotification(notification, null, null);
-
-        await sutProvider.Sut.PushNotificationAsync(notification);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification,
-            expectedNotification,
-            $"(template:payload_userId:{notification.UserId} && clientType:{clientType})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(ClientType.Browser)]
-    [BitAutoData(ClientType.Desktop)]
-    [BitAutoData(ClientType.Web)]
-    [BitAutoData(ClientType.Mobile)]
-    [NotificationCustomize(false)]
-    public async Task PushNotificationAsync_UserIdProvidedOrganizationIdProvidedClientTypeNotAll_SentToUser(
-        ClientType clientType, SutProvider<NotificationHubPushNotificationService> sutProvider,
-        Notification notification)
-    {
-        notification.ClientType = clientType;
-        var expectedNotification = ToNotificationPushNotification(notification, null, null);
-
-        await sutProvider.Sut.PushNotificationAsync(notification);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification,
-            expectedNotification,
-            $"(template:payload_userId:{notification.UserId} && clientType:{clientType})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize(false)]
-    public async Task PushNotificationAsync_UserIdNullOrganizationIdProvidedClientTypeAll_SentToOrganization(
-        SutProvider<NotificationHubPushNotificationService> sutProvider, Notification notification)
-    {
-        notification.UserId = null;
-        notification.ClientType = ClientType.All;
-        var expectedNotification = ToNotificationPushNotification(notification, null, null);
-
-        await sutProvider.Sut.PushNotificationAsync(notification);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification,
-            expectedNotification,
-            $"(template:payload && organizationId:{notification.OrganizationId})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(ClientType.Browser)]
-    [BitAutoData(ClientType.Desktop)]
-    [BitAutoData(ClientType.Web)]
-    [BitAutoData(ClientType.Mobile)]
-    [NotificationCustomize(false)]
-    public async Task PushNotificationAsync_UserIdNullOrganizationIdProvidedClientTypeNotAll_SentToOrganization(
-        ClientType clientType, SutProvider<NotificationHubPushNotificationService> sutProvider,
-        Notification notification)
-    {
-        notification.UserId = null;
-        notification.ClientType = clientType;
-        var expectedNotification = ToNotificationPushNotification(notification, null, null);
-
-        await sutProvider.Sut.PushNotificationAsync(notification);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification,
-            expectedNotification,
-            $"(template:payload && organizationId:{notification.OrganizationId} && clientType:{clientType})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize]
-    public async Task PushNotificationStatusAsync_GlobalInstallationIdDefault_NotSent(
-        SutProvider<NotificationHubPushNotificationService> sutProvider, Notification notification,
-        NotificationStatus notificationStatus)
-    {
-        sutProvider.GetDependency<IGlobalSettings>().Installation.Id = default;
-
-        await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus);
-
-        await sutProvider.GetDependency<INotificationHubPool>()
-            .Received(0)
-            .AllClients
-            .Received(0)
-            .SendTemplateNotificationAsync(Arg.Any<IDictionary<string, string>>(), Arg.Any<string>());
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize]
-    public async Task PushNotificationStatusAsync_GlobalInstallationIdSetClientTypeAll_SentToInstallationId(
-        SutProvider<NotificationHubPushNotificationService> sutProvider,
-        Notification notification, NotificationStatus notificationStatus, Guid installationId)
-    {
-        sutProvider.GetDependency<IGlobalSettings>().Installation.Id = installationId;
-        notification.ClientType = ClientType.All;
-
-        var expectedNotification = ToNotificationPushNotification(notification, notificationStatus, installationId);
-
-        await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus,
-            expectedNotification,
-            $"(template:payload && installationId:{installationId})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(ClientType.Browser)]
-    [BitAutoData(ClientType.Desktop)]
-    [BitAutoData(ClientType.Web)]
-    [BitAutoData(ClientType.Mobile)]
-    [NotificationCustomize]
-    public async Task
-        PushNotificationStatusAsync_GlobalInstallationIdSetClientTypeNotAll_SentToInstallationIdAndClientType(
-            ClientType clientType, SutProvider<NotificationHubPushNotificationService> sutProvider,
-            Notification notification, NotificationStatus notificationStatus, Guid installationId)
-    {
-        sutProvider.GetDependency<IGlobalSettings>().Installation.Id = installationId;
-        notification.ClientType = clientType;
-
-        var expectedNotification = ToNotificationPushNotification(notification, notificationStatus, installationId);
-
-        await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus,
-            expectedNotification,
-            $"(template:payload && installationId:{installationId} && clientType:{clientType})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(false)]
-    [BitAutoData(true)]
-    [NotificationCustomize(false)]
-    public async Task PushNotificationStatusAsync_UserIdProvidedClientTypeAll_SentToUser(
-        bool organizationIdNull, SutProvider<NotificationHubPushNotificationService> sutProvider,
-        Notification notification, NotificationStatus notificationStatus)
-    {
-        if (organizationIdNull)
-        {
-            notification.OrganizationId = null;
-        }
-
-        notification.ClientType = ClientType.All;
-        var expectedNotification = ToNotificationPushNotification(notification, notificationStatus, null);
-
-        await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus,
-            expectedNotification,
-            $"(template:payload_userId:{notification.UserId})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(ClientType.Browser)]
-    [BitAutoData(ClientType.Desktop)]
-    [BitAutoData(ClientType.Web)]
-    [BitAutoData(ClientType.Mobile)]
-    [NotificationCustomize(false)]
-    public async Task PushNotificationStatusAsync_UserIdProvidedOrganizationIdNullClientTypeNotAll_SentToUser(
-        ClientType clientType, SutProvider<NotificationHubPushNotificationService> sutProvider,
-        Notification notification, NotificationStatus notificationStatus)
-    {
-        notification.OrganizationId = null;
-        notification.ClientType = clientType;
-        var expectedNotification = ToNotificationPushNotification(notification, notificationStatus, null);
-
-        await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus,
-            expectedNotification,
-            $"(template:payload_userId:{notification.UserId} && clientType:{clientType})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(ClientType.Browser)]
-    [BitAutoData(ClientType.Desktop)]
-    [BitAutoData(ClientType.Web)]
-    [BitAutoData(ClientType.Mobile)]
-    [NotificationCustomize(false)]
-    public async Task PushNotificationStatusAsync_UserIdProvidedOrganizationIdProvidedClientTypeNotAll_SentToUser(
-        ClientType clientType, SutProvider<NotificationHubPushNotificationService> sutProvider,
-        Notification notification, NotificationStatus notificationStatus)
-    {
-        notification.ClientType = clientType;
-        var expectedNotification = ToNotificationPushNotification(notification, notificationStatus, null);
-
-        await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus,
-            expectedNotification,
-            $"(template:payload_userId:{notification.UserId} && clientType:{clientType})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize(false)]
-    public async Task PushNotificationStatusAsync_UserIdNullOrganizationIdProvidedClientTypeAll_SentToOrganization(
-        SutProvider<NotificationHubPushNotificationService> sutProvider, Notification notification,
-        NotificationStatus notificationStatus)
-    {
-        notification.UserId = null;
-        notification.ClientType = ClientType.All;
-        var expectedNotification = ToNotificationPushNotification(notification, notificationStatus, null);
-
-        await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus,
-            expectedNotification,
-            $"(template:payload && organizationId:{notification.OrganizationId})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(ClientType.Browser)]
-    [BitAutoData(ClientType.Desktop)]
-    [BitAutoData(ClientType.Web)]
-    [BitAutoData(ClientType.Mobile)]
-    [NotificationCustomize(false)]
-    public async Task
-        PushNotificationStatusAsync_UserIdNullOrganizationIdProvidedClientTypeNotAll_SentToOrganization(
-            ClientType clientType, SutProvider<NotificationHubPushNotificationService> sutProvider,
-            Notification notification, NotificationStatus notificationStatus)
-    {
-        notification.UserId = null;
-        notification.ClientType = clientType;
-        var expectedNotification = ToNotificationPushNotification(notification, notificationStatus, null);
-
-        await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus,
-            expectedNotification,
-            $"(template:payload && organizationId:{notification.OrganizationId} && clientType:{clientType})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData([null])]
-    [BitAutoData(ClientType.All)]
-    public async Task SendPayloadToUserAsync_ClientTypeNullOrAll_SentToUser(ClientType? clientType,
-        SutProvider<NotificationHubPushNotificationService> sutProvider, Guid userId, PushType pushType, string payload,
-        string identifier)
-    {
-        await sutProvider.Sut.SendPayloadToUserAsync(userId.ToString(), pushType, payload, identifier, null,
-            clientType);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, pushType, payload,
-            $"(template:payload_userId:{userId} && !deviceIdentifier:{identifier})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(ClientType.Browser)]
-    [BitAutoData(ClientType.Desktop)]
-    [BitAutoData(ClientType.Mobile)]
-    [BitAutoData(ClientType.Web)]
-    public async Task SendPayloadToUserAsync_ClientTypeExplicit_SentToUserAndClientType(ClientType clientType,
-        SutProvider<NotificationHubPushNotificationService> sutProvider, Guid userId, PushType pushType, string payload,
-        string identifier)
-    {
-        await sutProvider.Sut.SendPayloadToUserAsync(userId.ToString(), pushType, payload, identifier, null,
-            clientType);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, pushType, payload,
-            $"(template:payload_userId:{userId} && !deviceIdentifier:{identifier} && clientType:{clientType})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData([null])]
-    [BitAutoData(ClientType.All)]
-    public async Task SendPayloadToOrganizationAsync_ClientTypeNullOrAll_SentToOrganization(ClientType? clientType,
-        SutProvider<NotificationHubPushNotificationService> sutProvider, Guid organizationId, PushType pushType,
-        string payload, string identifier)
-    {
-        await sutProvider.Sut.SendPayloadToOrganizationAsync(organizationId.ToString(), pushType, payload, identifier,
-            null, clientType);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, pushType, payload,
-            $"(template:payload && organizationId:{organizationId} && !deviceIdentifier:{identifier})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(ClientType.Browser)]
-    [BitAutoData(ClientType.Desktop)]
-    [BitAutoData(ClientType.Mobile)]
-    [BitAutoData(ClientType.Web)]
-    public async Task SendPayloadToOrganizationAsync_ClientTypeExplicit_SentToOrganizationAndClientType(
-        ClientType clientType, SutProvider<NotificationHubPushNotificationService> sutProvider, Guid organizationId,
-        PushType pushType, string payload, string identifier)
-    {
-        await sutProvider.Sut.SendPayloadToOrganizationAsync(organizationId.ToString(), pushType, payload, identifier,
-            null, clientType);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, pushType, payload,
-            $"(template:payload && organizationId:{organizationId} && !deviceIdentifier:{identifier} && clientType:{clientType})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData([null])]
-    [BitAutoData(ClientType.All)]
-    public async Task SendPayloadToInstallationAsync_ClientTypeNullOrAll_SentToInstallation(ClientType? clientType,
-        SutProvider<NotificationHubPushNotificationService> sutProvider, Guid installationId, PushType pushType,
-        string payload, string identifier)
-    {
-        await sutProvider.Sut.SendPayloadToInstallationAsync(installationId.ToString(), pushType, payload, identifier,
-            null, clientType);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, pushType, payload,
-            $"(template:payload && installationId:{installationId} && !deviceIdentifier:{identifier})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
-    [Theory]
-    [BitAutoData(ClientType.Browser)]
-    [BitAutoData(ClientType.Desktop)]
-    [BitAutoData(ClientType.Mobile)]
-    [BitAutoData(ClientType.Web)]
-    public async Task SendPayloadToInstallationAsync_ClientTypeExplicit_SentToInstallationAndClientType(
-        ClientType clientType, SutProvider<NotificationHubPushNotificationService> sutProvider, Guid installationId,
-        PushType pushType, string payload, string identifier)
-    {
-        await sutProvider.Sut.SendPayloadToInstallationAsync(installationId.ToString(), pushType, payload, identifier,
-            null, clientType);
-
-        await AssertSendTemplateNotificationAsync(sutProvider, pushType, payload,
-            $"(template:payload && installationId:{installationId} && !deviceIdentifier:{identifier} && clientType:{clientType})");
-        await sutProvider.GetDependency<IInstallationDeviceRepository>()
-            .Received(0)
-            .UpsertAsync(Arg.Any<InstallationDeviceEntity>());
-    }
-
    [Fact]
    public async Task PushSyncCipherCreateAsync_SendExpectedData()
    {
@ -1066,7 +588,7 @@ public class NotificationHubPushNotificationServiceTests
        );
    }

-    private async Task VerifyNotificationAsync(Func<NotificationHubPushNotificationService, Task> test,
+    private async Task VerifyNotificationAsync(Func<IPushNotificationService, Task> test,
        PushType type, JsonNode expectedPayload, string tag)
    {
        var installationDeviceRepository = Substitute.For<IInstallationDeviceRepository>();
@ -1104,12 +626,11 @@ public class NotificationHubPushNotificationServiceTests
            notificationHubPool,
            httpContextAccessor,
            NullLogger<NotificationHubPushNotificationService>.Instance,
-            globalSettings,
-            fakeTimeProvider
+            globalSettings
        );

        // Act
-        await test(sut);
+        await test(new EngineWrapper(sut, fakeTimeProvider, _installationId));

        // Assert
        var calls = notificationHubProxy.ReceivedCalls();
--- a/test/Core.Test/Platform/Push/Services/AzureQueuePushNotificationServiceTests.cs
+++ b/test/Core.Test/Platform/Push/Services/AzureQueuePushNotificationServiceTests.cs
@ -9,14 +9,11 @@ using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.NotificationCenter.Entities;
 using Bit.Core.NotificationCenter.Enums;
+using Bit.Core.Platform.Push;
 using Bit.Core.Platform.Push.Internal;
-using Bit.Core.Settings;
 using Bit.Core.Test.AutoFixture;
-using Bit.Core.Test.AutoFixture.CurrentContextFixtures;
-using Bit.Core.Test.NotificationCenter.AutoFixture;
 using Bit.Core.Tools.Entities;
 using Bit.Core.Vault.Entities;
-using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
@ -42,96 +39,6 @@ public class AzureQueuePushNotificationServiceTests
        _fakeTimeProvider.SetUtcNow(DateTime.UtcNow);
    }

-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize]
-    [CurrentContextCustomize]
-    public async Task PushNotificationAsync_NotificationGlobal_Sent(
-        SutProvider<AzureQueuePushNotificationService> sutProvider, Notification notification, Guid deviceIdentifier,
-        ICurrentContext currentContext, Guid installationId)
-    {
-        currentContext.DeviceIdentifier.Returns(deviceIdentifier.ToString());
-        sutProvider.GetDependency<IHttpContextAccessor>().HttpContext!.RequestServices
-            .GetService(Arg.Any<Type>()).Returns(currentContext);
-        sutProvider.GetDependency<IGlobalSettings>().Installation.Id = installationId;
-
-        await sutProvider.Sut.PushNotificationAsync(notification);
-
-        await sutProvider.GetDependency<QueueClient>().Received(1)
-            .SendMessageAsync(Arg.Is<string>(message =>
-                MatchMessage(PushType.Notification, message,
-                    new NotificationPushNotificationEquals(notification, null, installationId),
-                    deviceIdentifier.ToString())));
-    }
-
-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize(false)]
-    [CurrentContextCustomize]
-    public async Task PushNotificationAsync_NotificationNotGlobal_Sent(
-        SutProvider<AzureQueuePushNotificationService> sutProvider, Notification notification, Guid deviceIdentifier,
-        ICurrentContext currentContext, Guid installationId)
-    {
-        currentContext.DeviceIdentifier.Returns(deviceIdentifier.ToString());
-        sutProvider.GetDependency<IHttpContextAccessor>().HttpContext!.RequestServices
-            .GetService(Arg.Any<Type>()).Returns(currentContext);
-        sutProvider.GetDependency<IGlobalSettings>().Installation.Id = installationId;
-
-        await sutProvider.Sut.PushNotificationAsync(notification);
-
-        await sutProvider.GetDependency<QueueClient>().Received(1)
-            .SendMessageAsync(Arg.Is<string>(message =>
-                MatchMessage(PushType.Notification, message,
-                    new NotificationPushNotificationEquals(notification, null, null),
-                    deviceIdentifier.ToString())));
-    }
-
-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize]
-    [NotificationStatusCustomize]
-    [CurrentContextCustomize]
-    public async Task PushNotificationStatusAsync_NotificationGlobal_Sent(
-        SutProvider<AzureQueuePushNotificationService> sutProvider, Notification notification, Guid deviceIdentifier,
-        ICurrentContext currentContext, NotificationStatus notificationStatus, Guid installationId)
-    {
-        currentContext.DeviceIdentifier.Returns(deviceIdentifier.ToString());
-        sutProvider.GetDependency<IHttpContextAccessor>().HttpContext!.RequestServices
-            .GetService(Arg.Any<Type>()).Returns(currentContext);
-        sutProvider.GetDependency<IGlobalSettings>().Installation.Id = installationId;
-
-        await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus);
-
-        await sutProvider.GetDependency<QueueClient>().Received(1)
-            .SendMessageAsync(Arg.Is<string>(message =>
-                MatchMessage(PushType.NotificationStatus, message,
-                    new NotificationPushNotificationEquals(notification, notificationStatus, installationId),
-                    deviceIdentifier.ToString())));
-    }
-
-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize(false)]
-    [NotificationStatusCustomize]
-    [CurrentContextCustomize]
-    public async Task PushNotificationStatusAsync_NotificationNotGlobal_Sent(
-        SutProvider<AzureQueuePushNotificationService> sutProvider, Notification notification, Guid deviceIdentifier,
-        ICurrentContext currentContext, NotificationStatus notificationStatus, Guid installationId)
-    {
-        currentContext.DeviceIdentifier.Returns(deviceIdentifier.ToString());
-        sutProvider.GetDependency<IHttpContextAccessor>().HttpContext!.RequestServices
-            .GetService(Arg.Any<Type>()).Returns(currentContext);
-        sutProvider.GetDependency<IGlobalSettings>().Installation.Id = installationId;
-
-        await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus);
-
-        await sutProvider.GetDependency<QueueClient>().Received(1)
-            .SendMessageAsync(Arg.Is<string>(message =>
-                MatchMessage(PushType.NotificationStatus, message,
-                    new NotificationPushNotificationEquals(notification, notificationStatus, null),
-                    deviceIdentifier.ToString())));
-    }
-
    [Theory]
    [InlineData("6a5bbe1b-cf16-49a6-965f-5c2eac56a531", null)]
    [InlineData(null, "b9a3fcb4-2447-45c1-aad2-24de43c88c44")]
@ -844,7 +751,7 @@ public class AzureQueuePushNotificationServiceTests
    //     );
    // }

-    private async Task VerifyNotificationAsync(Func<AzureQueuePushNotificationService, Task> test, JsonNode expectedMessage)
+    private async Task VerifyNotificationAsync(Func<IPushNotificationService, Task> test, JsonNode expectedMessage)
    {
        var queueClient = Substitute.For<QueueClient>();

@ -872,7 +779,7 @@ public class AzureQueuePushNotificationServiceTests
            _fakeTimeProvider
        );

-        await test(sut);
+        await test(new EngineWrapper(sut, _fakeTimeProvider, _globalSettings.Installation.Id));

        // Hoist equality checker outside the expression so that we
        // can more easily place a breakpoint
--- a/test/Core.Test/Platform/Push/Services/MultiServicePushNotificationServiceTests.cs
+++ b/test/Core.Test/Platform/Push/Services/MultiServicePushNotificationServiceTests.cs
@ -1,98 +1,8 @@
 #nullable enable
-using Bit.Core.Enums;
-using Bit.Core.NotificationCenter.Entities;
-using Bit.Core.Platform.Push;
-using Bit.Core.Platform.Push.Internal;
-using Bit.Core.Test.NotificationCenter.AutoFixture;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using Xunit;

 namespace Bit.Core.Test.Platform.Push.Services;

-[SutProviderCustomize]
 public class MultiServicePushNotificationServiceTests
 {
-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize]
-    public async Task PushNotificationAsync_Notification_Sent(
-        SutProvider<MultiServicePushNotificationService> sutProvider, Notification notification)
-    {
-        await sutProvider.Sut.PushNotificationAsync(notification);
-
-        await sutProvider.GetDependency<IEnumerable<IPushNotificationService>>()
-            .First()
-            .Received(1)
-            .PushNotificationAsync(notification);
-    }
-
-    [Theory]
-    [BitAutoData]
-    [NotificationCustomize]
-    [NotificationStatusCustomize]
-    public async Task PushNotificationStatusAsync_Notification_Sent(
-        SutProvider<MultiServicePushNotificationService> sutProvider, Notification notification,
-        NotificationStatus notificationStatus)
-    {
-        await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus);
-
-        await sutProvider.GetDependency<IEnumerable<IPushNotificationService>>()
-            .First()
-            .Received(1)
-            .PushNotificationStatusAsync(notification, notificationStatus);
-    }
-
-    [Theory]
-    [BitAutoData([null, null])]
-    [BitAutoData(ClientType.All, null)]
-    [BitAutoData([null, "test device id"])]
-    [BitAutoData(ClientType.All, "test device id")]
-    public async Task SendPayloadToUserAsync_Message_Sent(ClientType? clientType, string? deviceId, string userId,
-        PushType type, object payload, string identifier, SutProvider<MultiServicePushNotificationService> sutProvider)
-    {
-        await sutProvider.Sut.SendPayloadToUserAsync(userId, type, payload, identifier, deviceId, clientType);
-
-        await sutProvider.GetDependency<IEnumerable<IPushNotificationService>>()
-            .First()
-            .Received(1)
-            .SendPayloadToUserAsync(userId, type, payload, identifier, deviceId, clientType);
-    }
-
-    [Theory]
-    [BitAutoData([null, null])]
-    [BitAutoData(ClientType.All, null)]
-    [BitAutoData([null, "test device id"])]
-    [BitAutoData(ClientType.All, "test device id")]
-    public async Task SendPayloadToOrganizationAsync_Message_Sent(ClientType? clientType, string? deviceId,
-        string organizationId, PushType type, object payload, string identifier,
-        SutProvider<MultiServicePushNotificationService> sutProvider)
-    {
-        await sutProvider.Sut.SendPayloadToOrganizationAsync(organizationId, type, payload, identifier, deviceId,
-            clientType);
-
-        await sutProvider.GetDependency<IEnumerable<IPushNotificationService>>()
-            .First()
-            .Received(1)
-            .SendPayloadToOrganizationAsync(organizationId, type, payload, identifier, deviceId, clientType);
-    }
-
-    [Theory]
-    [BitAutoData([null, null])]
-    [BitAutoData(ClientType.All, null)]
-    [BitAutoData([null, "test device id"])]
-    [BitAutoData(ClientType.All, "test device id")]
-    public async Task SendPayloadToInstallationAsync_Message_Sent(ClientType? clientType, string? deviceId,
-        string installationId, PushType type, object payload, string identifier,
-        SutProvider<MultiServicePushNotificationService> sutProvider)
-    {
-        await sutProvider.Sut.SendPayloadToInstallationAsync(installationId, type, payload, identifier, deviceId,
-            clientType);
-
-        await sutProvider.GetDependency<IEnumerable<IPushNotificationService>>()
-            .First()
-            .Received(1)
-            .SendPayloadToInstallationAsync(installationId, type, payload, identifier, deviceId, clientType);
-    }
+    // TODO: Can add a couple tests here
 }
--- a/test/Core.Test/Platform/Push/Services/NotificationsApiPushNotificationServiceTests.cs
+++ b/test/Core.Test/Platform/Push/Services/NotificationsApiPushNotificationServiceTests.cs
@ -19,14 +19,13 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase

    protected override string ExpectedClientUrl() => "https://localhost:7777/send";

-    protected override IPushNotificationService CreateService()
+    protected override IPushEngine CreateService()
    {
        return new NotificationsApiPushNotificationService(
            HttpClientFactory,
            GlobalSettings,
            HttpContextAccessor,
-            NullLogger<NotificationsApiPushNotificationService>.Instance,
-            FakeTimeProvider
+            NullLogger<NotificationsApiPushNotificationService>.Instance
        );
    }

@ -221,7 +220,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
                ["UserId"] = send.UserId,
                ["RevisionDate"] = send.RevisionDate,
            },
-            ["ContextId"] = null,
+            ["ContextId"] = DeviceIdentifier,
        };
    }

@ -236,7 +235,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
                ["UserId"] = send.UserId,
                ["RevisionDate"] = send.RevisionDate,
            },
-            ["ContextId"] = null,
+            ["ContextId"] = DeviceIdentifier,
        };
    }

@ -251,7 +250,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
                ["UserId"] = send.UserId,
                ["RevisionDate"] = send.RevisionDate,
            },
-            ["ContextId"] = null,
+            ["ContextId"] = DeviceIdentifier,
        };
    }

--- a/test/Core.Test/Platform/Push/Services/PushTestBase.cs
+++ b/test/Core.Test/Platform/Push/Services/PushTestBase.cs
@ -15,11 +15,28 @@ using Bit.Core.Tools.Entities;
 using Bit.Core.Vault.Entities;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Time.Testing;
 using NSubstitute;
 using RichardSzalay.MockHttp;
 using Xunit;

+public class EngineWrapper(IPushEngine pushEngine, FakeTimeProvider fakeTimeProvider, Guid installationId) : IPushNotificationService
+{
+    public Guid InstallationId { get; } = installationId;
+
+    public TimeProvider TimeProvider { get; } = fakeTimeProvider;
+
+    public ILogger Logger => NullLogger<EngineWrapper>.Instance;
+
+    public Task PushAsync<T>(PushNotification<T> pushNotification) where T : class
+        => pushEngine.PushAsync(pushNotification);
+
+    public Task PushCipherAsync(Cipher cipher, PushType pushType, IEnumerable<Guid>? collectionIds)
+        => pushEngine.PushCipherAsync(cipher, pushType, collectionIds);
+}
+
 public abstract class PushTestBase
 {
    protected static readonly string DeviceIdentifier = "test_device_identifier";
@ -51,7 +68,7 @@ public abstract class PushTestBase
        FakeTimeProvider.SetUtcNow(DateTimeOffset.UtcNow);
    }

-    protected abstract IPushNotificationService CreateService();
+    protected abstract IPushEngine CreateService();

    protected abstract string ExpectedClientUrl();

@ -480,7 +497,7 @@ public abstract class PushTestBase
            })
            .Respond(HttpStatusCode.OK);

-        await test(CreateService());
+        await test(new EngineWrapper(CreateService(), FakeTimeProvider, GlobalSettings.Installation.Id));

        Assert.NotNull(actualNode);

--- a/test/Core.Test/Platform/Push/Services/RelayPushNotificationServiceTests.cs
+++ b/test/Core.Test/Platform/Push/Services/RelayPushNotificationServiceTests.cs
@ -4,8 +4,8 @@ using System.Text.Json.Nodes;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.NotificationCenter.Entities;
+using Bit.Core.Platform.Push;
 using Bit.Core.Platform.Push.Internal;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
@ -14,7 +14,6 @@ using Bit.Core.Vault.Entities;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Time.Testing;
 using NSubstitute;
-using Xunit;

 namespace Bit.Core.Test.Platform.Push.Services;

@ -38,47 +37,19 @@ public class RelayPushNotificationServiceTests : PushTestBase
        GlobalSettings.Installation.IdentityUri = "https://localhost:8888";
    }

-    protected override RelayPushNotificationService CreateService()
+    protected override IPushEngine CreateService()
    {
        return new RelayPushNotificationService(
            HttpClientFactory,
            _deviceRepository,
            GlobalSettings,
            HttpContextAccessor,
-            NullLogger<RelayPushNotificationService>.Instance,
-            FakeTimeProvider
+            NullLogger<RelayPushNotificationService>.Instance
        );
    }

    protected override string ExpectedClientUrl() => "https://localhost:7777/push/send";

-    [Fact]
-    public async Task SendPayloadToInstallationAsync_ThrowsNotImplementedException()
-    {
-        var sut = CreateService();
-        await Assert.ThrowsAsync<NotImplementedException>(
-            async () => await sut.SendPayloadToInstallationAsync("installation_id", PushType.AuthRequest, new { }, null)
-        );
-    }
-
-    [Fact]
-    public async Task SendPayloadToUserAsync_ThrowsNotImplementedException()
-    {
-        var sut = CreateService();
-        await Assert.ThrowsAsync<NotImplementedException>(
-            async () => await sut.SendPayloadToUserAsync("user_id", PushType.AuthRequest, new { }, null)
-        );
-    }
-
-    [Fact]
-    public async Task SendPayloadToOrganizationAsync_ThrowsNotImplementedException()
-    {
-        var sut = CreateService();
-        await Assert.ThrowsAsync<NotImplementedException>(
-            async () => await sut.SendPayloadToOrganizationAsync("organization_id", PushType.AuthRequest, new { }, null)
-        );
-    }
-
    protected override JsonNode GetPushSyncCipherCreatePayload(Cipher cipher, Guid collectionIds)
    {
        return new JsonObject