From b15913ce737473af239afd948b7e201968f25410 Mon Sep 17 00:00:00 2001
From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com>
Date: Thu, 23 Oct 2025 10:04:47 -0400
Subject: [PATCH] Fix HubHelpers field references causing build error (#6487)

---
 src/Notifications/HubHelpers.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Notifications/HubHelpers.cs b/src/Notifications/HubHelpers.cs
index 2ef674adfe..b0dec8b415 100644
--- a/src/Notifications/HubHelpers.cs
+++ b/src/Notifications/HubHelpers.cs
@@ -162,14 +162,24 @@ public class HubHelpers
                 var organizationBankAccountVerifiedNotification =
                     JsonSerializer.Deserialize<PushNotificationData<OrganizationBankAccountVerifiedPushNotification>>(
                         notificationJson, _deserializerOptions);
-                await hubContext.Clients.Group(NotificationsHub.GetOrganizationGroup(organizationBankAccountVerifiedNotification.Payload.OrganizationId))
+                if (organizationBankAccountVerifiedNotification is null)
+                {
+                    break;
+                }
+
+                await _hubContext.Clients.Group(NotificationsHub.GetOrganizationGroup(organizationBankAccountVerifiedNotification.Payload.OrganizationId))
                     .SendAsync(_receiveMessageMethod, organizationBankAccountVerifiedNotification, cancellationToken);
                 break;
             case PushType.ProviderBankAccountVerified:
                 var providerBankAccountVerifiedNotification =
                     JsonSerializer.Deserialize<PushNotificationData<ProviderBankAccountVerifiedPushNotification>>(
                         notificationJson, _deserializerOptions);
-                await hubContext.Clients.User(providerBankAccountVerifiedNotification.Payload.AdminId.ToString())
+                if (providerBankAccountVerifiedNotification is null)
+                {
+                    break;
+                }
+
+                await _hubContext.Clients.User(providerBankAccountVerifiedNotification.Payload.AdminId.ToString())
                     .SendAsync(_receiveMessageMethod, providerBankAccountVerifiedNotification, cancellationToken);
                 break;
             case PushType.Notification:
@@ -222,7 +232,7 @@ public class HubHelpers
                     .SendAsync(_receiveMessageMethod, pendingTasksData, cancellationToken);
                 break;
             default:
-                logger.LogWarning("Notification type '{NotificationType}' has not been registered in HubHelpers and will not be pushed as as result", notification.Type);
+                _logger.LogWarning("Notification type '{NotificationType}' has not been registered in HubHelpers and will not be pushed as as result", notification.Type);
                 break;
         }
     }