nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-19 10:35:45 -05:00
Code

change "uncancel" to reinstate. fix rename error.

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-10 18:20:21 -04:00
parent fa565f46c6
commit ea6178594c
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Api/Controllers/OrganizationsController.cs
View File

@ -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}")]

2
src/Core/Services/IOrganizationService.cs
View File

@ -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);

12
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -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