[PM-12601] Add discount to MSP during creation in Admin Portal (#5391)

* Add Provider DiscountId to database and Stripe customer

* Fix tests

* Add missing EF migrations

* Run dotnet format

bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs

@@ -475,20 +475,17 @@ public class ProviderBillingService(
         Provider provider,
         TaxInfo taxInfo)
     {
-        ArgumentNullException.ThrowIfNull(provider);
+        if (taxInfo is not
-        ArgumentNullException.ThrowIfNull(taxInfo);
+            {
-
+                BillingAddressCountry: not null and not "",
-        if (string.IsNullOrEmpty(taxInfo.BillingAddressCountry) ||
+                BillingAddressPostalCode: not null and not ""
-            string.IsNullOrEmpty(taxInfo.BillingAddressPostalCode))
+            })
         {
             logger.LogError("Cannot create customer for provider ({ProviderID}) without both a country and postal code", provider.Id);
-
             throw new BillingException();
         }
 
-        var providerDisplayName = provider.DisplayName();
+        var options = new CustomerCreateOptions
-
-        var customerCreateOptions = new CustomerCreateOptions
         {
             Address = new AddressOptions
             {
@@ -508,9 +505,9 @@ public class ProviderBillingService(
                     new CustomerInvoiceSettingsCustomFieldOptions
                     {
                         Name = provider.SubscriberType(),
-                        Value = providerDisplayName?.Length <= 30
+                        Value = provider.DisplayName()?.Length <= 30
-                            ? providerDisplayName
+                            ? provider.DisplayName()
-                            : providerDisplayName?[..30]
+                            : provider.DisplayName()?[..30]
                     }
                 ]
             },
@@ -522,7 +519,8 @@ public class ProviderBillingService(
 
         if (!string.IsNullOrEmpty(taxInfo.TaxIdNumber))
         {
-            var taxIdType = taxService.GetStripeTaxCode(taxInfo.BillingAddressCountry,
+            var taxIdType = taxService.GetStripeTaxCode(
+                taxInfo.BillingAddressCountry,
                 taxInfo.TaxIdNumber);
 
             if (taxIdType == null)
@@ -533,15 +531,20 @@ public class ProviderBillingService(
                 throw new BadRequestException("billingTaxIdTypeInferenceError");
             }
 
-            customerCreateOptions.TaxIdData =
+            options.TaxIdData =
             [
                 new CustomerTaxIdDataOptions { Type = taxIdType, Value = taxInfo.TaxIdNumber }
             ];
         }
 
+        if (!string.IsNullOrEmpty(provider.DiscountId))
+        {
+            options.Coupon = provider.DiscountId;
+        }
+
         try
         {
-            return await stripeAdapter.CustomerCreateAsync(customerCreateOptions);
+            return await stripeAdapter.CustomerCreateAsync(options);
         }
         catch (StripeException stripeException) when (stripeException.StripeError?.Code == StripeConstants.ErrorCodes.TaxIdInvalid)
         {

bitwarden_license/test/Commercial.Core.Test/Billing/ProviderBillingServiceTests.cs

@@ -731,18 +731,6 @@ public class ProviderBillingServiceTests
 
     #region SetupCustomer
 
-    [Theory, BitAutoData]
-    public async Task SetupCustomer_NullProvider_ThrowsArgumentNullException(
-        SutProvider<ProviderBillingService> sutProvider,
-        TaxInfo taxInfo) =>
-        await Assert.ThrowsAsync<ArgumentNullException>(() => sutProvider.Sut.SetupCustomer(null, taxInfo));
-
-    [Theory, BitAutoData]
-    public async Task SetupCustomer_NullTaxInfo_ThrowsArgumentNullException(
-        SutProvider<ProviderBillingService> sutProvider,
-        Provider provider) =>
-        await Assert.ThrowsAsync<ArgumentNullException>(() => sutProvider.Sut.SetupCustomer(provider, null));
-
     [Theory, BitAutoData]
     public async Task SetupCustomer_MissingCountry_ContactSupport(
         SutProvider<ProviderBillingService> sutProvider,

src/Admin/AdminConsole/Models/CreateMspProviderModel.cs

@@ -10,6 +10,9 @@ public class CreateMspProviderModel : IValidatableObject
     [Display(Name = "Owner Email")]
     public string OwnerEmail { get; set; }
 
+    [Display(Name = "Subscription Discount")]
+    public string DiscountId { get; set; }
+
     [Display(Name = "Teams (Monthly) Seat Minimum")]
     public int TeamsMonthlySeatMinimum { get; set; }
 
@@ -20,7 +23,8 @@ public class CreateMspProviderModel : IValidatableObject
     {
         return new Provider
         {
-            Type = ProviderType.Msp
+            Type = ProviderType.Msp,
+            DiscountId = DiscountId
         };
     }
 

src/Admin/AdminConsole/Views/Providers/CreateMsp.cshtml

@@ -1,3 +1,4 @@
+@using Bit.Core.Billing.Constants
 @model CreateMspProviderModel
 
 @{
@@ -12,6 +13,19 @@
             <label asp-for="OwnerEmail" class="form-label"></label>
             <input type="text" class="form-control" asp-for="OwnerEmail">
         </div>
+        <div class="mb-3">
+            @{
+                var selectList = new List<SelectListItem>
+                {
+                    new ("No discount", string.Empty, true),
+                    new ("20% - Open", StripeConstants.CouponIDs.MSPDiscounts.Open),
+                    new ("35% - Silver", StripeConstants.CouponIDs.MSPDiscounts.Silver),
+                    new ("50% - Gold", StripeConstants.CouponIDs.MSPDiscounts.Gold)
+                };
+            }
+            <label asp-for="DiscountId" class="form-label"></label>
+            <select class="form-select" asp-for="DiscountId" asp-items="selectList"></select>
+        </div>
         <div class="row">
             <div class="col-sm">
                 <div class="mb-3">

src/Core/AdminConsole/Entities/Provider/Provider.cs

@@ -35,6 +35,7 @@ public class Provider : ITableObject<Guid>, ISubscriber
     public GatewayType? Gateway { get; set; }
     public string? GatewayCustomerId { get; set; }
     public string? GatewaySubscriptionId { get; set; }
+    public string? DiscountId { get; set; }
 
     public string? BillingEmailAddress() => BillingEmail?.ToLowerInvariant().Trim();
 

src/Core/Billing/Constants/StripeConstants.cs

@@ -18,8 +18,15 @@ public static class StripeConstants
 
     public static class CouponIDs
     {
-        public const string MSPDiscount35 = "msp-discount-35";
+        public const string LegacyMSPDiscount = "msp-discount-35";
         public const string SecretsManagerStandalone = "sm-standalone";
+
+        public static class MSPDiscounts
+        {
+            public const string Open = "msp-open-discount";
+            public const string Silver = "msp-silver-discount";
+            public const string Gold = "msp-gold-discount";
+        }
     }
 
     public static class ErrorCodes

src/Core/Billing/Migration/Services/Implementations/ProviderMigrator.cs

@@ -254,7 +254,7 @@ public class ProviderMigrator(
 
             await stripeAdapter.CustomerUpdateAsync(customer.Id, new CustomerUpdateOptions
             {
-                Coupon = StripeConstants.CouponIDs.MSPDiscount35
+                Coupon = StripeConstants.CouponIDs.LegacyMSPDiscount
             });
 
             provider.GatewayCustomerId = customer.Id;

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

@@ -46,7 +46,8 @@ public class OrganizationSale
         var customerSetup = new CustomerSetup
         {
             Coupon = signup.IsFromProvider
-            ? StripeConstants.CouponIDs.MSPDiscount35
+            // TODO: Remove when last of the legacy providers has been migrated.
+            ? StripeConstants.CouponIDs.LegacyMSPDiscount
             : signup.IsFromSecretsManagerTrial
                 ? StripeConstants.CouponIDs.SecretsManagerStandalone
                 : null

src/Sql/dbo/Stored Procedures/Provider_Create.sql

@@ -17,7 +17,8 @@
     @RevisionDate DATETIME2(7),
     @Gateway TINYINT = 0,
     @GatewayCustomerId VARCHAR(50) = NULL,
-    @GatewaySubscriptionId VARCHAR(50) = NULL
+    @GatewaySubscriptionId VARCHAR(50) = NULL,
+    @DiscountId VARCHAR(50) = NULL
 AS
 BEGIN
     SET NOCOUNT ON
@@ -42,7 +43,8 @@ BEGIN
         [RevisionDate],
         [Gateway],
         [GatewayCustomerId],
-        [GatewaySubscriptionId]
+        [GatewaySubscriptionId],
+        [DiscountId]
     )
     VALUES
     (
@@ -64,6 +66,7 @@ BEGIN
         @RevisionDate,
         @Gateway,
         @GatewayCustomerId,
-        @GatewaySubscriptionId
+        @GatewaySubscriptionId,
+        @DiscountId
     )
 END

src/Sql/dbo/Stored Procedures/Provider_Update.sql

@@ -17,7 +17,8 @@
     @RevisionDate DATETIME2(7),
     @Gateway TINYINT = 0,
     @GatewayCustomerId VARCHAR(50) = NULL,
-    @GatewaySubscriptionId VARCHAR(50) = NULL
+    @GatewaySubscriptionId VARCHAR(50) = NULL,
+    @DiscountId VARCHAR(50) = NULL
 AS
 BEGIN
     SET NOCOUNT ON
@@ -42,7 +43,8 @@ BEGIN
         [RevisionDate] = @RevisionDate,
         [Gateway] = @Gateway,
         [GatewayCustomerId] = @GatewayCustomerId,
-        [GatewaySubscriptionId] = @GatewaySubscriptionId
+        [GatewaySubscriptionId] = @GatewaySubscriptionId,
+        [DiscountId] = @DiscountId
     WHERE
         [Id] = @Id
 END

src/Sql/dbo/Tables/Provider.sql

@@ -18,5 +18,6 @@
     [Gateway]               TINYINT          NULL,
     [GatewayCustomerId]     VARCHAR (50)     NULL,
     [GatewaySubscriptionId] VARCHAR (50)     NULL,
+    [DiscountId]            VARCHAR (50)     NULL,
     CONSTRAINT [PK_Provider] PRIMARY KEY CLUSTERED ([Id] ASC)
 );

util/Migrator/DbScripts/2025-02-11_00_AddColumn_ProviderDiscountId.sql

@@ -0,0 +1,171 @@
+-- Add 'DiscountId' column to 'Provider' table.
+IF COL_LENGTH('[dbo].[Provider]', 'DiscountId') IS NULL
+    BEGIN
+        ALTER TABLE
+            [dbo].[Provider]
+            ADD
+                [DiscountId] VARCHAR(50) NULL;
+    END
+GO
+
+-- Recreate 'ProviderView' so that it includes the 'DiscountId' column.
+CREATE OR ALTER VIEW [dbo].[ProviderView]
+AS
+SELECT
+    *
+FROM
+    [dbo].[Provider]
+GO
+
+-- Alter 'Provider_Create' SPROC to add 'DiscountId' column.
+CREATE OR ALTER PROCEDURE [dbo].[Provider_Create]
+    @Id UNIQUEIDENTIFIER OUTPUT,
+    @Name NVARCHAR(50),
+    @BusinessName NVARCHAR(50),
+    @BusinessAddress1 NVARCHAR(50),
+    @BusinessAddress2 NVARCHAR(50),
+    @BusinessAddress3 NVARCHAR(50),
+    @BusinessCountry VARCHAR(2),
+    @BusinessTaxNumber NVARCHAR(30),
+    @BillingEmail NVARCHAR(256),
+    @BillingPhone NVARCHAR(50) = NULL,
+    @Status TINYINT,
+    @Type TINYINT = 0,
+    @UseEvents BIT,
+    @Enabled BIT,
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Gateway TINYINT = 0,
+    @GatewayCustomerId VARCHAR(50) = NULL,
+    @GatewaySubscriptionId VARCHAR(50) = NULL,
+    @DiscountId VARCHAR(50) = NULL
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    INSERT INTO [dbo].[Provider]
+    (
+        [Id],
+        [Name],
+        [BusinessName],
+        [BusinessAddress1],
+        [BusinessAddress2],
+        [BusinessAddress3],
+        [BusinessCountry],
+        [BusinessTaxNumber],
+        [BillingEmail],
+        [BillingPhone],
+        [Status],
+        [Type],
+        [UseEvents],
+        [Enabled],
+        [CreationDate],
+        [RevisionDate],
+        [Gateway],
+        [GatewayCustomerId],
+        [GatewaySubscriptionId],
+        [DiscountId]
+    )
+    VALUES
+        (
+         @Id,
+         @Name,
+         @BusinessName,
+         @BusinessAddress1,
+         @BusinessAddress2,
+         @BusinessAddress3,
+         @BusinessCountry,
+         @BusinessTaxNumber,
+         @BillingEmail,
+         @BillingPhone,
+         @Status,
+         @Type,
+         @UseEvents,
+         @Enabled,
+         @CreationDate,
+         @RevisionDate,
+         @Gateway,
+         @GatewayCustomerId,
+         @GatewaySubscriptionId,
+         @DiscountId
+        )
+END
+GO
+
+-- Alter 'Provider_Update' SPROC to add 'DiscountId' column.
+CREATE OR ALTER PROCEDURE [dbo].[Provider_Update]
+    @Id UNIQUEIDENTIFIER,
+    @Name NVARCHAR(50),
+    @BusinessName NVARCHAR(50),
+    @BusinessAddress1 NVARCHAR(50),
+    @BusinessAddress2 NVARCHAR(50),
+    @BusinessAddress3 NVARCHAR(50),
+    @BusinessCountry VARCHAR(2),
+    @BusinessTaxNumber NVARCHAR(30),
+    @BillingEmail NVARCHAR(256),
+    @BillingPhone NVARCHAR(50) = NULL,
+    @Status TINYINT,
+    @Type TINYINT = 0,
+    @UseEvents BIT,
+    @Enabled BIT,
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Gateway TINYINT = 0,
+    @GatewayCustomerId VARCHAR(50) = NULL,
+    @GatewaySubscriptionId VARCHAR(50) = NULL,
+    @DiscountId VARCHAR(50) = NULL
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    UPDATE
+        [dbo].[Provider]
+    SET
+        [Name] = @Name,
+        [BusinessName] = @BusinessName,
+        [BusinessAddress1] = @BusinessAddress1,
+        [BusinessAddress2] = @BusinessAddress2,
+        [BusinessAddress3] = @BusinessAddress3,
+        [BusinessCountry] = @BusinessCountry,
+        [BusinessTaxNumber] = @BusinessTaxNumber,
+        [BillingEmail] = @BillingEmail,
+        [BillingPhone] = @BillingPhone,
+        [Status] = @Status,
+        [Type] = @Type,
+        [UseEvents] = @UseEvents,
+        [Enabled] = @Enabled,
+        [CreationDate] = @CreationDate,
+        [RevisionDate] = @RevisionDate,
+        [Gateway] = @Gateway,
+        [GatewayCustomerId] = @GatewayCustomerId,
+        [GatewaySubscriptionId] = @GatewaySubscriptionId,
+        [DiscountId] = @DiscountId
+    WHERE
+        [Id] = @Id
+END
+GO
+
+-- Refresh modules for SPROCs reliant on 'Provider' table/view.
+IF OBJECT_ID('[dbo].[Provider_ReadAbilities]') IS NOT NULL
+    BEGIN
+        EXECUTE sp_refreshsqlmodule N'[dbo].[Provider_ReadAbilities]';
+    END
+GO
+
+IF OBJECT_ID('[dbo].[Provider_ReadById]') IS NOT NULL
+    BEGIN
+        EXECUTE sp_refreshsqlmodule N'[dbo].[Provider_ReadById]';
+    END
+GO
+
+IF OBJECT_ID('[dbo].[Provider_ReadByOrganizationId]') IS NOT NULL
+    BEGIN
+        EXECUTE sp_refreshsqlmodule N'[dbo].[Provider_ReadByOrganizationId]';
+    END
+GO
+
+IF OBJECT_ID('[dbo].[Provider_Search]') IS NOT NULL
+    BEGIN
+        EXECUTE sp_refreshsqlmodule N'[dbo].[Provider_Search]';
+    END
+GO

util/MySqlMigrations/Migrations/20250213140357_AddColumn_ProviderDiscountId.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.MySqlMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class AddColumn_ProviderDiscountId : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.AddColumn<string>(
+            name: "DiscountId",
+            table: "Provider",
+            type: "longtext",
+            nullable: true)
+            .Annotation("MySql:CharSet", "utf8mb4");
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropColumn(
+            name: "DiscountId",
+            table: "Provider");
+    }
+}

util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs

@@ -284,6 +284,9 @@ namespace Bit.MySqlMigrations.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime(6)");
 
+                    b.Property<string>("DiscountId")
+                        .HasColumnType("longtext");
+
                     b.Property<bool>("Enabled")
                         .HasColumnType("tinyint(1)");
 

util/PostgresMigrations/Migrations/20250213140406_AddColumn_ProviderDiscountId.cs

@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.PostgresMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class AddColumn_ProviderDiscountId : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.AddColumn<string>(
+            name: "DiscountId",
+            table: "Provider",
+            type: "text",
+            nullable: true);
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropColumn(
+            name: "DiscountId",
+            table: "Provider");
+    }
+}

util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs

@@ -287,6 +287,9 @@ namespace Bit.PostgresMigrations.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("timestamp with time zone");
 
+                    b.Property<string>("DiscountId")
+                        .HasColumnType("text");
+
                     b.Property<bool>("Enabled")
                         .HasColumnType("boolean");
 

util/SqliteMigrations/Migrations/20250213140401_AddColumn_ProviderDiscountId.cs

@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.SqliteMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class AddColumn_ProviderDiscountId : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.AddColumn<string>(
+            name: "DiscountId",
+            table: "Provider",
+            type: "TEXT",
+            nullable: true);
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropColumn(
+            name: "DiscountId",
+            table: "Provider");
+    }
+}

util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs

@@ -279,6 +279,9 @@ namespace Bit.SqliteMigrations.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("DiscountId")
+                        .HasColumnType("TEXT");
+
                     b.Property<bool>("Enabled")
                         .HasColumnType("INTEGER");