Upgrade and refactoring

Tech-Fabric · Mar 13, 2024 · 2d5f2d3 · 2d5f2d3
1 parent a3c544d
commit 2d5f2d3
Show file tree

Hide file tree

Showing 26 changed files with 64 additions and 10 deletions.
diff --git a/CloudFabric.Auth.csproj → ....Auth.Tests/CloudFabric.Auth.Tests.csproj b/CloudFabric.Auth.csproj → ....Auth.Tests/CloudFabric.Auth.Tests.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <VersionPrefix>1.0.3</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/CloudFabric.Auth.sln b/CloudFabric.Auth.sln
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31717.71
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudFabric.Auth", "CloudFabric.Auth.csproj", "{55AB88B0-1446-45D9-B347-1B74260C15C7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudFabric.Auth", "CloudFabric.Auth\CloudFabric.Auth.csproj", "{A876E3A3-2815-41C7-A7F8-B2005736EAFA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudFabric.Auth.Tests", "CloudFabric.Auth.Tests\CloudFabric.Auth.Tests.csproj", "{76CE2B15-9111-479E-BB63-E7A3EBC057DB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +17,14 @@ Global
 		{55AB88B0-1446-45D9-B347-1B74260C15C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{55AB88B0-1446-45D9-B347-1B74260C15C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{55AB88B0-1446-45D9-B347-1B74260C15C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A876E3A3-2815-41C7-A7F8-B2005736EAFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A876E3A3-2815-41C7-A7F8-B2005736EAFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A876E3A3-2815-41C7-A7F8-B2005736EAFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A876E3A3-2815-41C7-A7F8-B2005736EAFA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76CE2B15-9111-479E-BB63-E7A3EBC057DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76CE2B15-9111-479E-BB63-E7A3EBC057DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76CE2B15-9111-479E-BB63-E7A3EBC057DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76CE2B15-9111-479E-BB63-E7A3EBC057DB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/.gitignore → CloudFabric.Auth/.gitignore b/.gitignore → CloudFabric.Auth/.gitignore
diff --git a/Authorization/ClaimsHelper.cs → ...Fabric.Auth/Authorization/ClaimsHelper.cs b/Authorization/ClaimsHelper.cs → ...Fabric.Auth/Authorization/ClaimsHelper.cs
diff --git a/Authorization/HasPermissionAttribute.cs → ...h/Authorization/HasPermissionAttribute.cs b/Authorization/HasPermissionAttribute.cs → ...h/Authorization/HasPermissionAttribute.cs
diff --git a/.../PermissionAuthorizationPolicyProvider.cs → .../PermissionAuthorizationPolicyProvider.cs b/.../PermissionAuthorizationPolicyProvider.cs → .../PermissionAuthorizationPolicyProvider.cs
diff --git a/Authorization/PermissionHandler.cs → ...c.Auth/Authorization/PermissionHandler.cs b/Authorization/PermissionHandler.cs → ...c.Auth/Authorization/PermissionHandler.cs
diff --git a/Authorization/PermissionRequirement.cs → ...th/Authorization/PermissionRequirement.cs b/Authorization/PermissionRequirement.cs → ...th/Authorization/PermissionRequirement.cs
diff --git a/Authorization/PermissionResultHandler.cs → .../Authorization/PermissionResultHandler.cs b/Authorization/PermissionResultHandler.cs → .../Authorization/PermissionResultHandler.cs
diff --git a/Authorization/PrincipalExtensions.cs → ...Auth/Authorization/PrincipalExtensions.cs b/Authorization/PrincipalExtensions.cs → ...Auth/Authorization/PrincipalExtensions.cs
diff --git a/CHANGELOG.md → CloudFabric.Auth/CHANGELOG.md b/CHANGELOG.md → CloudFabric.Auth/CHANGELOG.md
diff --git a/CloudFabric.Auth/CloudFabric.Auth.csproj b/CloudFabric.Auth/CloudFabric.Auth.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <VersionPrefix>1.0.3</VersionPrefix>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/Enums/AccessControlRuleEnum.cs → ...abric.Auth/Enums/AccessControlRuleEnum.cs b/Enums/AccessControlRuleEnum.cs → ...abric.Auth/Enums/AccessControlRuleEnum.cs
diff --git a/...dation/IntrospectionHttpClientProvider.cs → ...dation/IntrospectionHttpClientProvider.cs b/...dation/IntrospectionHttpClientProvider.cs → ...dation/IntrospectionHttpClientProvider.cs
diff --git a/...e/TokenValidation/MiddlewareExtensions.cs → ...e/TokenValidation/MiddlewareExtensions.cs b/...e/TokenValidation/MiddlewareExtensions.cs → ...e/TokenValidation/MiddlewareExtensions.cs
diff --git a/...enValidation/TokenValidationMiddleware.cs → ...enValidation/TokenValidationMiddleware.cs b/...enValidation/TokenValidationMiddleware.cs → ...enValidation/TokenValidationMiddleware.cs
diff --git a/Models/AccessControlGroupViewModel.cs → ...uth/Models/AccessControlGroupViewModel.cs b/Models/AccessControlGroupViewModel.cs → ...uth/Models/AccessControlGroupViewModel.cs
diff --git a/Models/AccessControlSettingViewModel.cs → ...h/Models/AccessControlSettingViewModel.cs b/Models/AccessControlSettingViewModel.cs → ...h/Models/AccessControlSettingViewModel.cs
diff --git a/Models/AccessControlViewModel.cs → ...ric.Auth/Models/AccessControlViewModel.cs b/Models/AccessControlViewModel.cs → ...ric.Auth/Models/AccessControlViewModel.cs
diff --git a/Models/AccessTokenInfoViewModel.cs → ...c.Auth/Models/AccessTokenInfoViewModel.cs b/Models/AccessTokenInfoViewModel.cs → ...c.Auth/Models/AccessTokenInfoViewModel.cs
diff --git a/Models/AccessTokenViewModel.cs → ...abric.Auth/Models/AccessTokenViewModel.cs b/Models/AccessTokenViewModel.cs → ...abric.Auth/Models/AccessTokenViewModel.cs
diff --git a/Models/Request/AccessTokenInfoRequest.cs → .../Models/Request/AccessTokenInfoRequest.cs b/Models/Request/AccessTokenInfoRequest.cs → .../Models/Request/AccessTokenInfoRequest.cs
diff --git a/Options/AuthClientOptions.cs → ...dFabric.Auth/Options/AuthClientOptions.cs b/Options/AuthClientOptions.cs → ...dFabric.Auth/Options/AuthClientOptions.cs
diff --git a/Options/AuthServerOptions.cs → ...dFabric.Auth/Options/AuthServerOptions.cs b/Options/AuthServerOptions.cs → ...dFabric.Auth/Options/AuthServerOptions.cs
diff --git a/ServiceCollectionExtensions.cs → ...abric.Auth/ServiceCollectionExtensions.cs b/ServiceCollectionExtensions.cs → ...abric.Auth/ServiceCollectionExtensions.cs
@@ -10,11 +10,15 @@
 using System;
 using System.IdentityModel.Tokens.Jwt;
 using System.Text;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.Net.Http.Headers;
 
 namespace CloudFabric.Auth
 {
     public static class ServiceCollectionExtensions
     {
+        private static readonly string JWT_OR_COOKIE_SCHEME = "JWT_OR_COOKIE";
+
         /// <summary>
         /// Adds token validation services, policies and handlers
         /// </summary>
@@ -26,15 +30,22 @@ public static IServiceCollection AddCloudFabricAuth(
             IConfigurationSection authClientOptions
         )
         {
+            services.AddHttpClient();
             services.Configure<AuthClientOptions>(authClientOptions);
             services.AddScoped<IntrospectionHttpClientProvider>();
 
             services.AddAuthentication(
                     options =>
                     {
-                        options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-                        options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-                        options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
+                        options.DefaultAuthenticateScheme = JWT_OR_COOKIE_SCHEME;
+                        options.DefaultChallengeScheme = JWT_OR_COOKIE_SCHEME;
+                        options.DefaultScheme = JWT_OR_COOKIE_SCHEME;
+                    }
+                )
+                .AddCookie(
+                    options =>
+                    {
+
                     }
                 )
                 .AddJwtBearer(
@@ -44,9 +55,16 @@ IConfigurationSection authClientOptions
                         options.RequireHttpsMetadata = false;
 
                         var jwtHandler = new JwtSecurityTokenHandler();
+
+                        JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+
                         jwtHandler.InboundClaimTypeMap.Clear();
-                        options.SecurityTokenValidators.Clear();
-                        options.SecurityTokenValidators.Add(jwtHandler);
+                        jwtHandler.OutboundClaimTypeMap.Clear();
+                        //options.SecurityTokenValidators.Clear();
+                        //options.SecurityTokenValidators.Add(jwtHandler);
+
+                        options.TokenHandlers.Clear();
+                        options.TokenHandlers.Add(jwtHandler);
 
                         var tokenOptions = authClientOptions.Get<AuthClientOptions>();
                         options.TokenValidationParameters =
@@ -64,7 +82,21 @@ IConfigurationSection authClientOptions
                                 )
                             };
                     }
-                );
+                )
+                .AddPolicyScheme(JWT_OR_COOKIE_SCHEME, JWT_OR_COOKIE_SCHEME, options =>
+                {
+                    // runs on each request
+                    options.ForwardDefaultSelector = context =>
+                    {
+                        // filter by auth type
+                        string authorization = context.Request.Headers[HeaderNames.Authorization];
+                        if (!string.IsNullOrEmpty(authorization) && authorization.StartsWith("Bearer "))
+                            return JwtBearerDefaults.AuthenticationScheme;
+                
+                        // otherwise always check for cookie auth
+                        return CookieAuthenticationDefaults.AuthenticationScheme;
+                    };
+                });
 
             //Register the Permission policy handlers
             services.AddSingleton<IAuthorizationMiddlewareResultHandler, PermissionResultHandler>();

diff --git a/nuget.config b/nuget.config
@@ -3,6 +3,5 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="CloudFabric" value="https://pkgs.dev.azure.com/CloudFabriccommerce/_packaging/CloudFabric/nuget/v3/index.json" />
   </packageSources>
-</configuration>
+</configuration>