Merge branch 'main' into jmccannon/ac/pm-38927-org-user-role-validation

Author: jrmccannon

Directory.Build.props

@@ -3,14 +3,16 @@
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
 
-    <Version>2026.6.1</Version>
+    <Version>2026.6.2</Version>
 
     <RootNamespace>Bit.$(MSBuildProjectName)</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsTestProject Condition="'$(IsTestProject)' == '' and ($(MSBuildProjectName.EndsWith('.Test')) or $(MSBuildProjectName.EndsWith('.IntegrationTest')))">true</IsTestProject>
     <Nullable Condition="'$(Nullable)' == '' and '$(IsTestProject)' == 'true'">annotations</Nullable>
     <Nullable Condition="'$(Nullable)' == '' and '$(IsTestProject)' != 'true'">enable</Nullable>
     <TreatWarningsAsErrors Condition="'$(TreatWarningsAsErrors)' == ''">true</TreatWarningsAsErrors>
+    
+    <WarningsNotAsErrors>$(WarningsNotAsErrors);BWA0001</WarningsNotAsErrors>
     <NuGetAuditLevel>critical</NuGetAuditLevel>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
   </PropertyGroup>

dev/secrets.json.example

@@ -1,4 +1,8 @@
 {
+  "seederSettings": {
+    "username": "<your SeederApi username>",
+    "password": "<your SeederApi password>"
+  },
   "adminSettings": {
     "admins": "admin@localhost,owner@localhost,cs@localhost,billing@localhost,sales@localhost",
     "role": {

src/Api/AdminConsole/Controllers/ValidationErrorTypedResultsExtensions.cs

@@ -1,4 +1,5 @@
 using Bit.Core.AdminConsole.Utilities.v2.Validation;
+using Bit.HttpExtensions;
 
 namespace Microsoft.AspNetCore.Http.HttpResults;
 

src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRequestModels.cs

@@ -102,6 +102,15 @@ public class OrganizationUserUpdateRequestModel
     public IEnumerable<SelectionReadOnlyRequestModel> Collections { get; set; }
     public IEnumerable<Guid> Groups { get; set; }
 
+#nullable enable
+    [StrictEmailAddressNullable]
+    [StringLength(256)]
+    public string? Email { get; set; }
+
+    [StringLength(50)]
+    public string? Name { get; set; }
+#nullable disable
+
     public OrganizationUser ToOrganizationUser(OrganizationUser existingUser)
     {
         existingUser.Type = Type.Value;

src/Api/Models/Response/ListResponseModel.cs

@@ -5,6 +5,15 @@
 
 namespace Bit.Api.Models.Response;
 
+/// <summary>
+/// A paginated list response wrapper.
+/// </summary>
+/// <remarks>
+/// Deprecated in favor of <c>Bit.HttpExtensions.ListResponseModel</c>.
+/// </remarks>
+[Obsolete(
+    "Use Bit.HttpExtensions.ListResponseModel instead.",
+    DiagnosticId = "BWA0001")]
 public class ListResponseModel<T> : ResponseModel where T : ResponseModel
 {
     public ListResponseModel(IEnumerable<T> data, string continuationToken = null)

src/Billing/Services/Implementations/SubscriptionUpdatedHandler.cs

@@ -19,7 +19,6 @@
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Stripe;
-using Stripe.TestHelpers;
 using static Bit.Core.Billing.Constants.StripeConstants;
 using Event = Stripe.Event;
 
@@ -322,10 +321,7 @@ private async Task SetSubscriptionToCancelAsync(Subscription subscription)
     {
         await _priceIncreaseScheduler.Release(subscription.CustomerId, subscription.Id);
 
-        if (subscription.TestClock != null)
-        {
-            await WaitForTestClockToAdvanceAsync(subscription.TestClock);
-        }
+        await _stripeAdapter.WaitForTestClockToAdvanceAsync(subscription.TestClock);
 
         var now = subscription.TestClock?.FrozenTime ?? DateTime.UtcNow;
 
@@ -442,19 +438,6 @@ private async Task RemovePasswordManagerCouponIfRemovingSecretsManagerTrialAsync
         }
     }
 
-    private async Task WaitForTestClockToAdvanceAsync(TestClock testClock)
-    {
-        while (testClock.Status != "ready")
-        {
-            await Task.Delay(TimeSpan.FromSeconds(2));
-            testClock = await _stripeAdapter.GetTestClockAsync(testClock.Id);
-            if (testClock.Status == "internal_failure")
-            {
-                throw new Exception("Stripe Test Clock encountered an internal failure");
-            }
-        }
-    }
-
     private async Task HandleScheduleTriggeredFamiliesMigrationAsync(
         Event parsedEvent,
         Subscription subscription,
@@ -646,6 +629,15 @@ private async Task HandleScheduleTriggeredBusinessMigrationAsync(
             }
 
             organization.ChangePlan(targetPlan);
+
+            // Packaged sources (e.g. Teams Starter) store a flat bundle cap in Seats; reconcile to the billed per-seat quantity.
+            if (sourcePlan.HasNonSeatBasedPasswordManagerPlan())
+            {
+                var billedSeatQuantity = subscription.Items
+                    .First(item => item.Price?.Id == targetPriceId).Quantity;
+                organization.Seats = (int)Math.Max(1, billedSeatQuantity);
+            }
+
             await _organizationRepository.ReplaceAsync(organization);
 
             var sourceProvidedServiceAccounts = sourcePlan.SecretsManager?.BaseServiceAccount ?? 0;
@@ -659,6 +651,8 @@ private async Task HandleScheduleTriggeredBusinessMigrationAsync(
                     [MetadataKeys.MigrationGraceServiceAccounts] = grace.ToString(CultureInfo.InvariantCulture)
                 };
 
+                await _stripeAdapter.WaitForTestClockToAdvanceAsync(subscription.TestClock);
+
                 try
                 {
                     await _stripeAdapter.UpdateSubscriptionAsync(subscription.Id,

src/Billing/Services/Implementations/UpcomingInvoiceHandler.cs

@@ -23,7 +23,6 @@
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Stripe;
-using Stripe.TestHelpers;
 using Event = Stripe.Event;
 using Plan = Bit.Core.Models.StaticStore.Plan;
 using PremiumPlan = Bit.Core.Billing.Pricing.Premium.Plan;
@@ -367,10 +366,7 @@ private async Task<bool> ScheduleBusinessPlanPriceMigrationAsync(
                 return false;
             }
 
-            if (subscription.TestClock != null)
-            {
-                await WaitForTestClockToAdvanceAsync(subscription.TestClock);
-            }
+            await stripeAdapter.WaitForTestClockToAdvanceAsync(subscription.TestClock);
 
             var migrationScheduled = await priceIncreaseScheduler.ScheduleForSubscription(subscription);
 
@@ -667,19 +663,6 @@ async Task ResolveAndAddAsync(Coupon? expandedCoupon, string? couponId)
         return discounts;
     }
 
-    private async Task WaitForTestClockToAdvanceAsync(TestClock testClock)
-    {
-        while (testClock.Status != "ready")
-        {
-            await Task.Delay(TimeSpan.FromSeconds(2));
-            testClock = await stripeAdapter.GetTestClockAsync(testClock.Id);
-            if (testClock.Status == "internal_failure")
-            {
-                throw new Exception("Stripe Test Clock encountered an internal failure");
-            }
-        }
-    }
-
     #endregion
 
     #region Premium Users

src/Core/Billing/Constants/StripeConstants.cs

@@ -197,6 +197,13 @@ public static class TaxRegistrationStatus
         public const string Scheduled = "scheduled";
     }
 
+    public static class TestClockStatus
+    {
+        public const string Advancing = "advancing";
+        public const string InternalFailure = "internal_failure";
+        public const string Ready = "ready";
+    }
+
     public static class ValidateTaxLocationTiming
     {
         public const string Deferred = "deferred";

src/Core/Billing/Services/IStripeAdapter.cs

@@ -63,4 +63,5 @@ Task<CustomerBalanceTransaction> CreateCustomerBalanceTransactionAsync(string cu
     Task<SubscriptionSchedule> UpdateSubscriptionScheduleAsync(string id, SubscriptionScheduleUpdateOptions options);
     Task<SubscriptionSchedule> ReleaseSubscriptionScheduleAsync(string id, SubscriptionScheduleReleaseOptions options = null);
     Task<TestClock> GetTestClockAsync(string testClockId, TestClockGetOptions options = null);
+    Task WaitForTestClockToAdvanceAsync(TestClock testClock);
 }

src/Core/Billing/Services/Implementations/StripeAdapter.cs

@@ -6,6 +6,7 @@
 using Stripe;
 using Stripe.Tax;
 using Stripe.TestHelpers;
+using static Bit.Core.Billing.Constants.StripeConstants;
 using BillingPortalSessionService = Stripe.BillingPortal.SessionService;
 using CheckoutSessionService = Stripe.Checkout.SessionService;
 using CustomerService = Stripe.CustomerService;
@@ -281,4 +282,22 @@ public Task<SubscriptionSchedule> ReleaseSubscriptionScheduleAsync(string id, Su
      ******************/
     public Task<TestClock> GetTestClockAsync(string testClockId, TestClockGetOptions options = null) =>
         _testClockService.GetAsync(testClockId, options);
+
+    public async Task WaitForTestClockToAdvanceAsync(TestClock testClock)
+    {
+        if (testClock == null)
+        {
+            return;
+        }
+
+        while (testClock.Status != TestClockStatus.Ready)
+        {
+            await Task.Delay(TimeSpan.FromSeconds(2));
+            testClock = await _testClockService.GetAsync(testClock.Id);
+            if (testClock.Status == TestClockStatus.InternalFailure)
+            {
+                throw new Exception("Stripe Test Clock encountered an internal failure");
+            }
+        }
+    }
 }