[AC-1923] Add endpoint to create client organization (#3977)

* Add new endpoint for creating client organizations in consolidated billing

* Create empty org and then assign seats for code re-use

* Fixes made from debugging client side

* few more small fixes

* Vincent's feedback

src/Core/AdminConsole/Enums/OrganizationStatusType.cs

@@ -3,5 +3,6 @@
 public enum OrganizationStatusType : byte
 {
     Pending = 0,
-    Created = 1
+    Created = 1,
+    Managed = 2,
 }

src/Core/AdminConsole/Services/IOrganizationService.cs

@@ -26,6 +26,8 @@ public interface IOrganizationService
     /// <returns>A tuple containing the new organization, the initial organizationUser (if any) and the default collection (if any)</returns>
 #nullable enable
     Task<(Organization organization, OrganizationUser? organizationUser, Collection? defaultCollection)> SignUpAsync(OrganizationSignup organizationSignup, bool provider = false);
+
+    Task<(Organization organization, OrganizationUser organizationUser, Collection defaultCollection)> SignupClientAsync(OrganizationSignup signup);
 #nullable disable
     /// <summary>
     /// Create a new organization on a self-hosted instance

src/Core/AdminConsole/Services/Implementations/OrganizationService.cs

@@ -421,6 +421,89 @@ public class OrganizationService : IOrganizationService
         }
     }
 
+    public async Task<(Organization organization, OrganizationUser organizationUser, Collection defaultCollection)> SignupClientAsync(OrganizationSignup signup)
+    {
+        var consolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
+
+        if (!consolidatedBillingEnabled)
+        {
+            throw new InvalidOperationException($"{nameof(SignupClientAsync)} is only for use within Consolidated Billing");
+        }
+
+        var plan = StaticStore.GetPlan(signup.Plan);
+
+        ValidatePlan(plan, signup.AdditionalSeats, "Password Manager");
+
+        var flexibleCollectionsSignupEnabled =
+            _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollectionsSignup);
+
+        var flexibleCollectionsV1Enabled =
+            _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollectionsV1);
+
+        var organization = new Organization
+        {
+            // Pre-generate the org id so that we can save it with the Stripe subscription..
+            Id = CoreHelpers.GenerateComb(),
+            Name = signup.Name,
+            BillingEmail = signup.BillingEmail,
+            PlanType = plan!.Type,
+            Seats = signup.AdditionalSeats,
+            MaxCollections = plan.PasswordManager.MaxCollections,
+            // Extra storage not available for purchase with Consolidated Billing.
+            MaxStorageGb = 0,
+            UsePolicies = plan.HasPolicies,
+            UseSso = plan.HasSso,
+            UseGroups = plan.HasGroups,
+            UseEvents = plan.HasEvents,
+            UseDirectory = plan.HasDirectory,
+            UseTotp = plan.HasTotp,
+            Use2fa = plan.Has2fa,
+            UseApi = plan.HasApi,
+            UseResetPassword = plan.HasResetPassword,
+            SelfHost = plan.HasSelfHost,
+            UsersGetPremium = plan.UsersGetPremium,
+            UseCustomPermissions = plan.HasCustomPermissions,
+            UseScim = plan.HasScim,
+            Plan = plan.Name,
+            Gateway = GatewayType.Stripe,
+            ReferenceData = signup.Owner.ReferenceData,
+            Enabled = true,
+            LicenseKey = CoreHelpers.SecureRandomString(20),
+            PublicKey = signup.PublicKey,
+            PrivateKey = signup.PrivateKey,
+            CreationDate = DateTime.UtcNow,
+            RevisionDate = DateTime.UtcNow,
+            Status = OrganizationStatusType.Created,
+            UsePasswordManager = true,
+            // Secrets Manager not available for purchase with Consolidated Billing.
+            UseSecretsManager = false,
+
+            // This feature flag indicates that new organizations should be automatically onboarded to
+            // Flexible Collections enhancements
+            FlexibleCollections = flexibleCollectionsSignupEnabled,
+
+            // These collection management settings smooth the migration for existing organizations by disabling some FC behavior.
+            // If the organization is onboarded to Flexible Collections on signup, we turn them OFF to enable all new behaviour.
+            // If the organization is NOT onboarded now, they will have to be migrated later, so they default to ON to limit FC changes on migration.
+            LimitCollectionCreationDeletion = !flexibleCollectionsSignupEnabled,
+            AllowAdminAccessToAllCollectionItems = !flexibleCollectionsV1Enabled
+        };
+
+        var returnValue = await SignUpAsync(organization, default, signup.OwnerKey, signup.CollectionName, false);
+
+        await _referenceEventService.RaiseEventAsync(
+            new ReferenceEvent(ReferenceEventType.Signup, organization, _currentContext)
+            {
+                PlanName = plan.Name,
+                PlanType = plan.Type,
+                Seats = returnValue.Item1.Seats,
+                SignupInitiationPath = signup.InitiationPath,
+                Storage = returnValue.Item1.MaxStorageGb,
+            });
+
+        return returnValue;
+    }
+
     /// <summary>
     /// Create a new organization in a cloud environment
     /// </summary>

src/Core/Billing/Commands/IAssignSeatsToClientOrganizationCommand.cs

@@ -5,6 +5,15 @@ namespace Bit.Core.Billing.Commands;
 
 public interface IAssignSeatsToClientOrganizationCommand
 {
+    /// <summary>
+    /// Assigns a specified number of <paramref name="seats"/> to a client <paramref name="organization"/> on behalf of
+    /// its <paramref name="provider"/>. Seat adjustments for the client organization may autoscale the provider's Stripe
+    /// <see cref="Stripe.Subscription"/> depending on the provider's seat minimum for the client <paramref name="organization"/>'s
+    /// <see cref="Organization.PlanType"/>.
+    /// </summary>
+    /// <param name="provider">The MSP that manages the client <paramref name="organization"/>.</param>
+    /// <param name="organization">The client organization whose <see cref="seats"/> you want to update.</param>
+    /// <param name="seats">The number of seats to assign to the client organization.</param>
     Task AssignSeatsToClientOrganization(
         Provider provider,
         Organization organization,

src/Core/Billing/Commands/ICreateCustomerCommand.cs

@@ -0,0 +1,17 @@
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Entities.Provider;
+
+namespace Bit.Core.Billing.Commands;
+
+public interface ICreateCustomerCommand
+{
+    /// <summary>
+    /// Create a Stripe <see cref="Stripe.Customer"/> for the provided client <paramref name="organization"/> utilizing
+    /// the address and tax information of its <paramref name="provider"/>.
+    /// </summary>
+    /// <param name="provider">The MSP that owns the client organization.</param>
+    /// <param name="organization">The client organization to create a Stripe <see cref="Stripe.Customer"/> for.</param>
+    Task CreateCustomer(
+        Provider provider,
+        Organization organization);
+}

src/Core/Billing/Commands/IScaleSeatsCommand.cs

@@ -0,0 +1,12 @@
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.Enums;
+
+namespace Bit.Core.Billing.Commands;
+
+public interface IScaleSeatsCommand
+{
+    Task ScalePasswordManagerSeats(
+        Provider provider,
+        PlanType planType,
+        int seatAdjustment);
+}

src/Core/Billing/Commands/IStartSubscriptionCommand.cs

@@ -1,10 +1,19 @@
 using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.Enums;
 using Bit.Core.Models.Business;
 
 namespace Bit.Core.Billing.Commands;
 
 public interface IStartSubscriptionCommand
 {
+    /// <summary>
+    /// Starts a Stripe <see cref="Stripe.Subscription"/> for the given <paramref name="provider"/> utilizing the provided
+    /// <paramref name="taxInfo"/> to handle automatic taxation and non-US tax identification. <see cref="Provider"/> subscriptions
+    /// will always be started with a <see cref="Stripe.SubscriptionItem"/> for both the <see cref="PlanType.TeamsMonthly"/> and <see cref="PlanType.EnterpriseMonthly"/>
+    /// plan, and the quantity for each item will be equal the provider's seat minimum for each respective plan.
+    /// </summary>
+    /// <param name="provider">The provider to create the <see cref="Stripe.Subscription"/> for.</param>
+    /// <param name="taxInfo">The tax information to use for automatic taxation and non-US tax identification.</param>
     Task StartSubscription(
         Provider provider,
         TaxInfo taxInfo);

src/Core/Billing/Commands/Implementations/CreateCustomerCommand.cs

@@ -0,0 +1,89 @@
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.Billing.Queries;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Bit.Core.Settings;
+using Microsoft.Extensions.Logging;
+using Stripe;
+
+namespace Bit.Core.Billing.Commands.Implementations;
+
+public class CreateCustomerCommand(
+    IGlobalSettings globalSettings,
+    ILogger<CreateCustomerCommand> logger,
+    IOrganizationRepository organizationRepository,
+    IStripeAdapter stripeAdapter,
+    ISubscriberQueries subscriberQueries) : ICreateCustomerCommand
+{
+    public async Task CreateCustomer(
+        Provider provider,
+        Organization organization)
+    {
+        ArgumentNullException.ThrowIfNull(provider);
+        ArgumentNullException.ThrowIfNull(organization);
+
+        if (!string.IsNullOrEmpty(organization.GatewayCustomerId))
+        {
+            logger.LogWarning("Client organization ({ID}) already has a populated {FieldName}", organization.Id, nameof(organization.GatewayCustomerId));
+
+            return;
+        }
+
+        var providerCustomer = await subscriberQueries.GetCustomerOrThrow(provider, new CustomerGetOptions
+        {
+            Expand = ["tax_ids"]
+        });
+
+        var providerTaxId = providerCustomer.TaxIds.FirstOrDefault();
+
+        var organizationDisplayName = organization.DisplayName();
+
+        var customerCreateOptions = new CustomerCreateOptions
+        {
+            Address = new AddressOptions
+            {
+                Country = providerCustomer.Address?.Country,
+                PostalCode = providerCustomer.Address?.PostalCode,
+                Line1 = providerCustomer.Address?.Line1,
+                Line2 = providerCustomer.Address?.Line2,
+                City = providerCustomer.Address?.City,
+                State = providerCustomer.Address?.State
+            },
+            Name = organizationDisplayName,
+            Description = $"{provider.Name} Client Organization",
+            Email = provider.BillingEmail,
+            InvoiceSettings = new CustomerInvoiceSettingsOptions
+            {
+                CustomFields =
+                [
+                    new CustomerInvoiceSettingsCustomFieldOptions
+                    {
+                        Name = organization.SubscriberType(),
+                        Value = organizationDisplayName.Length <= 30
+                            ? organizationDisplayName
+                            : organizationDisplayName[..30]
+                    }
+                ]
+            },
+            Metadata = new Dictionary<string, string>
+            {
+                { "region", globalSettings.BaseServiceUri.CloudRegion }
+            },
+            TaxIdData = providerTaxId == null ? null :
+            [
+                new CustomerTaxIdDataOptions
+                {
+                    Type = providerTaxId.Type,
+                    Value = providerTaxId.Value
+                }
+            ]
+        };
+
+        var customer = await stripeAdapter.CustomerCreateAsync(customerCreateOptions);
+
+        organization.GatewayCustomerId = customer.Id;
+
+        await organizationRepository.ReplaceAsync(organization);
+    }
+}

src/Core/Billing/Commands/Implementations/ScaleSeatsCommand.cs

@@ -0,0 +1,130 @@
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Extensions;
+using Bit.Core.Billing.Queries;
+using Bit.Core.Billing.Repositories;
+using Bit.Core.Enums;
+using Bit.Core.Services;
+using Bit.Core.Utilities;
+using Microsoft.Extensions.Logging;
+using static Bit.Core.Billing.Utilities;
+
+namespace Bit.Core.Billing.Commands.Implementations;
+
+public class ScaleSeatsCommand(
+    ILogger<ScaleSeatsCommand> logger,
+    IPaymentService paymentService,
+    IProviderBillingQueries providerBillingQueries,
+    IProviderPlanRepository providerPlanRepository) : IScaleSeatsCommand
+{
+    public async Task ScalePasswordManagerSeats(Provider provider, PlanType planType, int seatAdjustment)
+    {
+        ArgumentNullException.ThrowIfNull(provider);
+
+        if (provider.Type != ProviderType.Msp)
+        {
+            logger.LogError("Non-MSP provider ({ProviderID}) cannot scale their Password Manager seats", provider.Id);
+
+            throw ContactSupport();
+        }
+
+        if (!planType.SupportsConsolidatedBilling())
+        {
+            logger.LogError("Cannot scale provider ({ProviderID}) Password Manager seats for plan type {PlanType} as it does not support consolidated billing", provider.Id, planType.ToString());
+
+            throw ContactSupport();
+        }
+
+        var providerPlans = await providerPlanRepository.GetByProviderId(provider.Id);
+
+        var providerPlan = providerPlans.FirstOrDefault(providerPlan => providerPlan.PlanType == planType);
+
+        if (providerPlan == null || !providerPlan.IsConfigured())
+        {
+            logger.LogError("Cannot scale provider ({ProviderID}) Password Manager seats for plan type {PlanType} when their matching provider plan is not configured", provider.Id, planType);
+
+            throw ContactSupport();
+        }
+
+        var seatMinimum = providerPlan.SeatMinimum.GetValueOrDefault(0);
+
+        var currentlyAssignedSeatTotal =
+            await providerBillingQueries.GetAssignedSeatTotalForPlanOrThrow(provider.Id, planType);
+
+        var newlyAssignedSeatTotal = currentlyAssignedSeatTotal + seatAdjustment;
+
+        var update = CurryUpdateFunction(
+            provider,
+            providerPlan,
+            newlyAssignedSeatTotal);
+
+        /*
+         * Below the limit => Below the limit:
+         * No subscription update required. We can safely update the organization's seats.
+         */
+        if (currentlyAssignedSeatTotal <= seatMinimum &&
+            newlyAssignedSeatTotal <= seatMinimum)
+        {
+            providerPlan.AllocatedSeats = newlyAssignedSeatTotal;
+
+            await providerPlanRepository.ReplaceAsync(providerPlan);
+        }
+        /*
+         * Below the limit => Above the limit:
+         * We have to scale the subscription up from the seat minimum to the newly assigned seat total.
+         */
+        else if (currentlyAssignedSeatTotal <= seatMinimum &&
+                 newlyAssignedSeatTotal > seatMinimum)
+        {
+            await update(
+                seatMinimum,
+                newlyAssignedSeatTotal);
+        }
+        /*
+         * Above the limit => Above the limit:
+         * We have to scale the subscription from the currently assigned seat total to the newly assigned seat total.
+         */
+        else if (currentlyAssignedSeatTotal > seatMinimum &&
+                 newlyAssignedSeatTotal > seatMinimum)
+        {
+            await update(
+                currentlyAssignedSeatTotal,
+                newlyAssignedSeatTotal);
+        }
+        /*
+         * Above the limit => Below the limit:
+         * We have to scale the subscription down from the currently assigned seat total to the seat minimum.
+         */
+        else if (currentlyAssignedSeatTotal > seatMinimum &&
+                 newlyAssignedSeatTotal <= seatMinimum)
+        {
+            await update(
+                currentlyAssignedSeatTotal,
+                seatMinimum);
+        }
+    }
+
+    private Func<int, int, Task> CurryUpdateFunction(
+        Provider provider,
+        ProviderPlan providerPlan,
+        int newlyAssignedSeats) => async (currentlySubscribedSeats, newlySubscribedSeats) =>
+    {
+        var plan = StaticStore.GetPlan(providerPlan.PlanType);
+
+        await paymentService.AdjustSeats(
+            provider,
+            plan,
+            currentlySubscribedSeats,
+            newlySubscribedSeats);
+
+        var newlyPurchasedSeats = newlySubscribedSeats > providerPlan.SeatMinimum
+            ? newlySubscribedSeats - providerPlan.SeatMinimum
+            : 0;
+
+        providerPlan.PurchasedSeats = newlyPurchasedSeats;
+        providerPlan.AllocatedSeats = newlyAssignedSeats;
+
+        await providerPlanRepository.ReplaceAsync(providerPlan);
+    };
+}

src/Core/Billing/Extensions/ServiceCollectionExtensions.cs

@@ -18,7 +18,9 @@ public static class ServiceCollectionExtensions
         // Commands
         services.AddTransient<IAssignSeatsToClientOrganizationCommand, AssignSeatsToClientOrganizationCommand>();
         services.AddTransient<ICancelSubscriptionCommand, CancelSubscriptionCommand>();
+        services.AddTransient<ICreateCustomerCommand, CreateCustomerCommand>();
         services.AddTransient<IRemovePaymentMethodCommand, RemovePaymentMethodCommand>();
+        services.AddTransient<IScaleSeatsCommand, ScaleSeatsCommand>();
         services.AddTransient<IStartSubscriptionCommand, StartSubscriptionCommand>();
     }
 }

src/Core/Billing/Models/ConfiguredProviderPlanDTO.cs

@@ -3,7 +3,7 @@ using Bit.Core.Enums;
 
 namespace Bit.Core.Billing.Models;
 
-public record ConfiguredProviderPlan(
+public record ConfiguredProviderPlanDTO(
     Guid Id,
     Guid ProviderId,
     PlanType PlanType,
@@ -11,9 +11,9 @@ public record ConfiguredProviderPlan(
     int PurchasedSeats,
     int AssignedSeats)
 {
-    public static ConfiguredProviderPlan From(ProviderPlan providerPlan) =>
+    public static ConfiguredProviderPlanDTO From(ProviderPlan providerPlan) =>
         providerPlan.IsConfigured()
-            ? new ConfiguredProviderPlan(
+            ? new ConfiguredProviderPlanDTO(
                 providerPlan.Id,
                 providerPlan.ProviderId,
                 providerPlan.PlanType,

src/Core/Billing/Models/ProviderSubscriptionDTO.cs

@@ -0,0 +1,7 @@
+using Stripe;
+
+namespace Bit.Core.Billing.Models;
+
+public record ProviderSubscriptionDTO(
+    List<ConfiguredProviderPlanDTO> ProviderPlans,
+    Subscription Subscription);

src/Core/Billing/Models/ProviderSubscriptionData.cs

@@ -1,7 +0,0 @@
-using Stripe;
-
-namespace Bit.Core.Billing.Models;
-
-public record ProviderSubscriptionData(
-    List<ConfiguredProviderPlan> ProviderPlans,
-    Subscription Subscription);

src/Core/Billing/Queries/IProviderBillingQueries.cs

@@ -21,7 +21,7 @@ public interface IProviderBillingQueries
     /// Retrieves a provider's billing subscription data.
     /// </summary>
     /// <param name="providerId">The ID of the provider to retrieve subscription data for.</param>
-    /// <returns>A <see cref="ProviderSubscriptionData"/> object containing the provider's Stripe <see cref="Stripe.Subscription"/> and their <see cref="ConfiguredProviderPlan"/>s.</returns>
+    /// <returns>A <see cref="ProviderSubscriptionDTO"/> object containing the provider's Stripe <see cref="Stripe.Subscription"/> and their <see cref="ConfiguredProviderPlanDTO"/>s.</returns>
     /// <remarks>This method opts for returning <see langword="null"/> rather than throwing exceptions, making it ideal for surfacing data from API endpoints.</remarks>
-    Task<ProviderSubscriptionData> GetSubscriptionData(Guid providerId);
+    Task<ProviderSubscriptionDTO> GetSubscriptionDTO(Guid providerId);
 }

src/Core/Billing/Queries/ISubscriberQueries.cs

@@ -6,6 +6,18 @@ namespace Bit.Core.Billing.Queries;
 
 public interface ISubscriberQueries
 {
+    /// <summary>
+    /// Retrieves a Stripe <see cref="Customer"/> using the <paramref name="subscriber"/>'s <see cref="ISubscriber.GatewayCustomerId"/> property.
+    /// </summary>
+    /// <param name="subscriber">The organization, provider or user to retrieve the customer for.</param>
+    /// <param name="customerGetOptions">Optional parameters that can be passed to Stripe to expand or modify the <see cref="Customer"/>.</param>
+    /// <returns>A Stripe <see cref="Customer"/>.</returns>
+    /// <exception cref="ArgumentNullException">Thrown when the <paramref name="subscriber"/> is <see langword="null"/>.</exception>
+    /// <remarks>This method opts for returning <see langword="null"/> rather than throwing exceptions, making it ideal for surfacing data from API endpoints.</remarks>
+    Task<Customer> GetCustomer(
+        ISubscriber subscriber,
+        CustomerGetOptions customerGetOptions = null);
+
     /// <summary>
     /// Retrieves a Stripe <see cref="Subscription"/> using the <paramref name="subscriber"/>'s <see cref="ISubscriber.GatewaySubscriptionId"/> property.
     /// </summary>
@@ -18,13 +30,29 @@ public interface ISubscriberQueries
         ISubscriber subscriber,
         SubscriptionGetOptions subscriptionGetOptions = null);
 
+    /// <summary>
+    /// Retrieves a Stripe <see cref="Customer"/> using the <paramref name="subscriber"/>'s <see cref="ISubscriber.GatewayCustomerId"/> property.
+    /// </summary>
+    /// <param name="subscriber">The organization or user to retrieve the subscription for.</param>
+    /// <param name="customerGetOptions">Optional parameters that can be passed to Stripe to expand or modify the <see cref="Customer"/>.</param>
+    /// <returns>A Stripe <see cref="Customer"/>.</returns>
+    /// <exception cref="ArgumentNullException">Thrown when the <paramref name="subscriber"/> is <see langword="null"/>.</exception>
+    /// <exception cref="GatewayException">Thrown when the subscriber's <see cref="ISubscriber.GatewayCustomerId"/> is <see langword="null"/> or empty.</exception>
+    /// <exception cref="GatewayException">Thrown when the <see cref="Customer"/> returned from Stripe's API is null.</exception>
+    Task<Customer> GetCustomerOrThrow(
+        ISubscriber subscriber,
+        CustomerGetOptions customerGetOptions = null);
+
     /// <summary>
     /// Retrieves a Stripe <see cref="Subscription"/> using the <paramref name="subscriber"/>'s <see cref="ISubscriber.GatewaySubscriptionId"/> property.
     /// </summary>
     /// <param name="subscriber">The organization or user to retrieve the subscription for.</param>
+    /// <param name="subscriptionGetOptions">Optional parameters that can be passed to Stripe to expand or modify the <see cref="Subscription"/>.</param>
     /// <returns>A Stripe <see cref="Subscription"/>.</returns>
     /// <exception cref="ArgumentNullException">Thrown when the <paramref name="subscriber"/> is <see langword="null"/>.</exception>
     /// <exception cref="GatewayException">Thrown when the subscriber's <see cref="ISubscriber.GatewaySubscriptionId"/> is <see langword="null"/> or empty.</exception>
     /// <exception cref="GatewayException">Thrown when the <see cref="Subscription"/> returned from Stripe's API is null.</exception>
-    Task<Subscription> GetSubscriptionOrThrow(ISubscriber subscriber);
+    Task<Subscription> GetSubscriptionOrThrow(
+        ISubscriber subscriber,
+        SubscriptionGetOptions subscriptionGetOptions = null);
 }

src/Core/Billing/Queries/Implementations/ProviderBillingQueries.cs

@@ -44,11 +44,11 @@ public class ProviderBillingQueries(
         var plan = StaticStore.GetPlan(planType);
 
         return providerOrganizations
-            .Where(providerOrganization => providerOrganization.Plan == plan.Name)
+            .Where(providerOrganization => providerOrganization.Plan == plan.Name && providerOrganization.Status == OrganizationStatusType.Managed)
             .Sum(providerOrganization => providerOrganization.Seats ?? 0);
     }
 
-    public async Task<ProviderSubscriptionData> GetSubscriptionData(Guid providerId)
+    public async Task<ProviderSubscriptionDTO> GetSubscriptionDTO(Guid providerId)
     {
         var provider = await providerRepository.GetByIdAsync(providerId);
 
@@ -82,10 +82,10 @@ public class ProviderBillingQueries(
 
         var configuredProviderPlans = providerPlans
             .Where(providerPlan => providerPlan.IsConfigured())
-            .Select(ConfiguredProviderPlan.From)
+            .Select(ConfiguredProviderPlanDTO.From)
             .ToList();
 
-        return new ProviderSubscriptionData(
+        return new ProviderSubscriptionDTO(
             configuredProviderPlans,
             subscription);
     }

src/Core/Billing/Queries/Implementations/SubscriberQueries.cs

@@ -11,6 +11,31 @@ public class SubscriberQueries(
     ILogger<SubscriberQueries> logger,
     IStripeAdapter stripeAdapter) : ISubscriberQueries
 {
+    public async Task<Customer> GetCustomer(
+        ISubscriber subscriber,
+        CustomerGetOptions customerGetOptions = null)
+    {
+        ArgumentNullException.ThrowIfNull(subscriber);
+
+        if (string.IsNullOrEmpty(subscriber.GatewayCustomerId))
+        {
+            logger.LogError("Cannot retrieve customer for subscriber ({SubscriberID}) with no {FieldName}", subscriber.Id, nameof(subscriber.GatewayCustomerId));
+
+            return null;
+        }
+
+        var customer = await stripeAdapter.CustomerGetAsync(subscriber.GatewayCustomerId, customerGetOptions);
+
+        if (customer != null)
+        {
+            return customer;
+        }
+
+        logger.LogError("Could not find Stripe customer ({CustomerID}) for subscriber ({SubscriberID})", subscriber.GatewayCustomerId, subscriber.Id);
+
+        return null;
+    }
+
     public async Task<Subscription> GetSubscription(
         ISubscriber subscriber,
         SubscriptionGetOptions subscriptionGetOptions = null)
@@ -19,7 +44,7 @@ public class SubscriberQueries(
 
         if (string.IsNullOrEmpty(subscriber.GatewaySubscriptionId))
         {
-            logger.LogError("Cannot cancel subscription for subscriber ({ID}) with no GatewaySubscriptionId.", subscriber.Id);
+            logger.LogError("Cannot retrieve subscription for subscriber ({SubscriberID}) with no {FieldName}", subscriber.Id, nameof(subscriber.GatewaySubscriptionId));
 
             return null;
         }
@@ -31,30 +56,57 @@ public class SubscriberQueries(
             return subscription;
         }
 
-        logger.LogError("Could not find Stripe subscription ({ID}) to cancel.", subscriber.GatewaySubscriptionId);
+        logger.LogError("Could not find Stripe subscription ({SubscriptionID}) for subscriber ({SubscriberID})", subscriber.GatewaySubscriptionId, subscriber.Id);
 
         return null;
     }
 
-    public async Task<Subscription> GetSubscriptionOrThrow(ISubscriber subscriber)
+    public async Task<Subscription> GetSubscriptionOrThrow(
+        ISubscriber subscriber,
+        SubscriptionGetOptions subscriptionGetOptions = null)
     {
         ArgumentNullException.ThrowIfNull(subscriber);
 
         if (string.IsNullOrEmpty(subscriber.GatewaySubscriptionId))
         {
-            logger.LogError("Cannot cancel subscription for subscriber ({ID}) with no GatewaySubscriptionId.", subscriber.Id);
+            logger.LogError("Cannot retrieve subscription for subscriber ({SubscriberID}) with no {FieldName}", subscriber.Id, nameof(subscriber.GatewaySubscriptionId));
 
             throw ContactSupport();
         }
 
-        var subscription = await stripeAdapter.SubscriptionGetAsync(subscriber.GatewaySubscriptionId);
+        var subscription = await stripeAdapter.SubscriptionGetAsync(subscriber.GatewaySubscriptionId, subscriptionGetOptions);
 
         if (subscription != null)
         {
             return subscription;
         }
 
-        logger.LogError("Could not find Stripe subscription ({ID}) to cancel.", subscriber.GatewaySubscriptionId);
+        logger.LogError("Could not find Stripe subscription ({SubscriptionID}) for subscriber ({SubscriberID})", subscriber.GatewaySubscriptionId, subscriber.Id);
+
+        throw ContactSupport();
+    }
+
+    public async Task<Customer> GetCustomerOrThrow(
+        ISubscriber subscriber,
+        CustomerGetOptions customerGetOptions = null)
+    {
+        ArgumentNullException.ThrowIfNull(subscriber);
+
+        if (string.IsNullOrEmpty(subscriber.GatewayCustomerId))
+        {
+            logger.LogError("Cannot retrieve customer for subscriber ({SubscriberID}) with no {FieldName}", subscriber.Id, nameof(subscriber.GatewayCustomerId));
+
+            throw ContactSupport();
+        }
+
+        var customer = await stripeAdapter.CustomerGetAsync(subscriber.GatewayCustomerId, customerGetOptions);
+
+        if (customer != null)
+        {
+            return customer;
+        }
+
+        logger.LogError("Could not find Stripe customer ({CustomerID}) for subscriber ({SubscriberID})", subscriber.GatewayCustomerId, subscriber.Id);
 
         throw ContactSupport();
     }