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

[PM-12765] Change error message when subscription canceled and attemp… (#5346)

Browse Source
This commit is contained in:
Jonas Hendrickx 2025-02-06 15:15:36 +01:00 committed by GitHub
parent 17f5c97891
commit bc27ec2b9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
View File

@ -1294,6 +1294,12 @@ public class OrganizationService : IOrganizationService
} }
} }
var subscription = await _paymentService.GetSubscriptionAsync(organization);
if (subscription?.Subscription?.Status == StripeConstants.SubscriptionStatus.Canceled)
{
return (false, "You do not have an active subscription. Reinstate your subscription to make changes");
}
if (organization.Seats.HasValue && if (organization.Seats.HasValue &&
organization.MaxAutoscaleSeats.HasValue && organization.MaxAutoscaleSeats.HasValue &&
organization.MaxAutoscaleSeats.Value < organization.Seats.Value + seatsToAdd) organization.MaxAutoscaleSeats.Value < organization.Seats.Value + seatsToAdd)
@ -1301,12 +1307,6 @@ public class OrganizationService : IOrganizationService
return (false, $"Seat limit has been reached."); return (false, $"Seat limit has been reached.");
} }
var subscription = await _paymentService.GetSubscriptionAsync(organization);
if (subscription?.Subscription?.Status == StripeConstants.SubscriptionStatus.Canceled)
{
return (false, "Cannot autoscale with a canceled subscription.");
}
return (true, failureReason); return (true, failureReason);
} }