nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-14 01:28:14 -05:00
Code

Updated GetIdsByMetadata to support providerId (#3994)

Browse Source 
* Refactored the charge succeeded handler a bit

* If refund charge is received, and we don't have a parent transaction stored already, attempt to create one

* Converted else if structure to switch-case

* Moved logic for invoice.upcoming to a private method

* Moved logic for charge.succeeded to a private method

* Moved logic for charge.refunded to a private method

* Moved logic for invoice.payment_succeeded to a private method

* Updated invoice.payment_failed to match the rest

* Updated invoice.created to match the rest with some light refactors

* Added method comment to HandlePaymentMethodAttachedAsync

* Moved logic for customer.updated to a private method

* Updated logger in default case

* Separated customer.subscription.deleted and customer.subscription.updated to be in their own blocks

* Moved logic for customer.subscription.deleted to a private method

* Moved logic for customer.subscription.updated to a private method

* Merged customer sub updated or deleted to switch

* No longer checking if the user has premium before disabling it since the service already checks

* Moved webhook secret parsing logic to private method

* Moved casting of event to specific object down to handler

* Reduced nesting throughout

* When removing secrets manager, now deleting 100% off password manager discount for SM trials

* Added method comment and reduced nesting in RemovePasswordManagerCouponIfRemovingSecretsManagerTrialAsync

* Updated GetIdsByMetadata to support providerId
This commit is contained in:
Conner Turnbull 2024-04-19 09:33:26 -04:00 committed by GitHub
parent 0171a3150e
commit e6bd8779a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,7 +214,7 @@ public class StripeController : Controller
private async Task HandleCustomerSubscriptionUpdatedEventAsync(Event parsedEvent)
{
var subscription = await _stripeEventService.GetSubscription(parsedEvent, true, ["customer", "discounts"]);
var (organizationId, userId) = GetIdsFromMetaData(subscription.Metadata);
var (organizationId, userId, providerId) = GetIdsFromMetadata(subscription.Metadata);
switch (subscription.Status)
{
@ -339,7 +339,7 @@ public class StripeController : Controller
private async Task HandleCustomerSubscriptionDeletedEventAsync(Event parsedEvent)
{
var subscription = await _stripeEventService.GetSubscription(parsedEvent, true);
var (organizationId, userId) = GetIdsFromMetaData(subscription.Metadata);
var (organizationId, userId, providerId) = GetIdsFromMetadata(subscription.Metadata);
var subCanceled = subscription.Status == StripeSubscriptionStatus.Canceled;
if (!subCanceled)
@ -371,7 +371,7 @@ public class StripeController : Controller
var subscription = customer.Subscriptions.First();
var (organizationId, _) = GetIdsFromMetaData(subscription.Metadata);
var (organizationId, _, providerId) = GetIdsFromMetadata(subscription.Metadata);
if (!organizationId.HasValue)
{
@ -424,7 +424,7 @@ public class StripeController : Controller
await Task.Delay(5000);
}
var (organizationId, userId) = GetIdsFromMetaData(subscription.Metadata);
var (organizationId, userId, providerId) = GetIdsFromMetadata(subscription.Metadata);
if (organizationId.HasValue)
{
if (!subscription.Items.Any(i =>
@ -617,7 +617,7 @@ public class StripeController : Controller
? subscription
: await VerifyCorrectTaxRateForCharge(invoice, subscription);
var (organizationId, userId) = GetIdsFromMetaData(updatedSubscription.Metadata);
var (organizationId, userId, providerId) = GetIdsFromMetadata(updatedSubscription.Metadata);
var invoiceLineItemDescriptions = invoice.Lines.Select(i => i.Description).ToList();
@ -688,6 +688,7 @@ public class StripeController : Controller
{
Guid? organizationId = null;
Guid? userId = null;
Guid? providerId = null;
if (charge.InvoiceId != null)
{
@ -695,7 +696,7 @@ public class StripeController : Controller
if (invoice?.SubscriptionId != null)
{
var subscription = await _stripeFacade.GetSubscription(invoice.SubscriptionId);
(organizationId, userId) = GetIdsFromMetaData(subscription?.Metadata);
(organizationId, userId, providerId) = GetIdsFromMetadata(subscription?.Metadata);
}
}
@ -716,7 +717,7 @@ public class StripeController : Controller
continue;
}
(organizationId, userId) = GetIdsFromMetaData(subscription.Metadata);
(organizationId, userId, providerId) = GetIdsFromMetadata(subscription.Metadata);
if (organizationId.HasValue || userId.HasValue)
{
@ -895,49 +896,36 @@ public class StripeController : Controller
}
}
private static Tuple<Guid?, Guid?> GetIdsFromMetaData(Dictionary<string, string> metaData)
/// <summary>
/// Gets the organizationId, userId, or providerId from the metadata of a Stripe Subscription object.
/// </summary>
/// <param name="metadata"></param>
/// <returns></returns>
private static Tuple<Guid?, Guid?, Guid?> GetIdsFromMetadata(Dictionary<string, string> metadata)
{
if (metaData == null || metaData.Count == 0)
if (metadata == null || metadata.Count == 0)
{
return new Tuple<Guid?, Guid?>(null, null);
return new Tuple<Guid?, Guid?, Guid?>(null, null, null);
}
Guid? orgId = null;
Guid? userId = null;
metadata.TryGetValue("organizationId", out var orgIdString);
metadata.TryGetValue("userId", out var userIdString);
metadata.TryGetValue("providerId", out var providerIdString);
if (metaData.TryGetValue("organizationId", out var orgIdString))
{
orgId = new Guid(orgIdString);
}
else if (metaData.TryGetValue("userId", out var userIdString))
{
userId = new Guid(userIdString);
}
orgIdString ??= metadata.FirstOrDefault(x =>
x.Key.Equals("organizationId", StringComparison.OrdinalIgnoreCase)).Value;
if (userId != null && userId != Guid.Empty || orgId != null && orgId != Guid.Empty)
{
return new Tuple<Guid?, Guid?>(orgId, userId);
}
userIdString ??= metadata.FirstOrDefault(x =>
x.Key.Equals("userId", StringComparison.OrdinalIgnoreCase)).Value;
var orgIdKey = metaData.Keys
.FirstOrDefault(k => k.Equals("organizationid", StringComparison.InvariantCultureIgnoreCase));
providerIdString ??= metadata.FirstOrDefault(x =>
x.Key.Equals("providerId", StringComparison.OrdinalIgnoreCase)).Value;
if (!string.IsNullOrWhiteSpace(orgIdKey))
{
orgId = new Guid(metaData[orgIdKey]);
}
else
{
var userIdKey = metaData.Keys
.FirstOrDefault(k => k.Equals("userid", StringComparison.InvariantCultureIgnoreCase));
Guid? organizationId = string.IsNullOrWhiteSpace(orgIdString) ? null : new Guid(orgIdString);
Guid? userId = string.IsNullOrWhiteSpace(userIdString) ? null : new Guid(userIdString);
Guid? providerId = string.IsNullOrWhiteSpace(providerIdString) ? null : new Guid(providerIdString);
if (!string.IsNullOrWhiteSpace(userIdKey))
{
userId = new Guid(metaData[userIdKey]);
}
}
return new Tuple<Guid?, Guid?>(orgId, userId);
return new Tuple<Guid?, Guid?, Guid?>(organizationId, userId, providerId);
}
private static bool OrgPlanForInvoiceNotifications(Organization org) => StaticStore.GetPlan(org.PlanType).IsAnnual;
@ -970,22 +958,22 @@ public class StripeController : Controller
}
var subscription = await _stripeFacade.GetSubscription(invoice.SubscriptionId);
var ids = GetIdsFromMetaData(subscription?.Metadata);
if (!ids.Item1.HasValue && !ids.Item2.HasValue)
var (organizationId, userId, providerId) = GetIdsFromMetadata(subscription?.Metadata);
if (!organizationId.HasValue && !userId.HasValue)
{
_logger.LogWarning(
"Attempted to pay invoice with Braintree but Stripe subscription metadata didn't contain either a organizationId or userId");
return false;
}
var orgTransaction = ids.Item1.HasValue;
var orgTransaction = organizationId.HasValue;
var btObjIdField = orgTransaction ? "organization_id" : "user_id";
var btObjId = ids.Item1 ?? ids.Item2.Value;
var btInvoiceAmount = (invoice.AmountDue / 100M);
var btObjId = organizationId ?? userId.Value;
var btInvoiceAmount = invoice.AmountDue / 100M;
var existingTransactions = orgTransaction ?
await _transactionRepository.GetManyByOrganizationIdAsync(ids.Item1.Value) :
await _transactionRepository.GetManyByUserIdAsync(ids.Item2.Value);
await _transactionRepository.GetManyByOrganizationIdAsync(organizationId.Value) :
await _transactionRepository.GetManyByUserIdAsync(userId.Value);
var duplicateTimeSpan = TimeSpan.FromHours(24);
var now = DateTime.UtcNow;
var duplicateTransaction = existingTransactions?