From 62d6371685676ed8b1401562d691aa3e67dbe4a1 Mon Sep 17 00:00:00 2001
From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com>
Date: Thu, 20 Nov 2025 14:08:20 -0600
Subject: [PATCH] [PM-28249] Write `PlanType` claim as an integer (#6610)

* Write PlanType claim as an integer

* Accept FamiliesAnnually2025 for FamiliesAnnually plan type
---
 .../Implementations/OrganizationLicenseClaimsFactory.cs  | 2 +-
 .../Billing/Organizations/Models/OrganizationLicense.cs  | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs b/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs
index e9aadbe758..89543a1fc0 100644
--- a/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs
+++ b/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs
@@ -26,7 +26,7 @@ public class OrganizationLicenseClaimsFactory : ILicenseClaimsFactory<Organizati
             new(nameof(OrganizationLicenseConstants.LicenseType), LicenseType.Organization.ToString()),
             new(nameof(OrganizationLicenseConstants.Id), entity.Id.ToString()),
             new(nameof(OrganizationLicenseConstants.Enabled), entity.Enabled.ToString()),
-            new(nameof(OrganizationLicenseConstants.PlanType), entity.PlanType.ToString()),
+            new(nameof(OrganizationLicenseConstants.PlanType), ((int)entity.PlanType).ToString()),
             new(nameof(OrganizationLicenseConstants.UsePolicies), entity.UsePolicies.ToString()),
             new(nameof(OrganizationLicenseConstants.UseSso), entity.UseSso.ToString()),
             new(nameof(OrganizationLicenseConstants.UseKeyConnector), entity.UseKeyConnector.ToString()),
diff --git a/src/Core/Billing/Organizations/Models/OrganizationLicense.cs b/src/Core/Billing/Organizations/Models/OrganizationLicense.cs
index 7ccbacc938..ee44d295d9 100644
--- a/src/Core/Billing/Organizations/Models/OrganizationLicense.cs
+++ b/src/Core/Billing/Organizations/Models/OrganizationLicense.cs
@@ -399,7 +399,6 @@ public class OrganizationLicense : ILicense
         var installationId = claimsPrincipal.GetValue<Guid>(nameof(InstallationId));
         var licenseKey = claimsPrincipal.GetValue<string>(nameof(LicenseKey));
         var enabled = claimsPrincipal.GetValue<bool>(nameof(Enabled));
-        var planType = claimsPrincipal.GetValue<PlanType>(nameof(PlanType));
         var seats = claimsPrincipal.GetValue<int?>(nameof(Seats));
         var maxCollections = claimsPrincipal.GetValue<short?>(nameof(MaxCollections));
         var useGroups = claimsPrincipal.GetValue<bool>(nameof(UseGroups));
@@ -425,12 +424,18 @@ public class OrganizationLicense : ILicense
         var useOrganizationDomains = claimsPrincipal.GetValue<bool>(nameof(UseOrganizationDomains));
         var useAutomaticUserConfirmation = claimsPrincipal.GetValue<bool>(nameof(UseAutomaticUserConfirmation));
 
+        var claimedPlanType = claimsPrincipal.GetValue<PlanType>(nameof(PlanType));
+
+        var planTypesMatch = claimedPlanType == PlanType.FamiliesAnnually
+            ? organization.PlanType is PlanType.FamiliesAnnually or PlanType.FamiliesAnnually2025
+            : organization.PlanType == claimedPlanType;
+
         return issued <= DateTime.UtcNow &&
                expires >= DateTime.UtcNow &&
                installationId == globalSettings.Installation.Id &&
                licenseKey == organization.LicenseKey &&
                enabled == organization.Enabled &&
-               planType == organization.PlanType &&
+               planTypesMatch &&
                seats == organization.Seats &&
                maxCollections == organization.MaxCollections &&
                useGroups == organization.UseGroups &&