Billing/pm 11728/wip

bitwarden_license/src/Commercial.Core/AdminConsole/Services/ProviderService.cs

@@ -551,7 +551,7 @@ public async Task<ProviderOrganization> CreateOrganizationAsync(Guid providerId,
 
         var (organization, _, defaultCollection) = consolidatedBillingEnabled
             ? await _organizationService.SignupClientAsync(organizationSignup)
-            : await _organizationService.SignUpAsync(organizationSignup, true);
+            : await _organizationService.SignUpAsync(organizationSignup);
 
         var providerOrganization = new ProviderOrganization
         {

bitwarden_license/test/Commercial.Core.Test/AdminConsole/Services/ProviderServiceTests.cs

@@ -667,7 +667,7 @@ public async Task CreateOrganizationAsync_Success(Provider provider, Organizatio
 
         sutProvider.GetDependency<IProviderRepository>().GetByIdAsync(provider.Id).Returns(provider);
         var providerOrganizationRepository = sutProvider.GetDependency<IProviderOrganizationRepository>();
-        sutProvider.GetDependency<IOrganizationService>().SignUpAsync(organizationSignup, true)
+        sutProvider.GetDependency<IOrganizationService>().SignUpAsync(organizationSignup)
             .Returns((organization, null as OrganizationUser, new Collection()));
 
         var providerOrganization =
@@ -775,7 +775,7 @@ public async Task CreateOrganizationAsync_SetsAccessAllToFalse
 
         sutProvider.GetDependency<IProviderRepository>().GetByIdAsync(provider.Id).Returns(provider);
         var providerOrganizationRepository = sutProvider.GetDependency<IProviderOrganizationRepository>();
-        sutProvider.GetDependency<IOrganizationService>().SignUpAsync(organizationSignup, true)
+        sutProvider.GetDependency<IOrganizationService>().SignUpAsync(organizationSignup)
             .Returns((organization, null as OrganizationUser, defaultCollection));
 
         var providerOrganization =

src/Api/AdminConsole/Controllers/ProviderOrganizationsController.cs

@@ -84,6 +84,7 @@
         }
 
         var organizationSignup = model.OrganizationCreateRequest.ToOrganizationSignup(user);
+        organizationSignup.IsFromProvider = true;
         var result = await _providerService.CreateOrganizationAsync(providerId, organizationSignup, model.ClientOwnerEmail, user);
         return new ProviderOrganizationResponseModel(result);
     }

src/Api/Billing/Controllers/OrganizationBillingController.cs

@@ -182,11 +182,9 @@
 
         var tokenizedPaymentSource = requestBody.PaymentSource.ToDomain();
 
-        await subscriberService.UpdatePaymentSource(organization, tokenizedPaymentSource);
-
         var taxInformation = requestBody.TaxInformation.ToDomain();
 
-        await subscriberService.UpdateTaxInformation(organization, taxInformation);
+        await organizationBillingService.UpdatePaymentMethod(organization, tokenizedPaymentSource, taxInformation);
 
         return TypedResults.Ok();
     }

src/Api/Billing/Controllers/ProviderClientsController.cs

@@ -52,7 +52,8 @@ public async Task<IResult> CreateAsync(
             OwnerKey = requestBody.Key,
             PublicKey = requestBody.KeyPair.PublicKey,
             PrivateKey = requestBody.KeyPair.EncryptedPrivateKey,
-            CollectionName = requestBody.CollectionName
+            CollectionName = requestBody.CollectionName,
+            IsFromProvider = true
         };
 
         var providerOrganization = await providerService.CreateOrganizationAsync(

src/Core/AdminConsole/Services/IOrganizationService.cs

@@ -25,7 +25,7 @@ Task ReplacePaymentMethodAsync(Guid organizationId, string paymentToken, Payment
     /// </summary>
     /// <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)> SignUpAsync(OrganizationSignup organizationSignup);
 
     Task<(Organization organization, OrganizationUser organizationUser, Collection defaultCollection)> SignupClientAsync(OrganizationSignup signup);
 #nullable disable

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

@@ -15,6 +15,7 @@
 using Bit.Core.Auth.Repositories;
 using Bit.Core.Auth.UserFeatures.TwoFactorAuth.Interfaces;
 using Bit.Core.Billing.Enums;
+using Bit.Core.Billing.Models.Sales;
 using Bit.Core.Billing.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
@@ -502,24 +503,23 @@
     /// <summary>
     /// Create a new organization in a cloud environment
     /// </summary>
-    public async Task<(Organization organization, OrganizationUser organizationUser, Collection defaultCollection)> SignUpAsync(OrganizationSignup signup,
-        bool provider = false)
+    public async Task<(Organization organization, OrganizationUser organizationUser, Collection defaultCollection)> SignUpAsync(OrganizationSignup signup)
     {
         var plan = StaticStore.GetPlan(signup.Plan);
 
         ValidatePasswordManagerPlan(plan, signup);
 
         if (signup.UseSecretsManager)
         {
-            if (provider)
+            if (signup.IsFromProvider)
             {
                 throw new BadRequestException(
                     "Organizations with a Managed Service Provider do not support Secrets Manager.");
             }
             ValidateSecretsManagerPlan(plan, signup);
         }
 
-        if (!provider)
+        if (!signup.IsFromProvider)
         {
             await ValidateSignUpPoliciesAsync(signup.Owner.Id);
         }
@@ -570,7 +570,7 @@
                                              signup.AdditionalServiceAccounts.GetValueOrDefault();
         }
 
-        if (plan.Type == PlanType.Free && !provider)
+        if (plan.Type == PlanType.Free && !signup.IsFromProvider)
         {
             var adminCount =
                 await _organizationUserRepository.GetCountByFreeOrganizationAdminUserAsync(signup.Owner.Id);
@@ -585,20 +585,19 @@
 
             if (deprecateStripeSourcesAPI)
             {
-                var subscriptionPurchase = signup.ToSubscriptionPurchase(provider);
-
-                await _organizationBillingService.PurchaseSubscription(organization, subscriptionPurchase);
+                var sale = BitwardenOrganizationSale.From(organization, signup);
+                await _organizationBillingService.Finalize(sale);
             }
             else
             {
                 await _paymentService.PurchaseOrganizationAsync(organization, signup.PaymentMethodType.Value,
                     signup.PaymentToken, plan, signup.AdditionalStorageGb, signup.AdditionalSeats,
-                    signup.PremiumAccessAddon, signup.TaxInfo, provider, signup.AdditionalSmSeats.GetValueOrDefault(),
+                    signup.PremiumAccessAddon, signup.TaxInfo, signup.IsFromProvider, signup.AdditionalSmSeats.GetValueOrDefault(),
                     signup.AdditionalServiceAccounts.GetValueOrDefault(), signup.IsFromSecretsManagerTrial);
             }
         }
 
-        var ownerId = provider ? default : signup.Owner.Id;
+        var ownerId = signup.IsFromProvider ? default : signup.Owner.Id;
         var returnValue = await SignUpAsync(organization, ownerId, signup.OwnerKey, signup.CollectionName, true);
         await _referenceEventService.RaiseEventAsync(
             new ReferenceEvent(ReferenceEventType.Signup, organization, _currentContext)

src/Core/Billing/Models/Sales/BitwardenOrganizationSale.cs

@@ -0,0 +1,101 @@
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Constants;
+using Bit.Core.Models.Business;
+
+namespace Bit.Core.Billing.Models.Sales;
+
+#nullable enable
+
+public class BitwardenOrganizationSale
+{
+    private BitwardenOrganizationSale() {}
+
+    public void Deconstruct(
+        out Organization organization,
+        out CustomerSetup? customerSetup,
+        out SubscriptionSetup subscriptionSetup)
+    {
+        organization = Organization;
+        customerSetup = CustomerSetup;
+        subscriptionSetup = SubscriptionSetup;
+    }
+
+    public required Organization Organization { get; set; }
+    public CustomerSetup? CustomerSetup { get; set; }
+    public required SubscriptionSetup SubscriptionSetup { get; set; }
+
+    public static BitwardenOrganizationSale From(
+        Organization organization,
+        OrganizationSignup signup) => new ()
+    {
+        Organization = organization,
+        CustomerSetup = string.IsNullOrEmpty(organization.GatewayCustomerId) ? GetCustomerSetup(signup) : null,
+        SubscriptionSetup = GetSubscriptionSetup(signup)
+    };
+
+    public static BitwardenOrganizationSale From(
+        Organization organization,
+        OrganizationUpgrade upgrade) => new()
+    {
+        Organization = organization,
+        SubscriptionSetup = GetSubscriptionSetup(upgrade)
+    };
+
+    private static CustomerSetup? GetCustomerSetup(OrganizationSignup signup)
+    {
+        if (!signup.PaymentMethodType.HasValue)
+        {
+            return null;
+        }
+
+        var tokenizedPaymentSource = new TokenizedPaymentSource(
+            signup.PaymentMethodType!.Value,
+            signup.PaymentToken);
+
+        var taxInformation = new TaxInformation(
+            signup.TaxInfo.BillingAddressCountry,
+            signup.TaxInfo.BillingAddressPostalCode,
+            signup.TaxInfo.TaxIdNumber,
+            signup.TaxInfo.BillingAddressLine1,
+            signup.TaxInfo.BillingAddressLine2,
+            signup.TaxInfo.BillingAddressCity,
+            signup.TaxInfo.BillingAddressState);
+
+        var coupon = signup.IsFromProvider
+            ? StripeConstants.CouponIDs.MSPDiscount35
+            : signup.IsFromSecretsManagerTrial
+                ? StripeConstants.CouponIDs.SecretsManagerStandalone
+                : null;
+
+        return new CustomerSetup
+        {
+            TokenizedPaymentSource = tokenizedPaymentSource, TaxInformation = taxInformation, Coupon = coupon
+        };
+    }
+
+    private static SubscriptionSetup GetSubscriptionSetup(OrganizationUpgrade upgrade)
+    {
+        var plan = Core.Utilities.StaticStore.GetPlan(upgrade.Plan);
+
+        var passwordManagerOptions = new SubscriptionSetup.PasswordManager
+        {
+            Seats = upgrade.AdditionalSeats,
+            Storage = upgrade.AdditionalStorageGb,
+            PremiumAccess = upgrade.PremiumAccessAddon
+        };
+
+        var secretsManagerOptions = upgrade.UseSecretsManager
+            ? new SubscriptionSetup.SecretsManager
+            {
+                Seats = upgrade.AdditionalSmSeats ?? 0, ServiceAccounts = upgrade.AdditionalServiceAccounts
+            }
+            : null;
+
+        return new SubscriptionSetup
+        {
+            Plan = plan,
+            PasswordManagerOptions = passwordManagerOptions,
+            SecretsManagerOptions = secretsManagerOptions
+        };
+    }
+}

src/Core/Billing/Models/Sales/CustomerSetup.cs

@@ -0,0 +1,10 @@
+namespace Bit.Core.Billing.Models.Sales;
+
+#nullable enable
+
+public class CustomerSetup
+{
+    public required TokenizedPaymentSource TokenizedPaymentSource { get; set; }
+    public required TaxInformation TaxInformation { get; set; }
+    public string? Coupon { get; set; }
+}

src/Core/Billing/Models/Sales/SubscriptionSetup.cs

@@ -0,0 +1,25 @@
+using Bit.Core.Models.StaticStore;
+
+namespace Bit.Core.Billing.Models.Sales;
+
+#nullable enable
+
+public class SubscriptionSetup
+{
+    public required Plan Plan { get; set; }
+    public required PasswordManager PasswordManagerOptions { get; set; }
+    public SecretsManager? SecretsManagerOptions { get; set; }
+
+    public class PasswordManager
+    {
+        public required int Seats { get; set; }
+        public short? Storage { get; set; }
+        public bool? PremiumAccess { get; set; }
+    }
+
+    public class SecretsManager
+    {
+        public required int Seats { get; set; }
+        public int? ServiceAccounts { get; set; }
+    }
+}

src/Core/Billing/Models/StaticStore/Plan.cs

@@ -34,6 +34,9 @@ public abstract record Plan
     public SecretsManagerPlanFeatures SecretsManager { get; protected init; }
     public bool SupportsSecretsManager => SecretsManager != null;
 
+    public bool HasNonSeatBasedPasswordManagerPlan() =>
+        PasswordManager is { StripePlanId: not null and not "", StripeSeatPlanId: null or "" };
+
     public record SecretsManagerPlanFeatures
     {
         // Service accounts

src/Core/Billing/Models/TaxInformation.cs

@@ -1,4 +1,6 @@
-namespace Bit.Core.Billing.Models;
+using Stripe;
+
+namespace Bit.Core.Billing.Models;
 
 public record TaxInformation(
     string Country,
@@ -9,7 +11,26 @@
     string City,
     string State)
 {
+    public (AddressOptions, List<CustomerTaxIdDataOptions>) GetStripeOptions()
+    {
+        var address = new AddressOptions
+        {
+            Country = Country,
+            PostalCode = PostalCode,
+            Line1 = Line1,
+            Line2 = Line2,
+            City = City,
+            State = State
+        };
+
+        var customerTaxIdDataOptionsList = !string.IsNullOrEmpty(TaxId)
+            ? new List<CustomerTaxIdDataOptions> { new() { Type = GetTaxIdType(), Value = TaxId } }
+            : null;
+
+        return (address, customerTaxIdDataOptionsList);
+    }
+
     public string GetTaxIdType()
     {
         if (string.IsNullOrEmpty(Country) || string.IsNullOrEmpty(TaxId))
         {

src/Core/Billing/Services/IOrganizationBillingService.cs

@@ -1,10 +1,29 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Models;
+using Bit.Core.Billing.Models.Sales;
 
 namespace Bit.Core.Billing.Services;
 
 public interface IOrganizationBillingService
 {
+    /// <summary>
+    /// <para>Establishes the billing configuration for a Bitwarden <see cref="Organization"/> using the provided <paramref name="sale"/>.</para>
+    /// <para>
+    /// The method first checks to see if the
+    /// provided <see cref="BitwardenOrganizationSale.Organization"/> already has a Stripe <see cref="Stripe.Customer"/> using the <see cref="Organization.GatewayCustomerId"/>.
+    /// If it doesn't, the method creates one using the <paramref name="sale"/>'s <see cref="BitwardenOrganizationSale.CustomerSetup"/>. The method then creates a Stripe <see cref="Stripe.Subscription"/>
+    /// for the created or existing customer using the provided <see cref="BitwardenOrganizationSale.SubscriptionSetup"/>.
+    /// </para>
+    /// </summary>
+    /// <param name="sale">The purchase details necessary to establish the Stripe entities responsible for billing the organization.</param>
+    /// <example>
+    /// <code>
+    /// var sale = BitwardenOrganizationSale.From(organization, organizationSignup);
+    /// await organizationBillingService.Finalize(sale);
+    /// </code>
+    /// </example>
+    Task Finalize(BitwardenOrganizationSale sale);
+
     /// <summary>
     /// Retrieve metadata about the organization represented bsy the provided <paramref name="organizationId"/>.
     /// </summary>
@@ -13,11 +32,15 @@ public interface IOrganizationBillingService
     Task<OrganizationMetadata> GetMetadata(Guid organizationId);
 
     /// <summary>
-    /// Purchase a subscription for the provided <paramref name="organization"/> using the provided <paramref name="organizationSubscriptionPurchase"/>.
-    /// If successful, a Stripe <see cref="Stripe.Customer"/> and <see cref="Stripe.Subscription"/> will be created for the organization and the
-    /// organization will be enabled.
+    /// Updates the provided <paramref name="organization"/>'s payment source and tax information.
+    /// If the <paramref name="organization"/> does not have a Stripe <see cref="Stripe.Customer"/>, this method will create one using the provided
+    /// <paramref name="tokenizedPaymentSource"/> and <paramref name="taxInformation"/>.
     /// </summary>
-    /// <param name="organization">The organization to purchase a subscription for.</param>
-    /// <param name="organizationSubscriptionPurchase">The purchase information for the organization's subscription.</param>
-    Task PurchaseSubscription(Organization organization, OrganizationSubscriptionPurchase organizationSubscriptionPurchase);
+    /// <param name="organization">The <paramref name="organization"/> to update the payment source and tax information for.</param>
+    /// <param name="tokenizedPaymentSource">The tokenized payment source (ex. Credit Card) to attach to the <paramref name="organization"/>.</param>
+    /// <param name="taxInformation">The <paramref name="organization"/>'s updated tax information.</param>
+    Task UpdatePaymentMethod(
+        Organization organization,
+        TokenizedPaymentSource tokenizedPaymentSource,
+        TaxInformation taxInformation);
 }