kgess-mirror/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2026-01-11 19:57:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

(format): Run dotnet format

Browse source
This commit is contained in:
Alex Morask 2026-01-09 13:23:17 -06:00
parent c2cc9c414c
commit f7eac25aae
No known key found for this signature in database
GPG key ID: 23E38285B743E3A8
13 changed files with 37 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/Billing/Extensions/DiscountExtensions.cs
View file

@ -1,4 +1,4 @@
using Stripe;
using Stripe;
namespace Bit.Core.Billing.Extensions;

2
src/Core/Billing/Subscriptions/Commands/ReinstateSubscriptionCommand.cs
View file

@ -1,4 +1,4 @@
using Bit.Core.Billing.Commands;
using Bit.Core.Billing.Commands;
using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Services;
using Bit.Core.Entities;

8
src/Core/Billing/Subscriptions/Models/BitwardenDiscount.cs
View file

@ -1,4 +1,4 @@
using System.Runtime.Serialization;
using System.Runtime.Serialization;
using System.Text.Json.Serialization;
using Bit.Core.Utilities;
using Stripe;
@ -47,11 +47,13 @@ public record BitwardenDiscount
{
{ AmountOff: > 0 } => new BitwardenDiscount
{
Type = BitwardenDiscountType.AmountOff, Value = discount.Coupon.AmountOff.Value
Type = BitwardenDiscountType.AmountOff,
Value = discount.Coupon.AmountOff.Value
},
{ PercentOff: > 0 } => new BitwardenDiscount
{
Type = BitwardenDiscountType.PercentOff, Value = discount.Coupon.PercentOff.Value
Type = BitwardenDiscountType.PercentOff,
Value = discount.Coupon.PercentOff.Value
},
_ => null!
};

2
src/Core/Billing/Subscriptions/Models/BitwardenSubscription.cs
View file

@ -1,4 +1,4 @@
namespace Bit.Core.Billing.Subscriptions.Models;
namespace Bit.Core.Billing.Subscriptions.Models;
public record BitwardenSubscription
{

2
src/Core/Billing/Subscriptions/Models/Cart.cs
View file

@ -1,4 +1,4 @@
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
using Bit.Core.Billing.Enums;
using Bit.Core.Utilities;

2
src/Core/Billing/Subscriptions/Models/Storage.cs
View file

@ -1,4 +1,4 @@
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.Entities;
using Bit.Core.Utilities;
using OneOf;

10
src/Core/Billing/Subscriptions/Models/SubscriberId.cs
View file

@ -1,4 +1,4 @@
using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Constants;
using Bit.Core.Exceptions;
using OneOf;
using Stripe;
@ -15,11 +15,11 @@ public record ProviderId(Guid Value);
public class SubscriberId : OneOfBase<UserId, OrganizationId, ProviderId>
{
private SubscriberId(OneOf<UserId, OrganizationId, ProviderId> input) : base(input) {}
private SubscriberId(OneOf<UserId, OrganizationId, ProviderId> input) : base(input) { }
public static implicit operator SubscriberId(UserId value) => new (value);
public static implicit operator SubscriberId(OrganizationId value) => new (value);
public static implicit operator SubscriberId(ProviderId value) => new (value);
public static implicit operator SubscriberId(UserId value) => new(value);
public static implicit operator SubscriberId(OrganizationId value) => new(value);
public static implicit operator SubscriberId(ProviderId value) => new(value);
public static implicit operator SubscriberId(Subscription subscription)
{

16
src/Core/Billing/Subscriptions/Queries/GetBitwardenSubscriptionQuery.cs
View file

@ -1,4 +1,4 @@
using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Enums;
using Bit.Core.Billing.Extensions;
using Bit.Core.Billing.Pricing;
@ -65,7 +65,8 @@ public class GetBitwardenSubscriptionQuery(
case SubscriptionStatus.Active:
return baseSubscription with
{
NextCharge = subscription.GetCurrentPeriodEnd(), CancelAt = subscription.CancelAt
NextCharge = subscription.GetCurrentPeriodEnd(),
CancelAt = subscription.CancelAt
};
case SubscriptionStatus.PastDue:
@ -81,10 +82,10 @@ public class GetBitwardenSubscriptionQuery(
return baseSubscription with { Canceled = subscription.CanceledAt };
default:
{
logger.LogError("Subscription ({SubscriptionID}) has an unmanaged status ({Status})", subscription.Id, subscription.Status);
throw new ConflictException("Subscription is in an invalid state. Please contact support for assistance.");
}
{
logger.LogError("Subscription ({SubscriptionID}) has an unmanaged status ({Status})", subscription.Id, subscription.Status);
throw new ConflictException("Subscription is in an invalid state. Please contact support for assistance.");
}
}
}
@ -147,7 +148,8 @@ public class GetBitwardenSubscriptionQuery(
{
var invoice = await stripeAdapter.CreateInvoicePreviewAsync(new InvoiceCreatePreviewOptions
{
Customer = subscription.Customer.Id, Subscription = subscription.Id
Customer = subscription.Customer.Id,
Subscription = subscription.Id
});
return GetCost(invoice.TotalTaxes);

2
src/Core/Services/IBraintreeService.cs
View file

@ -1,4 +1,4 @@
using Bit.Core.Billing.Subscriptions.Models;
using Bit.Core.Billing.Subscriptions.Models;
using Stripe;
namespace Bit.Core.Services;

5
src/Core/Services/Implementations/BraintreeService.cs
View file

@ -1,4 +1,4 @@
using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Services;
using Bit.Core.Billing.Subscriptions.Models;
using Bit.Core.Exceptions;
@ -76,7 +76,8 @@ public class BraintreeService(
},
CustomFields = new Dictionary<string, string>
{
[idKey] = idValue.ToString(), ["region"] = globalSettings.BaseServiceUri.CloudRegion
[idKey] = idValue.ToString(),
["region"] = globalSettings.BaseServiceUri.CloudRegion
}
};

2
src/Core/Utilities/EnumMemberJsonConverter.cs
View file

@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;

10
test/Core.Test/Billing/Subscriptions/Queries/GetBitwardenSubscriptionQueryTests.cs
View file

@ -1,4 +1,4 @@
using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Enums;
using Bit.Core.Billing.Pricing;
using Bit.Core.Billing.Services;
@ -547,11 +547,15 @@ public class GetBitwardenSubscriptionQueryTests
Available = true,
Seat = new Bit.Core.Billing.Pricing.Premium.Purchasable
{
StripePriceId = "price_premium_seat", Price = 10.0m, Provided = 1
StripePriceId = "price_premium_seat",
Price = 10.0m,
Provided = 1
},
Storage = new Bit.Core.Billing.Pricing.Premium.Purchasable
{
StripePriceId = "price_storage", Price = 4.0m, Provided = 1
StripePriceId = "price_storage",
Price = 4.0m,
Provided = 1
}
}
];

2
test/Core.Test/Utilities/EnumMemberJsonConverterTests.cs
View file

@ -1,4 +1,4 @@
using System.Runtime.Serialization;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using Bit.Core.Utilities;