[AC-1449] Secrets Manager subscription Stripe Integration

src/Api/Controllers/OrganizationsController.cs

@@ -18,6 +18,8 @@
 using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces;
+using Bit.Core.OrganizationFeatures.OrganizationPlanUpgrade.Interface;
+using Bit.Core.OrganizationFeatures.OrganizationSignUp.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
@@ -50,6 +52,8 @@ public class OrganizationsController : Controller
     private readonly IFeatureService _featureService;
     private readonly GlobalSettings _globalSettings;
     private readonly ILicensingService _licensingService;
+    private readonly IOrganizationSignUpCommand _organizationSignUpCommand;
+    private readonly IOrganizationUpgradePlanCommand _organizationUpgradePlanCommand;
 
     public OrganizationsController(
         IOrganizationRepository organizationRepository,
@@ -70,7 +74,9 @@ public OrganizationsController(
         ICloudGetOrganizationLicenseQuery cloudGetOrganizationLicenseQuery,
         IFeatureService featureService,
         GlobalSettings globalSettings,
-        ILicensingService licensingService)
+        ILicensingService licensingService,
+        IOrganizationSignUpCommand organizationSignUpCommand,
+        IOrganizationUpgradePlanCommand organizationUpgradePlanCommand)
     {
         _organizationRepository = organizationRepository;
         _organizationUserRepository = organizationUserRepository;
@@ -91,6 +97,8 @@ public OrganizationsController(
         _featureService = featureService;
         _globalSettings = globalSettings;
         _licensingService = licensingService;
+        _organizationSignUpCommand = organizationSignUpCommand;
+        _organizationUpgradePlanCommand = organizationUpgradePlanCommand;
     }
 
     [HttpGet("{id}")]
@@ -241,7 +249,12 @@ public async Task<OrganizationResponseModel> Post([FromBody] OrganizationCreateR
         }
 
         var organizationSignup = model.ToOrganizationSignup(user);
-        var result = await _organizationService.SignUpAsync(organizationSignup);
+
+        var result = !_featureService.IsEnabled(FeatureFlagKeys.SecretManagerGaBilling, _currentContext) &&
+                     !model.UseSecretsManager
+            ? await _organizationService.SignUpAsync(organizationSignup)
+            : await _organizationSignUpCommand.SignUpAsync(organizationSignup);
+
         return new OrganizationResponseModel(result.Item1);
     }
 
@@ -306,7 +319,11 @@ public async Task<PaymentResponseModel> PostUpgrade(string id, [FromBody] Organi
             throw new NotFoundException();
         }
 
-        var result = await _organizationService.UpgradePlanAsync(orgIdGuid, model.ToOrganizationUpgrade());
+        var result = !_featureService.IsEnabled(FeatureFlagKeys.SecretManagerGaBilling, _currentContext) &&
+                     !model.UseSecretsManager
+            ? await _organizationService.UpgradePlanAsync(orgIdGuid, model.ToOrganizationUpgrade())
+            : await _organizationUpgradePlanCommand.UpgradePlanAsync(orgIdGuid, model.ToOrganizationUpgrade());
+
         return new PaymentResponseModel { Success = result.Item1, PaymentIntentClientSecret = result.Item2 };
     }
 
@@ -487,7 +504,7 @@ public async Task<ApiKeyResponseModel> ApiKey(string id, [FromBody] Organization
         if (model.Type == OrganizationApiKeyType.BillingSync || model.Type == OrganizationApiKeyType.Scim)
         {
             // Non-enterprise orgs should not be able to create or view an apikey of billing sync/scim key types
-            var plan = StaticStore.GetPlan(organization.PlanType);
+            var plan = StaticStore.GetPasswordManagerPlan(organization.PlanType);
             if (plan.Product != ProductType.Enterprise)
             {
                 throw new NotFoundException();

src/Api/Controllers/PlansController.cs

@@ -19,12 +19,30 @@ public PlansController(ITaxRateRepository taxRateRepository)
     [HttpGet("")]
     [AllowAnonymous]
     public ListResponseModel<PlanResponseModel> Get()
+    {
+        var data = StaticStore.PasswordManagerPlans;
+        var responses = data.Select(plan => new PlanResponseModel(plan));
+        return new ListResponseModel<PlanResponseModel>(responses);
+    }
+
+    [HttpGet("all")]
+    [AllowAnonymous]
+    public ListResponseModel<PlanResponseModel> GetAllPlans()
     {
         var data = StaticStore.Plans;
         var responses = data.Select(plan => new PlanResponseModel(plan));
         return new ListResponseModel<PlanResponseModel>(responses);
     }
 
+    [HttpGet("sm-plans")]
+    [AllowAnonymous]
+    public ListResponseModel<PlanResponseModel> GetSecretsManagerPlans()
+    {
+        var data = StaticStore.SecretManagerPlans;
+        var responses = data.Select(plan => new PlanResponseModel(plan));
+        return new ListResponseModel<PlanResponseModel>(responses);
+    }
+
     [HttpGet("sales-tax-rates")]
     public async Task<ListResponseModel<TaxRateResponseModel>> GetTaxRates()
     {

src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs

@@ -40,6 +40,12 @@ public class OrganizationCreateRequestModel : IValidatableObject
     [StringLength(2)]
     public string BillingAddressCountry { get; set; }
     public int? MaxAutoscaleSeats { get; set; }
+    [Range(0, int.MaxValue)]
+    public int? AdditionalSmSeats { get; set; }
+    [Range(0, int.MaxValue)]
+    public int? AdditionalServiceAccount { get; set; }
+    [Required]
+    public bool UseSecretsManager { get; set; }
 
     public virtual OrganizationSignup ToOrganizationSignup(User user)
     {
@@ -58,6 +64,9 @@ public virtual OrganizationSignup ToOrganizationSignup(User user)
             BillingEmail = BillingEmail,
             BusinessName = BusinessName,
             CollectionName = CollectionName,
+            AdditionalSmSeats = AdditionalSmSeats.GetValueOrDefault(0),
+            AdditionalServiceAccount = AdditionalServiceAccount.GetValueOrDefault(0),
+            UseSecretsManager = UseSecretsManager,
             TaxInfo = new TaxInfo
             {
                 TaxIdNumber = TaxIdNumber,

src/Api/Models/Request/Organizations/OrganizationUpgradeRequestModel.cs

@@ -13,7 +13,13 @@ public class OrganizationUpgradeRequestModel
     public int AdditionalSeats { get; set; }
     [Range(0, 99)]
     public short? AdditionalStorageGb { get; set; }
+    [Range(0, int.MaxValue)]
+    public int? AdditionalSmSeats { get; set; }
+    [Range(0, int.MaxValue)]
+    public int? AdditionalServiceAccount { get; set; }
     public bool PremiumAccessAddon { get; set; }
+    [Required]
+    public bool UseSecretsManager { get; set; }
     public string BillingAddressCountry { get; set; }
     public string BillingAddressPostalCode { get; set; }
     public OrganizationKeysRequestModel Keys { get; set; }
@@ -24,6 +30,9 @@ public OrganizationUpgrade ToOrganizationUpgrade()
         {
             AdditionalSeats = AdditionalSeats,
             AdditionalStorageGb = AdditionalStorageGb.GetValueOrDefault(),
+            AdditionalServiceAccount = AdditionalServiceAccount.GetValueOrDefault(0),
+            AdditionalSmSeats = AdditionalSmSeats.GetValueOrDefault(0),
+            UseSecretsManager = UseSecretsManager,
             BusinessName = BusinessName,
             Plan = PlanType,
             PremiumAccessAddon = PremiumAccessAddon,

src/Api/Models/Response/Organizations/OrganizationResponseModel.cs

@@ -26,7 +26,7 @@ public OrganizationResponseModel(Organization organization, string obj = "organi
         BusinessCountry = organization.BusinessCountry;
         BusinessTaxNumber = organization.BusinessTaxNumber;
         BillingEmail = organization.BillingEmail;
-        Plan = new PlanResponseModel(StaticStore.Plans.FirstOrDefault(plan => plan.Type == organization.PlanType));
+        Plan = new PlanResponseModel(StaticStore.PasswordManagerPlans.FirstOrDefault(plan => plan.Type == organization.PlanType));
         PlanType = organization.PlanType;
         Seats = organization.Seats;
         MaxAutoscaleSeats = organization.MaxAutoscaleSeats;

src/Api/Models/Response/ProfileOrganizationResponseModel.cs

@@ -54,7 +54,7 @@ public ProfileOrganizationResponseModel(OrganizationUserOrganizationDetails orga
         FamilySponsorshipAvailable = FamilySponsorshipFriendlyName == null &&
             StaticStore.GetSponsoredPlan(PlanSponsorshipType.FamiliesForEnterprise)
             .UsersCanSponsor(organization);
-        PlanProductType = StaticStore.GetPlan(organization.PlanType).Product;
+        PlanProductType = StaticStore.GetPasswordManagerPlan(organization.PlanType).Product;
         FamilySponsorshipLastSyncDate = organization.FamilySponsorshipLastSyncDate;
         FamilySponsorshipToDelete = organization.FamilySponsorshipToDelete;
         FamilySponsorshipValidUntil = organization.FamilySponsorshipValidUntil;

src/Api/Models/Response/ProfileProviderOrganizationResponseModel.cs

@@ -42,6 +42,6 @@ public ProfileProviderOrganizationResponseModel(ProviderUserOrganizationDetails
         UserId = organization.UserId?.ToString();
         ProviderId = organization.ProviderId?.ToString();
         ProviderName = organization.ProviderName;
-        PlanProductType = StaticStore.GetPlan(organization.PlanType).Product;
+        PlanProductType = StaticStore.GetPasswordManagerPlan(organization.PlanType).Product;
     }
 }

src/Billing/Controllers/StripeController.cs

@@ -417,7 +417,7 @@ await _transactionRepository.CreateAsync(new Transaction
                     // org
                     if (ids.Item1.HasValue)
                     {
-                        if (subscription.Items.Any(i => StaticStore.Plans.Any(p => p.StripePlanId == i.Plan.Id)))
+                        if (subscription.Items.Any(i => StaticStore.PasswordManagerPlans.Any(p => p.StripePlanId == i.Plan.Id)))
                         {
                             await _organizationService.EnableAsync(ids.Item1.Value, subscription.CurrentPeriodEnd);
 

src/Core/Constants.cs

@@ -36,6 +36,7 @@ public static class FeatureFlagKeys
     public const string DisplayEuEnvironment = "display-eu-environment";
     public const string DisplayLowKdfIterationWarning = "display-kdf-iteration-warning";
     public const string TrustedDeviceEncryption = "trusted-device-encryption";
+    public const string SecretManagerGaBilling = "sm-ga-billing";
 
     public static List<string> GetAllKeys()
     {

src/Core/Enums/BitwardenProductType..cs

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Bit.Core.Enums;
+
+public enum BitwardenProductType : byte
+{
+    [Display(Name = "Password Manager")]
+    PasswordManager = 0,
+    [Display(Name = "Secrets Manager")]
+    SecretsManager = 1,
+}

src/Core/Models/Business/OrganizationUpgrade.cs

@@ -12,4 +12,7 @@ public class OrganizationUpgrade
     public TaxInfo TaxInfo { get; set; }
     public string PublicKey { get; set; }
     public string PrivateKey { get; set; }
+    public int? AdditionalSmSeats { get; set; }
+    public int? AdditionalServiceAccount { get; set; }
+    public bool UseSecretsManager { get; set; }
 }

src/Core/Models/Business/SubscriptionCreateOptions.cs

@@ -1,4 +1,5 @@
 using Bit.Core.Entities;
+using Bit.Core.Enums;
 using Stripe;
 
 namespace Bit.Core.Models.Business;
@@ -54,6 +55,80 @@ public OrganizationSubscriptionOptionsBase(Organization org, StaticStore.Plan pl
             DefaultTaxRates = new List<string> { taxInfo.StripeTaxRateId };
         }
     }
+
+    public OrganizationSubscriptionOptionsBase(Organization org, IEnumerable<StaticStore.Plan> plans, TaxInfo taxInfo, int additionalSeats
+        , int additionalStorageGb, bool premiumAccessAddon, int additionalSmSeats = 0, int additionalServiceAccount = 0)
+    {
+        Items = new List<SubscriptionItemOptions>();
+        Metadata = new Dictionary<string, string>
+        {
+            [org.GatewayIdField()] = org.Id.ToString()
+        };
+
+        foreach (var plan in plans)
+        {
+            if (plan.StripePlanId != null)
+            {
+                Items.Add(new SubscriptionItemOptions
+                {
+                    Plan = plan.StripePlanId,
+                    Quantity = 1
+                });
+            }
+
+            if (additionalSeats > 0 && plan.StripeSeatPlanId != null && plan.BitwardenProduct == BitwardenProductType.PasswordManager)
+            {
+                Items.Add(new SubscriptionItemOptions
+                {
+                    Plan = plan.StripeSeatPlanId,
+                    Quantity = additionalSeats
+                });
+            }
+
+            if (additionalStorageGb > 0 && plan.BitwardenProduct == BitwardenProductType.PasswordManager)
+            {
+                Items.Add(new SubscriptionItemOptions
+                {
+                    Plan = plan.StripeStoragePlanId,
+                    Quantity = additionalStorageGb
+                });
+            }
+
+            if (additionalSmSeats > 0 && plan.StripePlanId != null && plan.BitwardenProduct == BitwardenProductType.SecretsManager)
+            {
+                Items.Add(new SubscriptionItemOptions
+                {
+                    Plan = plan.StripePlanId,
+                    Quantity = additionalSmSeats
+                });
+            }
+
+            if (additionalServiceAccount > 0 && plan.StripePlanId != null && plan.BitwardenProduct == BitwardenProductType.SecretsManager)
+            {
+                Items.Add(new SubscriptionItemOptions
+                {
+                    Plan = plan.StripePlanId,
+                    Quantity = additionalServiceAccount
+                });
+            }
+
+            if (premiumAccessAddon && plan.StripePremiumAccessPlanId != null && plan.BitwardenProduct == BitwardenProductType.PasswordManager)
+            {
+                Items.Add(new SubscriptionItemOptions
+                {
+                    Plan = plan.StripePremiumAccessPlanId,
+                    Quantity = 1
+                });
+            }
+        }
+
+
+        if (!string.IsNullOrWhiteSpace(taxInfo?.StripeTaxRateId))
+        {
+            DefaultTaxRates = new List<string> { taxInfo.StripeTaxRateId };
+        }
+
+    }
 }
 
 public class OrganizationPurchaseSubscriptionOptions : OrganizationSubscriptionOptionsBase
@@ -67,6 +142,15 @@ public OrganizationPurchaseSubscriptionOptions(
         OffSession = true;
         TrialPeriodDays = plan.TrialPeriodDays;
     }
+
+    public OrganizationPurchaseSubscriptionOptions(Organization org, IEnumerable<StaticStore.Plan> plans, TaxInfo taxInfo, int additionalSeats = 0
+        , int additionalStorageGb = 0, bool premiumAccessAddon = false
+        , int additionalSmSeats = 0, int additionalServiceAccount = 0) :
+        base(org, plans, taxInfo, additionalSeats, additionalStorageGb, premiumAccessAddon, additionalSmSeats, additionalServiceAccount)
+    {
+        OffSession = true;
+        TrialPeriodDays = plans.FirstOrDefault().TrialPeriodDays;
+    }
 }
 
 public class OrganizationUpgradeSubscriptionOptions : OrganizationSubscriptionOptionsBase

src/Core/Models/StaticStore/Plan.cs

@@ -52,4 +52,9 @@ public class Plan
     public decimal SeatPrice { get; set; }
     public decimal AdditionalStoragePricePerGb { get; set; }
     public decimal PremiumAccessOptionPrice { get; set; }
+    public decimal? AdditionalPricePerServiceAccount { get; set; }
+    public short? BaseServiceAccount { get; set; }
+    public short? MaxServiceAccount { get; set; }
+    public bool HasAdditionalServiceAccountOption { get; set; }
+    public BitwardenProductType BitwardenProduct { get; set; }
 }

src/Core/OrganizationFeatures/OrganizationPlanUpgrade/Interface/IOrganizationUpgradePlanCommand.cs

@@ -0,0 +1,8 @@
+using Bit.Core.Models.Business;
+
+namespace Bit.Core.OrganizationFeatures.OrganizationPlanUpgrade.Interface;
+
+public interface IOrganizationUpgradePlanCommand
+{
+    Task<Tuple<bool, string>> UpgradePlanAsync(Guid organizationId, OrganizationUpgrade upgrade);
+}

src/Core/OrganizationFeatures/OrganizationPlanUpgrade/Interface/IOrganizationUpgradeQuery.cs

@@ -0,0 +1,14 @@
+using Bit.Core.Entities;
+using Bit.Core.Enums;
+using Bit.Core.Models.StaticStore;
+
+namespace Bit.Core.OrganizationFeatures.OrganizationPlanUpgrade.Interface;
+
+public interface IOrganizationUpgradeQuery
+{
+    Plan ExistingPlan(PlanType planType);
+
+    List<Plan> NewPlans(PlanType planType);
+
+    Task<Organization> GetOrgById(Guid id);
+}

src/Core/OrganizationFeatures/OrganizationPlanUpgrade/Interface/IValidateUpgradeCommand.cs

@@ -0,0 +1,22 @@
+using Bit.Core.Entities;
+using Bit.Core.Models.Business;
+using Bit.Core.Models.StaticStore;
+
+namespace Bit.Core.OrganizationFeatures.OrganizationPlanUpgrade.Interface;
+
+public interface IValidateUpgradeCommand
+{
+    void ValidatePlan(Plan newPlan, Plan existingPlan);
+    Task ValidateSeatsAsync(Organization organization, Plan passwordManagerPlan, OrganizationUpgrade upgrade);
+    Task ValidateSmSeatsAsync(Organization organization, Plan newPlan, OrganizationUpgrade upgrade);
+    Task ValidateServiceAccountAsync(Organization organization, Plan newPlan, OrganizationUpgrade upgrade);
+    Task ValidateCollectionsAsync(Organization organization, Plan newPlan);
+    Task ValidateGroupsAsync(Organization organization, Plan newPlan);
+    Task ValidatePoliciesAsync(Organization organization, Plan newPlan);
+    Task ValidateSsoAsync(Organization organization, Plan newPlan);
+    Task ValidateKeyConnectorAsync(Organization organization, Plan newPlan);
+    Task ValidateResetPasswordAsync(Organization organization, Plan newPlan);
+    Task ValidateScimAsync(Organization organization, Plan newPlan);
+    Task ValidateCustomPermissionsAsync(Organization organization, Plan newPlan);
+
+}