Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00
Code Issues Projects Releases Wiki Activity

update expiration dates

Browse Source
This commit is contained in:
Kyle Spearrin 2017-08-12 22:16:42 -04:00
parent 55ae6f12ad
commit 680d7b2bed
7 changed files with 79 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/Billing/Controllers/StripeController.cs
View File

@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Stripe; using Stripe;
using System; using System;
using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Bit.Billing.Controllers namespace Bit.Billing.Controllers
@ -36,7 +37,7 @@ namespace Bit.Billing.Controllers
return new BadRequestResult(); return new BadRequestResult();
} }
var parsedEvent = StripeEventUtility.ParseEventDataItem<StripeEvent>(body); StripeEvent parsedEvent = StripeEventUtility.ParseEventDataItem<StripeEvent>(body);
if(string.IsNullOrWhiteSpace(parsedEvent?.Id)) if(string.IsNullOrWhiteSpace(parsedEvent?.Id))
{ {
return new BadRequestResult(); return new BadRequestResult();
@ -47,30 +48,57 @@ namespace Bit.Billing.Controllers
return new BadRequestResult(); return new BadRequestResult();
} }
if(parsedEvent.Type == "customer.subscription.deleted") if(parsedEvent.Type.Equals("customer.subscription.deleted") ||
parsedEvent.Type.Equals("customer.subscription.updated"))
{ {
var subscription = Mapper<StripeSubscription>.MapFromJson(parsedEvent.Data.Object.ToString()) StripeSubscription subscription = Mapper<StripeSubscription>.MapFromJson(parsedEvent.Data.Object.ToString());
as StripeSubscription; var ids = GetIdsFromMetaData(subscription.Metadata);
if(subscription?.Status == "canceled")
if(parsedEvent.Type.Equals("customer.subscription.deleted") && subscription?.Status == "canceled")
{ {
if(subscription.Metadata?.ContainsKey("organizationId") ?? false) // org
if(ids.Item1.HasValue)
{ {
var orgIdGuid = new Guid(subscription.Metadata["organizationId"]); await _organizationService.DisableAsync(ids.Item1.Value, subscription.CurrentPeriodEnd);
await _organizationService.DisableAsync(orgIdGuid);
} }
else if(subscription.Metadata?.ContainsKey("userId") ?? false) // user
else if(ids.Item2.HasValue)
{ {
var userIdGuid = new Guid(subscription.Metadata["userId"]); await _userService.DisablePremiumAsync(ids.Item2.Value, subscription.CurrentPeriodEnd);
await _userService.DisablePremiumAsync(userIdGuid); }
}
else if(parsedEvent.Type.Equals("customer.subscription.updated"))
{
// org
if(ids.Item1.HasValue)
{
await _organizationService.UpdateExpirationDateAsync(ids.Item1.Value, subscription.CurrentPeriodEnd);
}
// user
else if(ids.Item2.HasValue)
{
await _userService.UpdatePremiumExpirationAsync(ids.Item2.Value, subscription.CurrentPeriodEnd);
} }
} }
}
else
{
// Not handling this event type.
} }
return new OkResult(); return new OkResult();
} }
private Tuple<Guid?, Guid?> GetIdsFromMetaData(IDictionary<string, string> metaData)
{
Guid? orgId = null;
Guid? userId = null;
if(metaData?.ContainsKey("organizationId") ?? false)
{
orgId = new Guid(metaData["organizationId"]);
}
else if(metaData?.ContainsKey("userId") ?? false)
{
userId = new Guid(metaData["userId"]);
}
return new Tuple<Guid?, Guid?>(orgId, userId);
}
} }
} }

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

@ -18,7 +18,8 @@ namespace Bit.Core.Services
Task AdjustSeatsAsync(Guid organizationId, int seatAdjustment); Task AdjustSeatsAsync(Guid organizationId, int seatAdjustment);
Task<Tuple<Organization, OrganizationUser>> SignUpAsync(OrganizationSignup organizationSignup); Task<Tuple<Organization, OrganizationUser>> SignUpAsync(OrganizationSignup organizationSignup);
Task DeleteAsync(Organization organization); Task DeleteAsync(Organization organization);
Task DisableAsync(Guid organizationId); Task DisableAsync(Guid organizationId, DateTime? expirationDate);
Task UpdateExpirationDateAsync(Guid organizationId, DateTime? expirationDate);
Task EnableAsync(Guid organizationId); Task EnableAsync(Guid organizationId);
Task UpdateAsync(Organization organization, bool updateBilling = false); Task UpdateAsync(Organization organization, bool updateBilling = false);
Task<OrganizationUser> InviteUserAsync(Guid organizationId, Guid invitingUserId, string email, Task<OrganizationUser> InviteUserAsync(Guid organizationId, Guid invitingUserId, string email,

3
src/Core/Services/IUserService.cs
View File

@ -45,6 +45,7 @@ namespace Bit.Core.Services
Task ReplacePaymentMethodAsync(User user, string paymentToken); Task ReplacePaymentMethodAsync(User user, string paymentToken);
Task CancelPremiumAsync(User user, bool endOfPeriod = false); Task CancelPremiumAsync(User user, bool endOfPeriod = false);
Task ReinstatePremiumAsync(User user); Task ReinstatePremiumAsync(User user);
Task DisablePremiumAsync(Guid userId); Task DisablePremiumAsync(Guid userId, DateTime? expirationDate);
Task UpdatePremiumExpirationAsync(Guid userId, DateTime? expirationDate);
} }
} }

2
src/Core/Services/Implementations/BraintreePaymentService.cs
View File

@ -243,6 +243,8 @@ namespace Bit.Core.Services
user.Gateway = Enums.GatewayType.Braintree; user.Gateway = Enums.GatewayType.Braintree;
user.GatewayCustomerId = customerResult.Target.Id; user.GatewayCustomerId = customerResult.Target.Id;
user.GatewaySubscriptionId = subResult.Target.Id; user.GatewaySubscriptionId = subResult.Target.Id;
user.Premium = true;
user.PremiumExpirationDate = subResult.Target.BillingPeriodEndDate;
} }
public async Task ReinstateSubscriptionAsync(ISubscriber subscriber) public async Task ReinstateSubscriptionAsync(ISubscriber subscriber)

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

@ -527,18 +527,31 @@ namespace Bit.Core.Services
await _organizationRepository.DeleteAsync(organization); await _organizationRepository.DeleteAsync(organization);
} }
public async Task DisableAsync(Guid organizationId) public async Task DisableAsync(Guid organizationId, DateTime? expirationDate)
{ {
var org = await _organizationRepository.GetByIdAsync(organizationId); var org = await _organizationRepository.GetByIdAsync(organizationId);
if(org != null && org.Enabled) if(org != null && org.Enabled)
{ {
org.Enabled = false; org.Enabled = false;
org.ExpirationDate = expirationDate;
org.RevisionDate = DateTime.UtcNow;
await _organizationRepository.ReplaceAsync(org); await _organizationRepository.ReplaceAsync(org);
// TODO: send email to owners? // TODO: send email to owners?
} }
} }
public async Task UpdateExpirationDateAsync(Guid organizationId, DateTime? expirationDate)
{
var org = await _organizationRepository.GetByIdAsync(organizationId);
if(org != null)
{
org.ExpirationDate = expirationDate;
org.RevisionDate = DateTime.UtcNow;
await _organizationRepository.ReplaceAsync(org);
}
}
public async Task EnableAsync(Guid organizationId) public async Task EnableAsync(Guid organizationId)
{ {
var org = await _organizationRepository.GetByIdAsync(organizationId); var org = await _organizationRepository.GetByIdAsync(organizationId);

2
src/Core/Services/Implementations/StripePaymentService.cs
View File

@ -63,6 +63,8 @@ namespace Bit.Core.Services
user.Gateway = Enums.GatewayType.Stripe; user.Gateway = Enums.GatewayType.Stripe;
user.GatewayCustomerId = customer.Id; user.GatewayCustomerId = customer.Id;
user.GatewaySubscriptionId = subscription.Id; user.GatewaySubscriptionId = subscription.Id;
user.Premium = true;
user.PremiumExpirationDate = subscription.CurrentPeriodEnd;
} }
public async Task AdjustStorageAsync(IStorableSubscriber storableSubscriber, int additionalStorage, public async Task AdjustStorageAsync(IStorableSubscriber storableSubscriber, int additionalStorage,

15
src/Core/Services/Implementations/UserService.cs
View File

@ -574,6 +574,7 @@ namespace Bit.Core.Services
{ {
user.MaxStorageGb = 10240; // 10 TB user.MaxStorageGb = 10240; // 10 TB
user.LicenseKey = license.LicenseKey; user.LicenseKey = license.LicenseKey;
user.PremiumExpirationDate = license.Expires;
} }
else else
{ {
@ -640,12 +641,24 @@ namespace Bit.Core.Services
await paymentService.ReinstateSubscriptionAsync(user); await paymentService.ReinstateSubscriptionAsync(user);
} }
public async Task DisablePremiumAsync(Guid userId) public async Task DisablePremiumAsync(Guid userId, DateTime? expirationDate)
{ {
var user = await _userRepository.GetByIdAsync(userId); var user = await _userRepository.GetByIdAsync(userId);
if(user != null && user.Premium) if(user != null && user.Premium)
{ {
user.Premium = false; user.Premium = false;
user.PremiumExpirationDate = expirationDate;
user.RevisionDate = DateTime.UtcNow;
await _userRepository.ReplaceAsync(user);
}
}
public async Task UpdatePremiumExpirationAsync(Guid userId, DateTime? expirationDate)
{
var user = await _userRepository.GetByIdAsync(userId);
if(user != null)
{
user.PremiumExpirationDate = expirationDate;
user.RevisionDate = DateTime.UtcNow; user.RevisionDate = DateTime.UtcNow;
await _userRepository.ReplaceAsync(user); await _userRepository.ReplaceAsync(user);
} }