handle feature flag on/off logic

Author: jaasen-livefront

src/Core/Platform/Push/Engines/RelayPushEngine.cs

@@ -43,6 +43,11 @@ public RelayPushEngine(
     public async Task PushAsync<T>(PushNotification<T> pushNotification)
         where T : class
     {
+        if (pushNotification.NonMobileOnly == true)
+        {
+            return;
+        }
+
         var deviceIdentifier = _httpContextAccessor.HttpContext
             ?.RequestServices.GetService<ICurrentContext>()
             ?.DeviceIdentifier;

src/Core/Platform/Push/NotificationHub/NotificationHubPushEngine.cs

@@ -70,6 +70,11 @@ private string BuildTag(string tag, string? identifier, ClientType? clientType)
     public async Task PushAsync<T>(PushNotification<T> pushNotification)
         where T : class
     {
+        if (pushNotification.NonMobileOnly == true)
+        {
+            return;
+        }
+
         var initialTag = pushNotification.Target switch
         {
             NotificationTarget.User => $"template:payload_userId:{pushNotification.TargetId}",

src/Core/Platform/Push/PushNotification.cs

@@ -13,17 +13,17 @@ public record PushNotification<T>
     /// <summary>
     /// The <see cref="PushType"/> to be associated with the notification. This is used to route
     /// the notification to the correct handler on the client side. Be sure to use the correct payload
-    /// type for the associated <see cref="PushType"/>. 
+    /// type for the associated <see cref="PushType"/>.
     /// </summary>
     public required PushType Type { get; init; }
 
     /// <summary>
     /// The target entity type for the notification.
     /// </summary>
     /// <remarks>
-    /// When the target type is <see cref="NotificationTarget.User"/> the <see cref="TargetId"/> 
+    /// When the target type is <see cref="NotificationTarget.User"/> the <see cref="TargetId"/>
     /// property is expected to be a users ID. When it is <see cref="NotificationTarget.Organization"/>
-    /// it should be an organizations id. When it is a <see cref="NotificationTarget.Installation"/> 
+    /// it should be an organizations id. When it is a <see cref="NotificationTarget.Installation"/>
     /// it should be an installation id.
     /// </remarks>
     public required NotificationTarget Target { get; init; }
@@ -45,11 +45,17 @@ public record PushNotification<T>
     public required bool ExcludeCurrentContext { get; init; }
 
     /// <summary>
-    /// The type of clients the notification should be sent to, if <see langword="null"/> then 
+    /// The type of clients the notification should be sent to, if <see langword="null"/> then
     /// <see cref="ClientType.All"/> is inferred.
     /// </summary>
     public ClientType? ClientType { get; init; }
 
+
+    /// <summary>
+    /// When true, only non-mobile engines (SignalR/web/desktop) will deliver this notification. When null or false, all engines process it.
+    /// </summary>
+    public bool? NonMobileOnly { get; init; }
+
     internal Guid? GetTargetWhen(NotificationTarget notificationTarget)
     {
         return Target == notificationTarget ? TargetId : null;

src/Core/Vault/Services/Implementations/CipherSyncPushService.cs

@@ -42,6 +42,23 @@ private async Task PushCipherAsync(Cipher cipher, PushType pushType, IEnumerable
         {
             if (!_featureService.IsEnabled(FeatureFlagKeys.OrgCipherPushFanout))
             {
+                // Device registrations in Notification Hub and Relay are not collection-aware, so we cannot
+                // safely fan out to individual users on those mobile engines. Restrict to the non-mobile
+                // (SignalR) path, which routes by organizationId on the receiving end.
+                await _pushNotificationService.PushAsync(new PushNotification<SyncCipherPushNotification>
+                {
+                    Type = pushType,
+                    Target = NotificationTarget.Organization,
+                    TargetId = cipher.OrganizationId.Value,
+                    Payload = new SyncCipherPushNotification
+                    {
+                        Id = cipher.Id,
+                        OrganizationId = cipher.OrganizationId,
+                        RevisionDate = cipher.RevisionDate,
+                    },
+                    ExcludeCurrentContext = true,
+                    NonMobileOnly = true,
+                });
                 return;
             }
 

test/Core.Test/Vault/Services/CipherSyncPushServiceTests.cs

@@ -83,7 +83,7 @@ await sutProvider.GetDependency<IPushNotificationService>()
     }
 
     [Theory, BitAutoData]
-    public async Task PushSyncCipherCreateAsync_OrgCipher_FlagOff_NoPush(
+    public async Task PushSyncCipherCreateAsync_OrgCipher_FlagOff_SendsNonMobileOrgBroadcast(
         SutProvider<CipherSyncPushService> sutProvider, Cipher cipher, Guid collectionId)
     {
         cipher.OrganizationId = Guid.NewGuid();
@@ -96,8 +96,14 @@ public async Task PushSyncCipherCreateAsync_OrgCipher_FlagOff_NoPush(
         await sutProvider.Sut.PushSyncCipherCreateAsync(cipher, [collectionId]);
 
         await sutProvider.GetDependency<IPushNotificationService>()
-            .DidNotReceiveWithAnyArgs()
-            .PushAsync(Arg.Any<PushNotification<SyncCipherPushNotification>>());
+            .Received(1)
+            .PushAsync(Arg.Is<PushNotification<SyncCipherPushNotification>>(n =>
+                n.Type == PushType.SyncCipherCreate &&
+                n.Target == NotificationTarget.Organization &&
+                n.TargetId == cipher.OrganizationId!.Value &&
+                n.NonMobileOnly == true &&
+                n.Payload.Id == cipher.Id &&
+                n.Payload.OrganizationId == cipher.OrganizationId));
     }
 
     [Theory, BitAutoData]