From b83d8304e59773eb36724a8680a3ea20ae33eae9 Mon Sep 17 00:00:00 2001
From: "Rune T. Larsen" <rune@hjemmekino.no>
Date: Thu, 7 Nov 2024 15:41:50 +0100
Subject: [PATCH] More name fix

---
 .../Helpers/DecisionHelper.cs                 | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Altinn.Common.PEP/Altinn.Common.PEP/Helpers/DecisionHelper.cs b/src/Altinn.Common.PEP/Altinn.Common.PEP/Helpers/DecisionHelper.cs
index 548527f1..b0949d66 100644
--- a/src/Altinn.Common.PEP/Altinn.Common.PEP/Helpers/DecisionHelper.cs
+++ b/src/Altinn.Common.PEP/Altinn.Common.PEP/Helpers/DecisionHelper.cs
@@ -178,8 +178,8 @@ private static List<XacmlJsonAttribute> CreateSubjectAttributes(IEnumerable<Clai
             XacmlJsonAttribute personUuidAttribute = null;
             XacmlJsonAttribute partyIdAttribute = null;
             XacmlJsonAttribute resourceIdAttribute = null;
-            XacmlJsonAttribute orgLegacy = null;
-            XacmlJsonAttribute orgAttribute = null;
+            XacmlJsonAttribute legacyOrganizationNumberAttibute = null;
+            XacmlJsonAttribute organizationNumberAttribute = null;
             XacmlJsonAttribute systemUserAttribute = null;
 
             // Mapping all claims on user to attributes
@@ -188,8 +188,8 @@ private static List<XacmlJsonAttribute> CreateSubjectAttributes(IEnumerable<Clai
                 if (IsCamelCaseOrgnumberClaim(claim.Type))
                 {
                     // Set by Altinn authentication this format
-                    orgLegacy = CreateXacmlJsonAttribute(AltinnXacmlUrns.OrganizationNumber, claim.Value, DefaultType, claim.Issuer);
-                    orgAttribute = CreateXacmlJsonAttribute(AltinnXacmlUrns.OrganizationNumberAttribute, claim.Value, DefaultType, claim.Issuer);
+                    legacyOrganizationNumberAttibute = CreateXacmlJsonAttribute(AltinnXacmlUrns.OrganizationNumber, claim.Value, DefaultType, claim.Issuer);
+                    organizationNumberAttribute = CreateXacmlJsonAttribute(AltinnXacmlUrns.OrganizationNumberAttribute, claim.Value, DefaultType, claim.Issuer);
                 }
                 else if (IsScopeClaim(claim.Type))
                 {
@@ -222,8 +222,8 @@ private static List<XacmlJsonAttribute> CreateSubjectAttributes(IEnumerable<Clai
                 else if (IsOrganizationNumberAttributeClaim(claim.Type))
                 {
                     // If claimlist contains new format of orgnumber reset any old. To ensure there is not a mismatch
-                    orgAttribute = CreateXacmlJsonAttribute(AltinnXacmlUrns.OrganizationNumberAttribute, claim.Value, DefaultType, claim.Issuer);
-                    orgLegacy = null;
+                    organizationNumberAttribute = CreateXacmlJsonAttribute(AltinnXacmlUrns.OrganizationNumberAttribute, claim.Value, DefaultType, claim.Issuer);
+                    legacyOrganizationNumberAttibute = null;
                 }
                 else if (IsValidUrn(claim.Type))
                 {
@@ -252,15 +252,15 @@ private static List<XacmlJsonAttribute> CreateSubjectAttributes(IEnumerable<Clai
             {
                 attributes.Add(systemUserAttribute);
             }
-            else if (orgLegacy != null)
+            else if (legacyOrganizationNumberAttibute != null)
             {
                 // For legeacy we set both
-                attributes.Add(orgLegacy);
-                attributes.Add(orgAttribute);
+                attributes.Add(legacyOrganizationNumberAttibute);
+                attributes.Add(organizationNumberAttribute);
             }
-            else if (orgAttribute != null)
+            else if (organizationNumberAttribute != null)
             {
-                attributes.Add(orgAttribute);
+                attributes.Add(organizationNumberAttribute);
             }
 
             return attributes;