From ea13f5177691500945212b466ffe7e989fcb3879 Mon Sep 17 00:00:00 2001
From: Conner Turnbull <cturnbull@bitwarden.com>
Date: Thu, 26 Jun 2025 11:50:37 -0400
Subject: [PATCH] Cleaned up byte array logic

---
 .../Licenses/Extensions/LicenseExtensions.cs  | 18 +++++++--------
 src/Core/Models/Business/BaseLicense.cs       | 22 ++++++++-----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs b/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs
index 9b4cfb84ae..a14383dd44 100644
--- a/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs
+++ b/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs
@@ -51,19 +51,19 @@ public static class LicenseExtensions
             .GetProperties(BindingFlags.Public | BindingFlags.Instance)
             .Where(p =>
             {
-                var versionAttr = p.GetCustomAttribute<LicenseVersionAttribute>();
-                if (versionAttr is null || versionAttr.Version > license.Version)
-                {
-                    return false;
-                }
-
                 var ignoreAttr = p.GetCustomAttribute<LicenseIgnoreAttribute>();
-                if (ignoreAttr is null)
+                if (ignoreAttr is not null)
                 {
-                    return true;
+                    return !forHash && ignoreAttr.IncludeInSignature;
                 }
 
-                return !forHash && ignoreAttr.IncludeInSignature;
+                var versionAttr = p.GetCustomAttribute<LicenseVersionAttribute>();
+                if (versionAttr is not null)
+                {
+                    return versionAttr.Version <= license.Version;
+                }
+
+                return true;
             })
             .OrderBy(p => p.Name)
             .Select(p => $"{p.Name}:{CoreHelpers.FormatLicenseSignatureValue(p.GetValue(license, null))}")
diff --git a/src/Core/Models/Business/BaseLicense.cs b/src/Core/Models/Business/BaseLicense.cs
index 8645d97182..f27f507824 100644
--- a/src/Core/Models/Business/BaseLicense.cs
+++ b/src/Core/Models/Business/BaseLicense.cs
@@ -9,17 +9,9 @@ public abstract class BaseLicense : ILicense
     [LicenseVersion(1)]
     public Guid Id { get; set; }
 
-    [LicenseVersion(1)]
-    [LicenseIgnore(includeInSignature: true)]
-    public DateTime Issued { get; set; }
-
     [LicenseVersion(1)]
     public DateTime? Expires { get; set; }
 
-    [LicenseVersion(1)]
-    [LicenseIgnore(includeInSignature: true)]
-    public DateTime? Refresh { get; set; }
-
     [LicenseVersion(1)]
     public int Version { get; set; }
 
@@ -32,11 +24,6 @@ public abstract class BaseLicense : ILicense
     [LicenseVersion(1)]
     public string Name { get; set; }
 
-    [LicenseVersion(1)]
-    [LicenseIgnore(includeInSignature: true)]
-    public string Hash { get; set; }
-
-    [LicenseVersion(1)]
     [LicenseIgnore]
     public string Signature { get; set; }
 
@@ -49,4 +36,13 @@ public abstract class BaseLicense : ILicense
     [LicenseIgnore]
     [JsonIgnore]
     public abstract bool ValidLicenseVersion { get; }
+
+    [LicenseIgnore(includeInSignature: true)]
+    public DateTime? Refresh { get; set; }
+
+    [LicenseIgnore(includeInSignature: true)]
+    public DateTime Issued { get; set; }
+
+    [LicenseIgnore(includeInSignature: true)]
+    public string Hash { get; set; }
 }