nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-03 00:52:49 -05:00
Code Activity

[AC-2774] Consolidated issues for Consolidated Billing (#4201)

Browse Source 
* Add BaseProviderController, update some endpoints to ServiceUser permissions

* Prevent service user from scaling provider seats above seat minimum

* Expand invoice response to include DueDate
This commit is contained in:
Alex Morask
2024-06-24 11:15:47 -04:00
committed by GitHub
parent 4a06c82c8d
commit fa62b36d44
9 changed files with 318 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Api/Billing/Controllers/ProviderBillingController.cs
View File

@ -1,10 +1,7 @@
using Bit.Api.Billing.Models.Requests;
using Bit.Api.Billing.Models.Responses;
using Bit.Core;
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.AdminConsole.Repositories;
using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Extensions;
using Bit.Core.Billing.Models;
using Bit.Core.Billing.Services;
using Bit.Core.Context;
@ -23,12 +20,12 @@ public class ProviderBillingController(
IProviderBillingService providerBillingService,
IProviderRepository providerRepository,
IStripeAdapter stripeAdapter,
ISubscriberService subscriberService) : Controller
ISubscriberService subscriberService) : BaseProviderController(currentContext, featureService, providerRepository)
{
[HttpGet("invoices")]
public async Task<IResult> GetInvoicesAsync([FromRoute] Guid providerId)
{
var (provider, result) = await GetAuthorizedBillableProviderOrResultAsync(providerId);
var (provider, result) = await TryGetBillableProviderForAdminOperation(providerId);
if (provider == null)
{
@ -45,7 +42,7 @@ public class ProviderBillingController(
[HttpGet("invoices/{invoiceId}")]
public async Task<IResult> GenerateClientInvoiceReportAsync([FromRoute] Guid providerId, string invoiceId)
{
var (provider, result) = await GetAuthorizedBillableProviderOrResultAsync(providerId);
var (provider, result) = await TryGetBillableProviderForAdminOperation(providerId);
if (provider == null)
{
@ -67,7 +64,7 @@ public class ProviderBillingController(
[HttpGet("payment-information")]
public async Task<IResult> GetPaymentInformationAsync([FromRoute] Guid providerId)
{
var (provider, result) = await GetAuthorizedBillableProviderOrResultAsync(providerId);
var (provider, result) = await TryGetBillableProviderForAdminOperation(providerId);
if (provider == null)
{
@ -89,7 +86,7 @@ public class ProviderBillingController(
[HttpGet("payment-method")]
public async Task<IResult> GetPaymentMethodAsync([FromRoute] Guid providerId)
{
var (provider, result) = await GetAuthorizedBillableProviderOrResultAsync(providerId);
var (provider, result) = await TryGetBillableProviderForAdminOperation(providerId);
if (provider == null)
{
@ -113,7 +110,7 @@ public class ProviderBillingController(
[FromRoute] Guid providerId,
[FromBody] TokenizedPaymentMethodRequestBody requestBody)
{
var (provider, result) = await GetAuthorizedBillableProviderOrResultAsync(providerId);
var (provider, result) = await TryGetBillableProviderForAdminOperation(providerId);
if (provider == null)
{
@ -141,7 +138,7 @@ public class ProviderBillingController(
[FromRoute] Guid providerId,
[FromBody] VerifyBankAccountRequestBody requestBody)
{
var (provider, result) = await GetAuthorizedBillableProviderOrResultAsync(providerId);
var (provider, result) = await TryGetBillableProviderForAdminOperation(providerId);
if (provider == null)
{
@ -156,7 +153,7 @@ public class ProviderBillingController(
[HttpGet("subscription")]
public async Task<IResult> GetSubscriptionAsync([FromRoute] Guid providerId)
{
var (provider, result) = await GetAuthorizedBillableProviderOrResultAsync(providerId);
var (provider, result) = await TryGetBillableProviderForServiceUserOperation(providerId);
if (provider == null)
{
@ -178,7 +175,7 @@ public class ProviderBillingController(
[HttpGet("tax-information")]
public async Task<IResult> GetTaxInformationAsync([FromRoute] Guid providerId)
{
var (provider, result) = await GetAuthorizedBillableProviderOrResultAsync(providerId);
var (provider, result) = await TryGetBillableProviderForAdminOperation(providerId);
if (provider == null)
{
@ -202,7 +199,7 @@ public class ProviderBillingController(
[FromRoute] Guid providerId,
[FromBody] TaxInformationRequestBody requestBody)
{
var (provider, result) = await GetAuthorizedBillableProviderOrResultAsync(providerId);
var (provider, result) = await TryGetBillableProviderForAdminOperation(providerId);
if (provider == null)
{
@ -222,31 +219,4 @@ public class ProviderBillingController(
return TypedResults.Ok();
}
private async Task<(Provider, IResult)> GetAuthorizedBillableProviderOrResultAsync(Guid providerId)
{
if (!featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling))
{
return (null, TypedResults.NotFound());
}
var provider = await providerRepository.GetByIdAsync(providerId);
if (provider == null)
{
return (null, TypedResults.NotFound());
}
if (!currentContext.ProviderProviderAdmin(providerId))
{
return (null, TypedResults.Unauthorized());
}
if (!provider.IsBillable())
{
return (null, TypedResults.Unauthorized());
}
return (provider, null);
}
}