From b866353d2cdbc2dffc6d90b5a9ceeca5ab058c17 Mon Sep 17 00:00:00 2001
From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com>
Date: Fri, 16 Feb 2024 13:37:54 -0500
Subject: [PATCH] Split endpoints for FF
 'AC-1607_present-user-offboarding-survey' (#3814)

---
 .../Controllers/OrganizationsController.cs    | 68 ++++++++++---------
 .../Auth/Controllers/AccountsController.cs    | 56 +++++++--------
 2 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/src/Api/AdminConsole/Controllers/OrganizationsController.cs b/src/Api/AdminConsole/Controllers/OrganizationsController.cs
index 736fb30dde..8c9fb9091a 100644
--- a/src/Api/AdminConsole/Controllers/OrganizationsController.cs
+++ b/src/Api/AdminConsole/Controllers/OrganizationsController.cs
@@ -464,50 +464,52 @@ public class OrganizationsController : Controller
         await _organizationService.VerifyBankAsync(orgIdGuid, model.Amount1.Value, model.Amount2.Value);
     }
 
-    [HttpPost("{id}/cancel")]
-    [SelfHosted(NotSelfHostedOnly = true)]
-    public async Task PostCancel(Guid id, [FromBody] SubscriptionCancellationRequestModel request)
+    [HttpPost("{id}/churn")]
+    public async Task PostChurn(Guid id, [FromBody] SubscriptionCancellationRequestModel request)
     {
         if (!await _currentContext.EditSubscription(id))
         {
             throw new NotFoundException();
         }
 
-        var presentUserWithOffboardingSurvey =
-            _featureService.IsEnabled(FeatureFlagKeys.AC1607_PresentUsersWithOffboardingSurvey);
+        var organization = await _organizationRepository.GetByIdAsync(id);
 
-        if (presentUserWithOffboardingSurvey)
+        if (organization == null)
         {
-            var organization = await _organizationRepository.GetByIdAsync(id);
-
-            if (organization == null)
-            {
-                throw new NotFoundException();
-            }
-
-            var subscription = await _getSubscriptionQuery.GetSubscription(organization);
-
-            await _cancelSubscriptionCommand.CancelSubscription(subscription,
-                new OffboardingSurveyResponse
-                {
-                    UserId = _currentContext.UserId!.Value,
-                    Reason = request.Reason,
-                    Feedback = request.Feedback
-                },
-                organization.IsExpired());
-
-            await _referenceEventService.RaiseEventAsync(new ReferenceEvent(
-                ReferenceEventType.CancelSubscription,
-                organization,
-                _currentContext)
-            {
-                EndOfPeriod = organization.IsExpired()
-            });
+            throw new NotFoundException();
         }
-        else
+
+        var subscription = await _getSubscriptionQuery.GetSubscription(organization);
+
+        await _cancelSubscriptionCommand.CancelSubscription(subscription,
+            new OffboardingSurveyResponse
+            {
+                UserId = _currentContext.UserId!.Value,
+                Reason = request.Reason,
+                Feedback = request.Feedback
+            },
+            organization.IsExpired());
+
+        await _referenceEventService.RaiseEventAsync(new ReferenceEvent(
+            ReferenceEventType.CancelSubscription,
+            organization,
+            _currentContext)
         {
-            await _organizationService.CancelSubscriptionAsync(id);
+            EndOfPeriod = organization.IsExpired()
+        });
+    }
+
+    [HttpPost("{id}/cancel")]
+    [SelfHosted(NotSelfHostedOnly = true)]
+    public async Task PostCancel(string id)
+    {
+        var orgIdGuid = new Guid(id);
+        if (!await _currentContext.EditSubscription(orgIdGuid))
+        {
+            throw new NotFoundException();
         }
+
+        await _organizationService.CancelSubscriptionAsync(orgIdGuid);
     }
 
     [HttpPost("{id}/reinstate")]
diff --git a/src/Api/Auth/Controllers/AccountsController.cs b/src/Api/Auth/Controllers/AccountsController.cs
index 8c4842848e..f370232b9d 100644
--- a/src/Api/Auth/Controllers/AccountsController.cs
+++ b/src/Api/Auth/Controllers/AccountsController.cs
@@ -821,9 +821,8 @@ public class AccountsController : Controller
         await _userService.UpdateLicenseAsync(user, license);
     }
 
-    [HttpPost("cancel-premium")]
-    [SelfHosted(NotSelfHostedOnly = true)]
-    public async Task PostCancel([FromBody] SubscriptionCancellationRequestModel request)
+    [HttpPost("churn-premium")]
+    public async Task PostChurn([FromBody] SubscriptionCancellationRequestModel request)
     {
         var user = await _userService.GetUserByPrincipalAsync(User);
 
@@ -832,34 +831,37 @@ public class AccountsController : Controller
             throw new UnauthorizedAccessException();
         }
 
-        var presentUserWithOffboardingSurvey =
-            _featureService.IsEnabled(FeatureFlagKeys.AC1607_PresentUsersWithOffboardingSurvey);
+        var subscription = await _getSubscriptionQuery.GetSubscription(user);
 
-        if (presentUserWithOffboardingSurvey)
-        {
-            var subscription = await _getSubscriptionQuery.GetSubscription(user);
-
-            await _cancelSubscriptionCommand.CancelSubscription(subscription,
-                new OffboardingSurveyResponse
-                {
-                    UserId = user.Id,
-                    Reason = request.Reason,
-                    Feedback = request.Feedback
-                },
-                user.IsExpired());
-
-            await _referenceEventService.RaiseEventAsync(new ReferenceEvent(
-                ReferenceEventType.CancelSubscription,
-                user,
-                _currentContext)
+        await _cancelSubscriptionCommand.CancelSubscription(subscription,
+            new OffboardingSurveyResponse
             {
-                EndOfPeriod = user.IsExpired()
-            });
-        }
-        else
+                UserId = user.Id,
+                Reason = request.Reason,
+                Feedback = request.Feedback
+            },
+            user.IsExpired());
+
+        await _referenceEventService.RaiseEventAsync(new ReferenceEvent(
+            ReferenceEventType.CancelSubscription,
+            user,
+            _currentContext)
         {
-            await _userService.CancelPremiumAsync(user);
+            EndOfPeriod = user.IsExpired()
+        });
+    }
+
+    [HttpPost("cancel-premium")]
+    [SelfHosted(NotSelfHostedOnly = true)]
+    public async Task PostCancel()
+    {
+        var user = await _userService.GetUserByPrincipalAsync(User);
+        if (user == null)
+        {
+            throw new UnauthorizedAccessException();
         }
+
+        await _userService.CancelPremiumAsync(user);
     }
 
     [HttpPost("reinstate-premium")]