From ea6178594cbdb591cf3486a6a48972e278512843 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 10 Apr 2017 18:20:21 -0400
Subject: [PATCH] change "uncancel" to reinstate. fix rename error.

---
 src/Api/Controllers/OrganizationsController.cs       |  8 ++++----
 src/Core/Services/IOrganizationService.cs            |  2 +-
 .../Services/Implementations/OrganizationService.cs  | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs
index e7f01577ce..fae6c3f079 100644
--- a/src/Api/Controllers/OrganizationsController.cs
+++ b/src/Api/Controllers/OrganizationsController.cs
@@ -167,9 +167,9 @@ namespace Bit.Api.Controllers
             await _organizationService.CancelSubscriptionAsync(orgIdGuid, true);
         }
 
-        [HttpPut("{id}/uncancel")]
-        [HttpPost("{id}/uncancel")]
-        public async Task PutActivate(string id)
+        [HttpPut("{id}/reinstate")]
+        [HttpPost("{id}/reinstate")]
+        public async Task PutReinstate(string id)
         {
             var orgIdGuid = new Guid(id);
             if(!_currentContext.OrganizationOwner(orgIdGuid))
@@ -177,7 +177,7 @@ namespace Bit.Api.Controllers
                 throw new NotFoundException();
             }
 
-            await _organizationService.UncancelSubscriptionAsync(orgIdGuid);
+            await _organizationService.ReinstateSubscriptionAsync(orgIdGuid);
         }
 
         [HttpDelete("{id}")]
diff --git a/src/Core/Services/IOrganizationService.cs b/src/Core/Services/IOrganizationService.cs
index dc59e15128..de28cb7242 100644
--- a/src/Core/Services/IOrganizationService.cs
+++ b/src/Core/Services/IOrganizationService.cs
@@ -12,7 +12,7 @@ namespace Bit.Core.Services
         Task<OrganizationBilling> GetBillingAsync(Organization organization);
         Task ReplacePaymentMethodAsync(Guid organizationId, string paymentToken);
         Task CancelSubscriptionAsync(Guid organizationId, bool endOfPeriod = false);
-        Task UncancelSubscriptionAsync(Guid organizationId);
+        Task ReinstateSubscriptionAsync(Guid organizationId);
         Task UpgradePlanAsync(Guid organizationId, PlanType plan, int additionalSeats);
         Task AdjustSeatsAsync(Guid organizationId, int seatAdjustment);
         Task<Tuple<Organization, OrganizationUser>> SignUpAsync(OrganizationSignup organizationSignup);
diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs
index 7f183dffff..c664947397 100644
--- a/src/Core/Services/Implementations/OrganizationService.cs
+++ b/src/Core/Services/Implementations/OrganizationService.cs
@@ -174,7 +174,7 @@ namespace Bit.Core.Services
             }
         }
 
-        public async Task UncancelSubscriptionAsync(Guid organizationId)
+        public async Task ReinstateSubscriptionAsync(Guid organizationId)
         {
             var organization = await _organizationRepository.GetByIdAsync(organizationId);
             if(organization == null)
@@ -203,7 +203,7 @@ namespace Bit.Core.Services
             var updatedSub = await subscriptionService.UpdateAsync(sub.Id, new StripeSubscriptionUpdateOptions { });
             if(updatedSub.CanceledAt.HasValue)
             {
-                throw new BadRequestException("Unable to activate subscription.");
+                throw new BadRequestException("Unable to reinstate subscription.");
             }
         }
 
@@ -401,9 +401,9 @@ namespace Bit.Core.Services
                     new StripeUpcomingInvoiceOptions
                     {
                         SubscriptionId = organization.StripeSubscriptionId,
-                        SubscriptionItems = new List<StripeUpcomingInvoiceSubscriptionItemOptions>
+                        SubscriptionItems = new List<StripeInvoiceSubscriptionItemOptions>
                         {
-                            new StripeUpcomingInvoiceSubscriptionItemOptions
+                            new StripeInvoiceSubscriptionItemOptions
                             {
                                 PlanId = plan.StripeSeatPlanId,
                                 Quantity = additionalSeats
@@ -450,9 +450,9 @@ namespace Bit.Core.Services
                     new StripeUpcomingInvoiceOptions
                     {
                         SubscriptionId = organization.StripeSubscriptionId,
-                        SubscriptionItems = new List<StripeUpcomingInvoiceSubscriptionItemOptions>
+                        SubscriptionItems = new List<StripeInvoiceSubscriptionItemOptions>
                         {
-                            new StripeUpcomingInvoiceSubscriptionItemOptions
+                            new StripeInvoiceSubscriptionItemOptions
                             {
                                 Id = seatItem.Id,
                                 Quantity = additionalSeats