nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-02 08:32:50 -05:00
Code Activity

Cherry pick/stripe sdk fixes (#2170)

Browse Source 
* update stripe sdk (#2166)

* Bump version to 2022.8.1 (#2167)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit eaca9a5864)

* added setting to toggle stripe api version errors (#2168)

* Bump version to 2022.8.2 (#2169)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 3d7e5e165c)

Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Chad Scharf
2022-08-09 09:32:18 -04:00
committed by GitHub
parent 3d7e5e165c
commit 37641ba08b
32 changed files with 89 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Billing/BillingSettings.cs
View File

@ -5,6 +5,7 @@
public virtual string JobsKey { get; set; }
public virtual string StripeWebhookKey { get; set; }
public virtual string StripeWebhookSecret { get; set; }
public virtual bool StripeEventParseThrowMismatch { get; set; } = true;
public virtual string BitPayWebhookKey { get; set; }
public virtual string AppleWebhookKey { get; set; }
public virtual string FreshdeskWebhookKey { get; set; }

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

@ -92,7 +92,8 @@ namespace Bit.Billing.Controllers
{
var json = await sr.ReadToEndAsync();
parsedEvent = EventUtility.ConstructEvent(json, Request.Headers["Stripe-Signature"],
_billingSettings.StripeWebhookSecret);
_billingSettings.StripeWebhookSecret,
throwOnApiVersionMismatch: _billingSettings.StripeEventParseThrowMismatch);
}
if (string.IsNullOrWhiteSpace(parsedEvent?.Id))

1
src/Billing/appsettings.json
View File

@ -62,6 +62,7 @@
"jobsKey": "SECRET",
"stripeWebhookKey": "SECRET",
"stripeWebhookSecret": "SECRET",
"stripeEventParseThrowMismatch": true,
"bitPayWebhookKey": "SECRET",
"appleWebhookKey": "SECRET",
"payPal": {

6
src/Billing/packages.lock.json
View File

@ -1733,8 +1733,8 @@
},
"Stripe.net": {
"type": "Transitive",
"resolved": "39.107.0",
"contentHash": "cp/t6YzMTTPHopf7D7XFe7sPe5jE3QrVaPuA//xQWTbvTwBryOofTosyREq7OLqkvQ9olEHMNbHAkKIjM7vhsg==",
"resolved": "40.0.0",
"contentHash": "SD1bGiF+sVQG3p2LXNTZ5rEG2aCnXIHokcxYS9yyW3dR01J0ryf+iNFOwid148yePZ0gCBcRxj3wiW1mTmP7UQ==",
"dependencies": {
"Newtonsoft.Json": "12.0.3",
"System.Configuration.ConfigurationManager": "6.0.0"
@ -3221,7 +3221,7 @@
"Serilog.Extensions.Logging.File": "2.0.0",
"Serilog.Sinks.AzureCosmosDB": "2.0.0",
"Serilog.Sinks.SyslogMessages": "2.0.6",
"Stripe.net": "39.107.0",
"Stripe.net": "40.0.0",
"YubicoDotNetClient": "1.2.0"
}
},