tests: add tests for mandatoryIdentityClaimHandler

Refs: CPLP-3102
eclipse-tractusx · Nov 30, 2023 · 47f9b96 · 47f9b96
1 parent fa7a53c
commit 47f9b96
Show file tree

Hide file tree

Showing 11 changed files with 148 additions and 265 deletions.
diff --git a/src/Portal.Backend.sln b/src/Portal.Backend.sln
@@ -200,8 +200,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Linq", "framework
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Linq.Tests", "..\tests\framework\Framework.Linq.Tests\Framework.Linq.Tests.csproj", "{4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Authorization", "framework\Framework.Authorization\Framework.Authorization.csproj", "{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Models.Tests", "..\tests\framework\Framework.Models.Tests\Framework.Models.Tests.csproj", "{EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.ProcessIdentity", "framework\Framework.ProcessIdentity\Framework.ProcessIdentity.csproj", "{4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}"
@@ -1284,18 +1282,6 @@ Global
 		{4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Release|x64.Build.0 = Release|Any CPU
 		{4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Release|x86.ActiveCfg = Release|Any CPU
 		{4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Release|x86.Build.0 = Release|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Debug|x64.Build.0 = Debug|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Debug|x86.Build.0 = Debug|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Release|x64.ActiveCfg = Release|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Release|x64.Build.0 = Release|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6}.Release|x86.Build.0 = Release|Any CPU
 		{EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1635,7 +1621,6 @@ Global
 		{EC493B36-9E14-4CAF-973F-FB96FDAF546F} = {A878BDF1-6DB6-4BA5-A724-92885A710856}
 		{1694E75F-ABCE-4573-B805-18ED50F148FD} = {323C198D-A8C6-4EB0-8B79-72624275E35F}
 		{031237BF-7B2A-4B37-9E37-4D4C575FDD22} = {23500169-FC01-4D2B-A997-E7FAE2169FC0}
-		{CB9FFDD9-7F41-44DA-BFA8-C157A96D51F6} = {23500169-FC01-4D2B-A997-E7FAE2169FC0}
 		{4CA307AB-A0F8-4AA5-A09D-91F47DA3054A} = {23500169-FC01-4D2B-A997-E7FAE2169FC0}
 		{47E089E3-E875-4045-9E58-C1223BE899E9} = {23500169-FC01-4D2B-A997-E7FAE2169FC0}
 		{9D574E57-75A6-4965-AF23-ACE0BB9CD0B3} = {323C198D-A8C6-4EB0-8B79-72624275E35F}

diff --git a/src/framework/Framework.Authorization/ClaimRequestPathHandler.cs b/src/framework/Framework.Authorization/ClaimRequestPathHandler.cs
diff --git a/src/framework/Framework.Authorization/Framework.Authorization.csproj b/src/framework/Framework.Authorization/Framework.Authorization.csproj
diff --git a/src/framework/Framework.Authorization/MandatoryEnumTypeClaimHandler.cs b/src/framework/Framework.Authorization/MandatoryEnumTypeClaimHandler.cs
diff --git a/src/framework/Framework.Authorization/MandatoryGuidClaimHandler.cs b/src/framework/Framework.Authorization/MandatoryGuidClaimHandler.cs
diff --git a/src/framework/Framework.PublicInfos/Framework.PublicInfos.csproj b/src/framework/Framework.PublicInfos/Framework.PublicInfos.csproj
@@ -33,7 +33,6 @@
     <ProjectReference Include="..\Framework.DateTimeProvider\Framework.DateTimeProvider.csproj" />
     <ProjectReference Include="..\Framework.ErrorHandling.Web\Framework.ErrorHandling.Web.csproj" />
     <ProjectReference Include="..\Framework.Swagger\Framework.Swagger.csproj" />
-    <ProjectReference Include="..\Framework.Authorization\Framework.Authorization.csproj" />
     <ProjectReference Include="..\Framework.Linq\Framework.Linq.csproj" />
     <ProjectReference Include="..\Framework.Logging\Framework.Logging.csproj" />
   </ItemGroup>

diff --git a/src/framework/Framework.Web/Framework.Web.csproj b/src/framework/Framework.Web/Framework.Web.csproj
@@ -35,7 +35,6 @@
     <ProjectReference Include="..\Framework.ProcessIdentity\Framework.ProcessIdentity.csproj" />
     <ProjectReference Include="..\Framework.PublicInfos\Framework.PublicInfos.csproj" />
     <ProjectReference Include="..\Framework.Swagger\Framework.Swagger.csproj" />
-    <ProjectReference Include="..\Framework.Authorization\Framework.Authorization.csproj" />
     <ProjectReference Include="..\Framework.Linq\Framework.Linq.csproj" />
     <ProjectReference Include="..\Framework.Logging\Framework.Logging.csproj" />
   </ItemGroup>

diff --git a/...rization/MandatoryIdentityClaimHandler.cs → ...work.Web/MandatoryIdentityClaimHandler.cs b/...rization/MandatoryIdentityClaimHandler.cs → ...work.Web/MandatoryIdentityClaimHandler.cs
@@ -18,24 +18,22 @@
  ********************************************************************************/
 
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Logging;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
-using Microsoft.Extensions.Logging;
 
-namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Authorization
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web
 {
     public class MandatoryIdentityClaimRequirement : IAuthorizationRequirement
     {
-        private readonly PolicyTypeId _policyTypeId;
-
         public MandatoryIdentityClaimRequirement(PolicyTypeId policyTypeId)
         {
-            _policyTypeId = policyTypeId;
+            PolicyTypeId = policyTypeId;
         }
 
-        public PolicyTypeId PolicyTypeId { get => _policyTypeId; }
+        public PolicyTypeId PolicyTypeId { get; }
     }
 
     public class MandatoryIdentityClaimHandler : AuthorizationHandler<MandatoryIdentityClaimRequirement>
@@ -71,7 +69,7 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
             }
             catch (Exception e)
             {
-                _logger.LogInformation("unable to retrieve IdentityData", e);
+                _logger.LogInformation(e, "unable to retrieve IdentityData");
                 context.Fail();
             }
             return Task.CompletedTask;

diff --git a/src/framework/Framework.Web/StartupServiceExtensions.cs b/src/framework/Framework.Web/StartupServiceExtensions.cs
@@ -22,7 +22,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Authorization;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Cors;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider.DependencyInjection;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;

diff --git a/tests/framework/Framework.Web.Tests/Framework.Web.Tests.csproj b/tests/framework/Framework.Web.Tests/Framework.Web.Tests.csproj
@@ -1,5 +1,4 @@
 <!--
-- Copyright (c) 2021, 2023 BMW Group AG
 - Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
 -
 - See the NOTICE file(s) distributed with this work for additional