From c04573932514a0c6fc947c4c9332e7071bf941b4 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kspearrin@users.noreply.github.com>
Date: Thu, 2 May 2024 16:37:06 -0400
Subject: [PATCH] [PM-6977] Migrate to FCM v1 (redo) (#4046)

* revert changes again

* use IServiceProvider

* fix test
---
 src/Core/Constants.cs                         |  1 +
 .../NotificationHubPushRegistrationService.cs | 24 +++++++++++++++----
 ...ficationHubPushRegistrationServiceTests.cs |  3 +++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs
index 7b867b8dd..4a59d6e0d 100644
--- a/src/Core/Constants.cs
+++ b/src/Core/Constants.cs
@@ -135,6 +135,7 @@ public static class FeatureFlagKeys
     public const string UnassignedItemsBanner = "unassigned-items-banner";
     public const string EnableDeleteProvider = "AC-1218-delete-provider";
     public const string EmailVerification = "email-verification";
+    public const string AnhFcmv1Migration = "anh-fcmv1-migration";
 
     public static List<string> GetAllKeys()
     {
diff --git a/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs b/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs
index 9a31a2a87..87df60e8e 100644
--- a/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs
+++ b/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs
@@ -3,6 +3,7 @@ using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Microsoft.Azure.NotificationHubs;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace Bit.Core.Services;
@@ -11,16 +12,19 @@ public class NotificationHubPushRegistrationService : IPushRegistrationService
 {
     private readonly IInstallationDeviceRepository _installationDeviceRepository;
     private readonly GlobalSettings _globalSettings;
+    private readonly IServiceProvider _serviceProvider;
     private readonly ILogger<NotificationHubPushRegistrationService> _logger;
     private Dictionary<NotificationHubType, NotificationHubClient> _clients = [];
 
     public NotificationHubPushRegistrationService(
         IInstallationDeviceRepository installationDeviceRepository,
         GlobalSettings globalSettings,
+        IServiceProvider serviceProvider,
         ILogger<NotificationHubPushRegistrationService> logger)
     {
         _installationDeviceRepository = installationDeviceRepository;
         _globalSettings = globalSettings;
+        _serviceProvider = serviceProvider;
         _logger = logger;
 
         // Is this dirty to do in the ctor?
@@ -72,11 +76,21 @@ public class NotificationHubPushRegistrationService : IPushRegistrationService
         switch (type)
         {
             case DeviceType.Android:
-                payloadTemplate = "{\"data\":{\"data\":{\"type\":\"#(type)\",\"payload\":\"$(payload)\"}}}";
-                messageTemplate = "{\"data\":{\"data\":{\"type\":\"#(type)\"}," +
-                    "\"notification\":{\"title\":\"$(title)\",\"body\":\"$(message)\"}}}";
-
-                installation.Platform = NotificationPlatform.Fcm;
+                var featureService = _serviceProvider.GetRequiredService<IFeatureService>();
+                if (featureService.IsEnabled(FeatureFlagKeys.AnhFcmv1Migration))
+                {
+                    payloadTemplate = "{\"message\":{\"data\":{\"type\":\"$(type)\",\"payload\":\"$(payload)\"}}}";
+                    messageTemplate = "{\"message\":{\"data\":{\"type\":\"$(type)\"}," +
+                        "\"notification\":{\"title\":\"$(title)\",\"body\":\"$(message)\"}}}";
+                    installation.Platform = NotificationPlatform.FcmV1;
+                }
+                else
+                {
+                    payloadTemplate = "{\"data\":{\"data\":{\"type\":\"#(type)\",\"payload\":\"$(payload)\"}}}";
+                    messageTemplate = "{\"data\":{\"data\":{\"type\":\"#(type)\"}," +
+                        "\"notification\":{\"title\":\"$(title)\",\"body\":\"$(message)\"}}}";
+                    installation.Platform = NotificationPlatform.Fcm;
+                }
                 break;
             case DeviceType.iOS:
                 payloadTemplate = "{\"data\":{\"type\":\"#(type)\",\"payload\":\"$(payload)\"}," +
diff --git a/test/Core.Test/Services/NotificationHubPushRegistrationServiceTests.cs b/test/Core.Test/Services/NotificationHubPushRegistrationServiceTests.cs
index 0b9c64121..a8dd536b8 100644
--- a/test/Core.Test/Services/NotificationHubPushRegistrationServiceTests.cs
+++ b/test/Core.Test/Services/NotificationHubPushRegistrationServiceTests.cs
@@ -12,18 +12,21 @@ public class NotificationHubPushRegistrationServiceTests
     private readonly NotificationHubPushRegistrationService _sut;
 
     private readonly IInstallationDeviceRepository _installationDeviceRepository;
+    private readonly IServiceProvider _serviceProvider;
     private readonly ILogger<NotificationHubPushRegistrationService> _logger;
     private readonly GlobalSettings _globalSettings;
 
     public NotificationHubPushRegistrationServiceTests()
     {
         _installationDeviceRepository = Substitute.For<IInstallationDeviceRepository>();
+        _serviceProvider = Substitute.For<IServiceProvider>();
         _logger = Substitute.For<ILogger<NotificationHubPushRegistrationService>>();
         _globalSettings = new GlobalSettings();
 
         _sut = new NotificationHubPushRegistrationService(
             _installationDeviceRepository,
             _globalSettings,
+            _serviceProvider,
             _logger
         );
     }