From 88ffde930fd8ff608030dcd2148885c5a35458a9 Mon Sep 17 00:00:00 2001
From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com>
Date: Wed, 5 Mar 2025 15:29:51 -0500
Subject: [PATCH] Check to see if cancellation comment is populated before
 disablement checks (#5468)

---
 .../Implementations/SubscriptionDeletedHandler.cs     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Billing/Services/Implementations/SubscriptionDeletedHandler.cs b/src/Billing/Services/Implementations/SubscriptionDeletedHandler.cs
index 8155928453..465da86c3f 100644
--- a/src/Billing/Services/Implementations/SubscriptionDeletedHandler.cs
+++ b/src/Billing/Services/Implementations/SubscriptionDeletedHandler.cs
@@ -41,10 +41,15 @@ public class SubscriptionDeletedHandler : ISubscriptionDeletedHandler
             return;
         }
 
-        if (organizationId.HasValue &&
-            subscription.CancellationDetails.Comment != providerMigrationCancellationComment &&
-            !subscription.CancellationDetails.Comment.Contains(addedToProviderCancellationComment))
+        if (organizationId.HasValue)
         {
+            if (!string.IsNullOrEmpty(subscription.CancellationDetails?.Comment) &&
+                (subscription.CancellationDetails.Comment == providerMigrationCancellationComment ||
+                 subscription.CancellationDetails.Comment.Contains(addedToProviderCancellationComment)))
+            {
+                return;
+            }
+
             await _organizationDisableCommand.DisableAsync(organizationId.Value, subscription.CurrentPeriodEnd);
         }
         else if (userId.HasValue)