nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 21:48:12 -05:00
Code

update stripe SDK

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-08 17:36:41 -04:00
parent 6d4e34b229
commit 48ec345702
9 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Admin/Startup.cs
View File

@ -38,7 +38,7 @@ namespace Bit.Admin
services.AddCustomDataProtectionServices(Environment, globalSettings); services.AddCustomDataProtectionServices(Environment, globalSettings);
// Stripe Billing // Stripe Billing
StripeConfiguration.SetApiKey(globalSettings.StripeApiKey); StripeConfiguration.ApiKey = globalSettings.StripeApiKey;
// Repositories // Repositories
services.AddSqlServerRepositories(globalSettings); services.AddSqlServerRepositories(globalSettings);

2
src/Api/Startup.cs
View File

@ -47,7 +47,7 @@ namespace Bit.Api
services.AddCustomDataProtectionServices(Environment, globalSettings); services.AddCustomDataProtectionServices(Environment, globalSettings);
// Stripe Billing // Stripe Billing
StripeConfiguration.SetApiKey(globalSettings.StripeApiKey); StripeConfiguration.ApiKey = globalSettings.StripeApiKey;
// Repositories // Repositories
services.AddSqlServerRepositories(globalSettings); services.AddSqlServerRepositories(globalSettings);

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

@ -506,7 +506,7 @@ namespace Bit.Billing.Controllers
private bool UnpaidAutoChargeInvoiceForSubscriptionCycle(Invoice invoice) private bool UnpaidAutoChargeInvoiceForSubscriptionCycle(Invoice invoice)
{ {
return invoice.AmountDue > 0 && !invoice.Paid && invoice.Billing == Stripe.Billing.ChargeAutomatically && return invoice.AmountDue > 0 && !invoice.Paid && invoice.CollectionMethod == "charge_automatically" &&
invoice.BillingReason == "subscription_cycle" && invoice.SubscriptionId != null; invoice.BillingReason == "subscription_cycle" && invoice.SubscriptionId != null;
} }
} }

2
src/Billing/Startup.cs
View File

@ -33,7 +33,7 @@ namespace Bit.Billing
services.Configure<BillingSettings>(Configuration.GetSection("BillingSettings")); services.Configure<BillingSettings>(Configuration.GetSection("BillingSettings"));
// Stripe Billing // Stripe Billing
StripeConfiguration.SetApiKey(globalSettings.StripeApiKey); StripeConfiguration.ApiKey = globalSettings.StripeApiKey;
// Repositories // Repositories
services.AddSqlServerRepositories(globalSettings); services.AddSqlServerRepositories(globalSettings);

2
src/Core/Core.csproj
View File

@ -52,7 +52,7 @@
<PackageReference Include="AspNetCoreRateLimit" Version="2.1.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="2.1.0" />
<PackageReference Include="Braintree" Version="4.11.0" /> <PackageReference Include="Braintree" Version="4.11.0" />
<PackageReference Include="Sendgrid" Version="9.11.0" /> <PackageReference Include="Sendgrid" Version="9.11.0" />
<PackageReference Include="Stripe.net" Version="24.0.2" /> <PackageReference Include="Stripe.net" Version="27.21.0" />
<PackageReference Include="U2F.Core" Version="1.0.4" /> <PackageReference Include="U2F.Core" Version="1.0.4" />
<PackageReference Include="Otp.NET" Version="1.2.1" /> <PackageReference Include="Otp.NET" Version="1.2.1" />
<PackageReference Include="YubicoDotNetClient" Version="1.2.0" /> <PackageReference Include="YubicoDotNetClient" Version="1.2.0" />

3
src/Core/Models/Business/BillingInfo.cs
View File

@ -124,13 +124,12 @@ namespace Bit.Core.Models.Business
public BillingInvoice(Invoice inv) public BillingInvoice(Invoice inv)
{ {
Amount = inv.AmountDue / 100M; Amount = inv.AmountDue / 100M;
Date = inv.Date.Value; Date = inv.Created;
Url = inv.HostedInvoiceUrl; Url = inv.HostedInvoiceUrl;
PdfUrl = inv.InvoicePdf; PdfUrl = inv.InvoicePdf;
Number = inv.Number; Number = inv.Number;
Paid = inv.Paid; Paid = inv.Paid;
Amount = inv.Total / 100M; Amount = inv.Total / 100M;
Date = inv.Date.Value;
} }
public decimal Amount { get; set; } public decimal Amount { get; set; }

2
src/Core/Models/Business/SubscriptionInfo.cs
View File

@ -123,7 +123,7 @@ namespace Bit.Core.Models.Business
public BillingUpcomingInvoice(Invoice inv) public BillingUpcomingInvoice(Invoice inv)
{ {
Amount = inv.AmountDue / 100M; Amount = inv.AmountDue / 100M;
Date = inv.Date.Value; Date = inv.Created;
} }
public BillingUpcomingInvoice(Braintree.Subscription sub) public BillingUpcomingInvoice(Braintree.Subscription sub)

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

@ -136,7 +136,7 @@ namespace Bit.Core.Services
{ {
Description = org.BusinessName, Description = org.BusinessName,
Email = org.BillingEmail, Email = org.BillingEmail,
SourceToken = stipeCustomerSourceToken, Source = stipeCustomerSourceToken,
Metadata = stripeCustomerMetadata Metadata = stripeCustomerMetadata
}); });
subCreateOptions.CustomerId = customer.Id; subCreateOptions.CustomerId = customer.Id;
@ -171,8 +171,9 @@ namespace Bit.Core.Services
} }
var customerService = new CustomerService(); var customerService = new CustomerService();
customerService.ExpandDefaultSource = true; var customerOptions = new CustomerGetOptions();
var customer = await customerService.GetAsync(org.GatewayCustomerId); customerOptions.AddExpand("default_source");
var customer = await customerService.GetAsync(org.GatewayCustomerId, customerOptions);
if(customer == null) if(customer == null)
{ {
throw new GatewayException("Could not find customer payment profile."); throw new GatewayException("Could not find customer payment profile.");
@ -332,7 +333,7 @@ namespace Bit.Core.Services
{ {
Description = user.Name, Description = user.Name,
Email = user.Email, Email = user.Email,
SourceToken = stipeCustomerSourceToken, Source = stipeCustomerSourceToken,
Metadata = stripeCustomerMetadata Metadata = stripeCustomerMetadata
}); });
createdStripeCustomer = true; createdStripeCustomer = true;
@ -437,7 +438,7 @@ namespace Bit.Core.Services
await customerService.UpdateAsync(customer.Id, new CustomerUpdateOptions await customerService.UpdateAsync(customer.Id, new CustomerUpdateOptions
{ {
AccountBalance = customer.AccountBalance - previewInvoice.AmountDue Balance = customer.Balance - previewInvoice.AmountDue
}); });
addedCreditToStripeCustomer = true; addedCreditToStripeCustomer = true;
} }
@ -492,11 +493,11 @@ namespace Bit.Core.Services
{ {
await customerService.DeleteAsync(customer.Id); await customerService.DeleteAsync(customer.Id);
} }
else if(addedCreditToStripeCustomer || customer.AccountBalance < 0) else if(addedCreditToStripeCustomer || customer.Balance < 0)
{ {
await customerService.UpdateAsync(customer.Id, new CustomerUpdateOptions await customerService.UpdateAsync(customer.Id, new CustomerUpdateOptions
{ {
AccountBalance = customer.AccountBalance Balance = customer.Balance
}); });
} }
} }
@ -690,8 +691,9 @@ namespace Bit.Core.Services
// Invoice them and pay now instead of waiting until next billing cycle. // Invoice them and pay now instead of waiting until next billing cycle.
var customerService = new CustomerService(); var customerService = new CustomerService();
customerService.ExpandDefaultSource = true; var customerOptions = new CustomerGetOptions();
var customer = await customerService.GetAsync(subscriber.GatewayCustomerId); customerOptions.AddExpand("default_source");
var customer = await customerService.GetAsync(subscriber.GatewayCustomerId, customerOptions);
var invoiceAmountDue = upcomingPreview.StartingBalance + invoiceAmount; var invoiceAmountDue = upcomingPreview.StartingBalance + invoiceAmount;
if(invoiceAmountDue > 0 && !customer.Metadata.ContainsKey("btCustomerId")) if(invoiceAmountDue > 0 && !customer.Metadata.ContainsKey("btCustomerId"))
@ -728,7 +730,7 @@ namespace Bit.Core.Services
invoice = await invoiceService.CreateAsync(new InvoiceCreateOptions invoice = await invoiceService.CreateAsync(new InvoiceCreateOptions
{ {
Billing = Billing.SendInvoice, CollectionMethod = "send_invoice",
DaysUntilDue = 1, DaysUntilDue = 1,
CustomerId = subscriber.GatewayCustomerId, CustomerId = subscriber.GatewayCustomerId,
SubscriptionId = subscriber.GatewaySubscriptionId SubscriptionId = subscriber.GatewaySubscriptionId
@ -800,7 +802,7 @@ namespace Bit.Core.Services
{ {
await customerService.UpdateAsync(customer.Id, new CustomerUpdateOptions await customerService.UpdateAsync(customer.Id, new CustomerUpdateOptions
{ {
AccountBalance = customer.AccountBalance Balance = customer.Balance
}); });
} }
@ -1041,7 +1043,7 @@ namespace Bit.Core.Services
{ {
Description = subscriber.BillingName(), Description = subscriber.BillingName(),
Email = subscriber.BillingEmailAddress(), Email = subscriber.BillingEmailAddress(),
SourceToken = stipeCustomerSourceToken, Source = stipeCustomerSourceToken,
Metadata = stripeCustomerMetadata Metadata = stripeCustomerMetadata
}); });
@ -1059,7 +1061,7 @@ namespace Bit.Core.Services
{ {
var bankAccount = await bankSerice.CreateAsync(customer.Id, new BankAccountCreateOptions var bankAccount = await bankSerice.CreateAsync(customer.Id, new BankAccountCreateOptions
{ {
SourceToken = paymentToken Source = paymentToken
}); });
defaultSourceId = bankAccount.Id; defaultSourceId = bankAccount.Id;
} }
@ -1067,7 +1069,7 @@ namespace Bit.Core.Services
{ {
var card = await cardService.CreateAsync(customer.Id, new CardCreateOptions var card = await cardService.CreateAsync(customer.Id, new CardCreateOptions
{ {
SourceToken = paymentToken, Source = paymentToken,
}); });
defaultSourceId = card.Id; defaultSourceId = card.Id;
} }
@ -1126,7 +1128,7 @@ namespace Bit.Core.Services
} }
await customerService.UpdateAsync(customer.Id, new CustomerUpdateOptions await customerService.UpdateAsync(customer.Id, new CustomerUpdateOptions
{ {
AccountBalance = customer.AccountBalance - (long)(creditAmount * 100) Balance = customer.Balance - (long)(creditAmount * 100)
}); });
return !customerExists; return !customerExists;
} }
@ -1165,7 +1167,7 @@ namespace Bit.Core.Services
catch(StripeException) { } catch(StripeException) { }
if(customer != null) if(customer != null)
{ {
billingInfo.Balance = customer.AccountBalance / 100M; billingInfo.Balance = customer.Balance / 100M;
if(customer.Metadata?.ContainsKey("btCustomerId") ?? false) if(customer.Metadata?.ContainsKey("btCustomerId") ?? false)
{ {
@ -1200,7 +1202,7 @@ namespace Bit.Core.Services
Limit = 50 Limit = 50
}); });
billingInfo.Invoices = invoices.Data.Where(i => i.Status != "void" && i.Status != "draft") billingInfo.Invoices = invoices.Data.Where(i => i.Status != "void" && i.Status != "draft")
.OrderByDescending(i => i.Date).Select(i => new BillingInfo.BillingInvoice(i)); .OrderByDescending(i => i.Created).Select(i => new BillingInfo.BillingInvoice(i));
} }
} }

2
src/Icons/Services/IconFetchingService.cs
View File

@ -299,7 +299,7 @@ namespace Bit.Icons.Services
{ {
return await _httpClient.SendAsync(message); return await _httpClient.SendAsync(message);
} }
catch(Exception e) catch
{ {
return null; return null;
} }