resolve pr comments

cyprain-okeke · cyprain-okeke · commit 2c6c2fe884ce · 2026-01-01T14:38:10.000+01:00
diff --git a/src/Api/Billing/Models/Requests/Premium/UpgradePremiumToOrganizationRequest.cs b/src/Api/Billing/Models/Requests/Premium/UpgradePremiumToOrganizationRequest.cs
@@ -1,23 +1,32 @@
 ﻿using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using Bit.Core.Billing.Enums;
 
 namespace Bit.Api.Billing.Models.Requests.Premium;
 
 public class UpgradePremiumToOrganizationRequest
 {
     [Required]
-    public required PlanType PlanType { get; set; }
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public ProductTierType Tier { get; set; }
 
-    [Range(1, int.MaxValue)]
-    public int Seats { get; set; }
-
-    public bool PremiumAccess { get; set; } = false;
-
-    [Range(0, 99)]
-    public int Storage { get; set; } = 0;
+    [Required]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public PlanCadenceType Cadence { get; set; }
 
-    public DateTime? TrialEndDate { get; set; }
+    private PlanType PlanType =>
+        Tier switch
+        {
+            ProductTierType.Families => PlanType.FamiliesAnnually,
+            ProductTierType.Teams => Cadence == PlanCadenceType.Monthly
+                ? PlanType.TeamsMonthly
+                : PlanType.TeamsAnnually,
+            ProductTierType.Enterprise => Cadence == PlanCadenceType.Monthly
+                ? PlanType.EnterpriseMonthly
+                : PlanType.EnterpriseAnnually,
+            _ => throw new InvalidOperationException("Cannot upgrade to an Organization subscription that isn't Families, Teams or Enterprise.")
+        };
 
     public (PlanType, int, bool, int?, DateTime?) ToDomain() =>
-        (PlanType, Seats, PremiumAccess, Storage > 0 ? Storage : null, TrialEndDate);
+        (PlanType, 1, false, null, null);
 }
diff --git a/src/Core/Billing/Premium/Commands/UpgradePremiumToOrganizationCommand.cs b/src/Core/Billing/Premium/Commands/UpgradePremiumToOrganizationCommand.cs
@@ -1,18 +1,22 @@
-﻿using Bit.Core.Billing.Commands;
+﻿using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Commands;
 using Bit.Core.Billing.Constants;
 using Bit.Core.Billing.Enums;
-using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Pricing;
 using Bit.Core.Billing.Services;
 using Bit.Core.Entities;
+using Bit.Core.Enums;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
+using Bit.Core.Utilities;
 using Microsoft.Extensions.Logging;
 using OneOf.Types;
 using Stripe;
 
 namespace Bit.Core.Billing.Premium.Commands;
 /// <summary>
-/// Upgrades a user's Premium subscription to an Organization plan by modifying the existing Stripe subscription.
+/// Upgrades a user's Premium subscription to an Organization plan by creating a new Organization
+/// and transferring the subscription from the User to the Organization.
 /// </summary>
 public interface IUpgradePremiumToOrganizationCommand
 {
@@ -39,8 +43,11 @@ public class UpgradePremiumToOrganizationCommand(
     ILogger<UpgradePremiumToOrganizationCommand> logger,
     IPricingClient pricingClient,
     IStripeAdapter stripeAdapter,
-    ISubscriberService subscriberService,
-    IUserService userService)
+    IUserService userService,
+    IOrganizationRepository organizationRepository,
+    IOrganizationUserRepository organizationUserRepository,
+    IOrganizationApiKeyRepository organizationApiKeyRepository,
+    IApplicationCacheService applicationCacheService)
     : BaseBillingCommand<UpgradePremiumToOrganizationCommand>(logger), IUpgradePremiumToOrganizationCommand
 {
     public Task<BillingCommandResult<None>> Run(
@@ -52,16 +59,11 @@ public Task<BillingCommandResult<None>> Run(
         DateTime? trialEndDate) => HandleAsync<None>(async () =>
     {
         // Validate that the user has an active Premium subscription
-        if (!user.Premium)
+        if (user is not { Premium: true, GatewaySubscriptionId: not null and not "" })
         {
             return new BadRequest("User does not have an active Premium subscription.");
         }
 
-        if (string.IsNullOrEmpty(user.GatewaySubscriptionId))
-        {
-            return new BadRequest("User does not have a Stripe subscription.");
-        }
-
         if (seats < 1)
         {
             return new BadRequest("Seats must be at least 1.");
@@ -73,10 +75,7 @@ public Task<BillingCommandResult<None>> Run(
         }
 
         // Fetch the current Premium subscription from Stripe
-        var currentSubscription = await subscriberService.GetSubscriptionOrThrow(user, new SubscriptionGetOptions
-        {
-            Expand = ["items.data.price"]
-        });
+        var currentSubscription = await stripeAdapter.GetSubscriptionAsync(user.GatewaySubscriptionId);
 
         // Get the target organization plan
         var targetPlan = await pricingClient.GetPlanOrThrow(targetPlanType);
@@ -160,11 +159,81 @@ public Task<BillingCommandResult<None>> Run(
             subscriptionUpdateOptions.TrialEnd = trialEndDate.Value;
         }
 
+        // Create the Organization entity
+        var organization = new Organization
+        {
+            Id = CoreHelpers.GenerateComb(),
+            Name = $"{user.Email}'s Organization",
+            BillingEmail = user.Email,
+            PlanType = targetPlan.Type,
+            Seats = (short)seats,
+            MaxCollections = targetPlan.PasswordManager.MaxCollections,
+            MaxStorageGb = (short)(targetPlan.PasswordManager.BaseStorageGb + (storage ?? 0)),
+            UsePolicies = targetPlan.HasPolicies,
+            UseSso = targetPlan.HasSso,
+            UseGroups = targetPlan.HasGroups,
+            UseEvents = targetPlan.HasEvents,
+            UseDirectory = targetPlan.HasDirectory,
+            UseTotp = targetPlan.HasTotp,
+            Use2fa = targetPlan.Has2fa,
+            UseApi = targetPlan.HasApi,
+            UseResetPassword = targetPlan.HasResetPassword,
+            SelfHost = targetPlan.HasSelfHost,
+            UsersGetPremium = targetPlan.UsersGetPremium || premiumAccess,
+            UseCustomPermissions = targetPlan.HasCustomPermissions,
+            UseScim = targetPlan.HasScim,
+            Plan = targetPlan.Name,
+            Gateway = null,
+            Enabled = true,
+            LicenseKey = CoreHelpers.SecureRandomString(20),
+            CreationDate = DateTime.UtcNow,
+            RevisionDate = DateTime.UtcNow,
+            Status = OrganizationStatusType.Created,
+            UsePasswordManager = true,
+            UseSecretsManager = false,
+            UseOrganizationDomains = targetPlan.HasOrganizationDomains,
+            GatewayCustomerId = user.GatewayCustomerId,
+            GatewaySubscriptionId = currentSubscription.Id
+        };
+
         // Update the subscription in Stripe
         await stripeAdapter.UpdateSubscriptionAsync(currentSubscription.Id, subscriptionUpdateOptions);
 
-        // Update user record
-        user.PremiumExpirationDate = trialEndDate ?? currentSubscription.GetCurrentPeriodEnd();
+        // Save the organization
+        await organizationRepository.CreateAsync(organization);
+
+        // Create organization API key
+        await organizationApiKeyRepository.CreateAsync(new OrganizationApiKey
+        {
+            OrganizationId = organization.Id,
+            ApiKey = CoreHelpers.SecureRandomString(30),
+            Type = OrganizationApiKeyType.Default,
+            RevisionDate = DateTime.UtcNow,
+        });
+
+        // Update cache
+        await applicationCacheService.UpsertOrganizationAbilityAsync(organization);
+
+        // Create OrganizationUser for the upgrading user as owner
+        var organizationUser = new OrganizationUser
+        {
+            OrganizationId = organization.Id,
+            UserId = user.Id,
+            Key = null, // Will need to be set by client
+            AccessSecretsManager = false,
+            Type = OrganizationUserType.Owner,
+            Status = OrganizationUserStatusType.Confirmed,
+            CreationDate = organization.CreationDate,
+            RevisionDate = organization.CreationDate
+        };
+        organizationUser.SetNewId();
+        await organizationUserRepository.CreateAsync(organizationUser);
+
+        // Remove subscription from user
+        user.Premium = false;
+        user.PremiumExpirationDate = null;
+        user.GatewaySubscriptionId = null;
+        user.GatewayCustomerId = null;
         user.RevisionDate = DateTime.UtcNow;
         await userService.SaveUserAsync(user);
 
diff --git a/test/Core.Test/Billing/Premium/Commands/UpgradePremiumToOrganizationCommandTests.cs b/test/Core.Test/Billing/Premium/Commands/UpgradePremiumToOrganizationCommandTests.cs
@@ -1,8 +1,10 @@
-﻿using Bit.Core.Billing.Enums;
+﻿using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Premium.Commands;
 using Bit.Core.Billing.Pricing;
 using Bit.Core.Billing.Services;
 using Bit.Core.Entities;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Test.Common.AutoFixture.Attributes;
 using Microsoft.Extensions.Logging;
@@ -88,8 +90,11 @@ private static Core.Models.StaticStore.Plan CreateTestPlan(
 
     private readonly IPricingClient _pricingClient = Substitute.For<IPricingClient>();
     private readonly IStripeAdapter _stripeAdapter = Substitute.For<IStripeAdapter>();
-    private readonly ISubscriberService _subscriberService = Substitute.For<ISubscriberService>();
     private readonly IUserService _userService = Substitute.For<IUserService>();
+    private readonly IOrganizationRepository _organizationRepository = Substitute.For<IOrganizationRepository>();
+    private readonly IOrganizationUserRepository _organizationUserRepository = Substitute.For<IOrganizationUserRepository>();
+    private readonly IOrganizationApiKeyRepository _organizationApiKeyRepository = Substitute.For<IOrganizationApiKeyRepository>();
+    private readonly IApplicationCacheService _applicationCacheService = Substitute.For<IApplicationCacheService>();
     private readonly ILogger<UpgradePremiumToOrganizationCommand> _logger = Substitute.For<ILogger<UpgradePremiumToOrganizationCommand>>();
     private readonly UpgradePremiumToOrganizationCommand _command;
 
@@ -99,8 +104,11 @@ public UpgradePremiumToOrganizationCommandTests()
             _logger,
             _pricingClient,
             _stripeAdapter,
-            _subscriberService,
-            _userService);
+            _userService,
+            _organizationRepository,
+            _organizationUserRepository,
+            _organizationApiKeyRepository,
+            _applicationCacheService);
     }
 
     [Theory, BitAutoData]
@@ -131,7 +139,7 @@ public async Task Run_UserNoGatewaySubscriptionId_ReturnsBadRequest(User user)
         // Assert
         Assert.True(result.IsT1);
         var badRequest = result.AsT1;
-        Assert.Equal("User does not have a Stripe subscription.", badRequest.Response);
+        Assert.Equal("User does not have an active Premium subscription.", badRequest.Response);
     }
 
     [Theory, BitAutoData]
@@ -147,7 +155,7 @@ public async Task Run_UserEmptyGatewaySubscriptionId_ReturnsBadRequest(User user
         // Assert
         Assert.True(result.IsT1);
         var badRequest = result.AsT1;
-        Assert.Equal("User does not have a Stripe subscription.", badRequest.Response);
+        Assert.Equal("User does not have an active Premium subscription.", badRequest.Response);
     }
 
     [Theory, BitAutoData]
@@ -212,7 +220,7 @@ public async Task Run_PlanDoesNotSupportPremiumAccess_ReturnsBadRequest(User use
             stripePremiumAccessPlanId: null // No premium access support
         );
 
-        _subscriberService.GetSubscriptionOrThrow(user, Arg.Any<SubscriptionGetOptions>())
+        _stripeAdapter.GetSubscriptionAsync("sub_123")
             .Returns(mockSubscription);
         _pricingClient.GetPlanOrThrow(PlanType.TeamsAnnually).Returns(mockPlan);
 
@@ -254,7 +262,7 @@ public async Task Run_PlanDoesNotSupportStorage_ReturnsBadRequest(User user)
             stripeStoragePlanId: null // No storage support
         );
 
-        _subscriberService.GetSubscriptionOrThrow(user, Arg.Any<SubscriptionGetOptions>())
+        _stripeAdapter.GetSubscriptionAsync("sub_123")
             .Returns(mockSubscription);
         _pricingClient.GetPlanOrThrow(PlanType.TeamsAnnually).Returns(mockPlan);
 
@@ -273,6 +281,7 @@ public async Task Run_SuccessfulUpgrade_SeatBasedPlan_ReturnsSuccess(User user)
         // Arrange
         user.Premium = true;
         user.GatewaySubscriptionId = "sub_123";
+        user.GatewayCustomerId = "cus_123";
         user.Id = Guid.NewGuid();
 
         var currentPeriodEnd = DateTime.UtcNow.AddMonths(1);
@@ -301,11 +310,15 @@ public async Task Run_SuccessfulUpgrade_SeatBasedPlan_ReturnsSuccess(User user)
             stripeStoragePlanId: "storage-plan-teams"
         );
 
-        _subscriberService.GetSubscriptionOrThrow(user, Arg.Any<SubscriptionGetOptions>())
+        _stripeAdapter.GetSubscriptionAsync("sub_123")
             .Returns(mockSubscription);
         _pricingClient.GetPlanOrThrow(PlanType.TeamsAnnually).Returns(mockPlan);
         _stripeAdapter.UpdateSubscriptionAsync(Arg.Any<string>(), Arg.Any<SubscriptionUpdateOptions>())
             .Returns(Task.FromResult(mockSubscription));
+        _organizationRepository.CreateAsync(Arg.Any<Organization>()).Returns(callInfo => Task.FromResult(callInfo.Arg<Organization>()));
+        _organizationApiKeyRepository.CreateAsync(Arg.Any<OrganizationApiKey>()).Returns(callInfo => Task.FromResult(callInfo.Arg<OrganizationApiKey>()));
+        _organizationUserRepository.CreateAsync(Arg.Any<OrganizationUser>()).Returns(callInfo => Task.FromResult(callInfo.Arg<OrganizationUser>()));
+        _applicationCacheService.UpsertOrganizationAbilityAsync(Arg.Any<Organization>()).Returns(Task.CompletedTask);
         _userService.SaveUserAsync(user).Returns(Task.CompletedTask);
 
         // Act
@@ -323,8 +336,16 @@ await _stripeAdapter.Received(1).UpdateSubscriptionAsync(
                 opts.Items.Any(i => i.Price == "teams-premium-access-annually" && i.Quantity == 1) &&
                 opts.Items.Any(i => i.Price == "storage-plan-teams" && i.Quantity == 10)));
 
-        await _userService.Received(1).SaveUserAsync(user);
-        Assert.Equal(currentPeriodEnd, user.PremiumExpirationDate);
+        await _organizationRepository.Received(1).CreateAsync(Arg.Is<Organization>(o =>
+            o.GatewaySubscriptionId == "sub_123" &&
+            o.GatewayCustomerId == "cus_123"));
+        await _organizationUserRepository.Received(1).CreateAsync(Arg.Any<OrganizationUser>());
+        await _organizationApiKeyRepository.Received(1).CreateAsync(Arg.Any<OrganizationApiKey>());
+
+        await _userService.Received(1).SaveUserAsync(Arg.Is<User>(u =>
+            u.Premium == false &&
+            u.GatewaySubscriptionId == null &&
+            u.GatewayCustomerId == null));
     }
 
     [Theory, BitAutoData]
@@ -333,6 +354,7 @@ public async Task Run_SuccessfulUpgrade_NonSeatBasedPlan_ReturnsSuccess(User use
         // Arrange
         user.Premium = true;
         user.GatewaySubscriptionId = "sub_123";
+        user.GatewayCustomerId = "cus_123";
 
         var currentPeriodEnd = DateTime.UtcNow.AddMonths(1);
         var mockSubscription = new Subscription
@@ -359,11 +381,15 @@ public async Task Run_SuccessfulUpgrade_NonSeatBasedPlan_ReturnsSuccess(User use
             stripeSeatPlanId: null // Non-seat-based
         );
 
-        _subscriberService.GetSubscriptionOrThrow(user, Arg.Any<SubscriptionGetOptions>())
+        _stripeAdapter.GetSubscriptionAsync("sub_123")
             .Returns(mockSubscription);
         _pricingClient.GetPlanOrThrow(PlanType.FamiliesAnnually).Returns(mockPlan);
         _stripeAdapter.UpdateSubscriptionAsync(Arg.Any<string>(), Arg.Any<SubscriptionUpdateOptions>())
             .Returns(Task.FromResult(mockSubscription));
+        _organizationRepository.CreateAsync(Arg.Any<Organization>()).Returns(callInfo => Task.FromResult(callInfo.Arg<Organization>()));
+        _organizationApiKeyRepository.CreateAsync(Arg.Any<OrganizationApiKey>()).Returns(callInfo => Task.FromResult(callInfo.Arg<OrganizationApiKey>()));
+        _organizationUserRepository.CreateAsync(Arg.Any<OrganizationUser>()).Returns(callInfo => Task.FromResult(callInfo.Arg<OrganizationUser>()));
+        _applicationCacheService.UpsertOrganizationAbilityAsync(Arg.Any<Organization>()).Returns(Task.CompletedTask);
         _userService.SaveUserAsync(user).Returns(Task.CompletedTask);
 
         // Act
@@ -379,7 +405,10 @@ await _stripeAdapter.Received(1).UpdateSubscriptionAsync(
                 opts.Items.Any(i => i.Deleted == true) &&
                 opts.Items.Any(i => i.Price == "families-plan-annually" && i.Quantity == 1)));
 
-        await _userService.Received(1).SaveUserAsync(user);
+        await _organizationRepository.Received(1).CreateAsync(Arg.Any<Organization>());
+        await _userService.Received(1).SaveUserAsync(Arg.Is<User>(u =>
+            u.Premium == false &&
+            u.GatewaySubscriptionId == null));
     }
 
     [Theory, BitAutoData]
@@ -412,7 +441,7 @@ public async Task Run_WithTrialEndDate_SetsTrialEndOnSubscription(User user)
             stripeSeatPlanId: "teams-seat-annually"
         );
 
-        _subscriberService.GetSubscriptionOrThrow(user, Arg.Any<SubscriptionGetOptions>())
+        _stripeAdapter.GetSubscriptionAsync("sub_123")
             .Returns(mockSubscription);
         _pricingClient.GetPlanOrThrow(PlanType.TeamsAnnually).Returns(mockPlan);
         _stripeAdapter.UpdateSubscriptionAsync(Arg.Any<string>(), Arg.Any<SubscriptionUpdateOptions>())
@@ -429,8 +458,6 @@ await _stripeAdapter.Received(1).UpdateSubscriptionAsync(
             "sub_123",
             Arg.Is<SubscriptionUpdateOptions>(opts =>
                 opts.TrialEnd == trialEndDate));
-
-        Assert.Equal(trialEndDate, user.PremiumExpirationDate);
     }
 
     [Theory, BitAutoData]
@@ -466,7 +493,7 @@ public async Task Run_AddsMetadataWithOriginalPremiumPriceId(User user)
             stripeSeatPlanId: "teams-seat-annually"
         );
 
-        _subscriberService.GetSubscriptionOrThrow(user, Arg.Any<SubscriptionGetOptions>())
+        _stripeAdapter.GetSubscriptionAsync("sub_123")
             .Returns(mockSubscription);
         _pricingClient.GetPlanOrThrow(PlanType.TeamsAnnually).Returns(mockPlan);
         _stripeAdapter.UpdateSubscriptionAsync(Arg.Any<string>(), Arg.Any<SubscriptionUpdateOptions>())
