Fix PR comments

Jakab László · Jakab László · commit 3f56fcc8f782 · 2022-12-01T09:52:19.000+01:00
diff --git a/AutSoftCore.sln b/AutSoftCore.sln
@@ -32,6 +32,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4E394277
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutSoft.AspNetCore.Auth", "src\AutSoft.AspNetCore.Auth\AutSoft.AspNetCore.Auth.csproj", "{6B158B44-E28E-4276-BB65-72CDA4163F39}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -62,6 +64,10 @@ Global
 		{D4D62897-E6D6-484E-AE4E-F3A0347ADD88}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D4D62897-E6D6-484E-AE4E-F3A0347ADD88}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4D62897-E6D6-484E-AE4E-F3A0347ADD88}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B158B44-E28E-4276-BB65-72CDA4163F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B158B44-E28E-4276-BB65-72CDA4163F39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B158B44-E28E-4276-BB65-72CDA4163F39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B158B44-E28E-4276-BB65-72CDA4163F39}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -73,6 +79,7 @@ Global
 		{FF908529-9DDE-4DFB-ABA9-A2045E715B21} = {C46AA3F7-CBFE-428A-AA49-D1A1D40AB8A6}
 		{28371EF8-D3D3-40CA-AAE9-29D80AE0BF3F} = {C46AA3F7-CBFE-428A-AA49-D1A1D40AB8A6}
 		{D4D62897-E6D6-484E-AE4E-F3A0347ADD88} = {7029D162-AEB0-4B68-A21E-90ABCD21DAD3}
+		{6B158B44-E28E-4276-BB65-72CDA4163F39} = {C46AA3F7-CBFE-428A-AA49-D1A1D40AB8A6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E4767DF1-41A6-4BF0-A957-2718986D8BC7}
diff --git a/src/AutSoft.All/AutSoft.All.csproj b/src/AutSoft.All/AutSoft.All.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\AutSoft.AspNetCore.Auth\AutSoft.AspNetCore.Auth.csproj" />
     <ProjectReference Include="..\AutSoft.DbScaffolding.Identity\AutSoft.DbScaffolding.Identity.csproj" />
     <ProjectReference Include="..\AutSoft.Linq\AutSoft.Linq.csproj" />
   </ItemGroup>
diff --git a/src/AutSoft.All/ServiceCollectionExtensions.cs b/src/AutSoft.All/ServiceCollectionExtensions.cs
@@ -1,3 +1,4 @@
+using AutSoft.AspNetCore.Auth;
 using AutSoft.Common;
 
 using Microsoft.Extensions.DependencyInjection;
@@ -15,6 +16,9 @@ public static class ServiceCollectionExtensions
     /// <returns>Expanded service collection</returns>
     public static IServiceCollection AddAutSoftAll(this IServiceCollection services)
     {
-        return services.AddAutSoftCommon();
+        services.AddAutSoftAspNetCoreAuth();
+        services.AddAutSoftCommon();
+
+        return services;
     }
 }
diff --git a/src/AutSoft.AspNetCore.Auth/AnyPolicies/AnyPoliciesAuthorizationHandler.cs b/src/AutSoft.AspNetCore.Auth/AnyPolicies/AnyPoliciesAuthorizationHandler.cs
@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace AutSoft.Common.AnyPolicies;
+namespace AutSoft.AspNetCore.Auth.AnyPolicies;
 
 /// <summary>
 /// Evulate the policies in the <see cref="AnyPoliciesRequirement"/> with OR relationship,
-/// so it is enough for a policy to pass the test
+/// so it is enough for one policy to pass the authorization requirement
 /// </summary>
 public class AnyPoliciesAuthorizationHandler : AuthorizationHandler<AnyPoliciesRequirement>
 {
@@ -15,11 +15,9 @@ public class AnyPoliciesAuthorizationHandler : AuthorizationHandler<AnyPoliciesR
     /// Initialize a new instance of the <see cref="AnyPoliciesAuthorizationHandler"/> class.
     /// </summary>
     /// <param name="serviceProvider">An instance of <see cref="IServiceProvider"/></param>
-    /// <remarks>
-    /// Not possible to inject <see cref="IAuthorizationService"/>, because it would be a circular reference
-    /// </remarks>
     public AnyPoliciesAuthorizationHandler(IServiceProvider serviceProvider)
     {
+        // Not possible to inject IAuthorizationService, because it would be a circular reference
         _serviceProvider = serviceProvider;
     }
 
diff --git a/src/AutSoft.AspNetCore.Auth/AnyPolicies/AnyPoliciesAuthorizeAttribute.cs b/src/AutSoft.AspNetCore.Auth/AnyPolicies/AnyPoliciesAuthorizeAttribute.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 
-namespace AutSoft.Common.AnyPolicies;
+namespace AutSoft.AspNetCore.Auth.AnyPolicies;
 
 /// <summary>
 /// The policies, which are specified in the constructor or <see cref="Policies"/> property
@@ -20,7 +20,6 @@ public class AnyPoliciesAuthorizeAttribute : AuthorizeAttribute
     public string[] Policies
     {
         get => _policies;
-
         set
         {
             _policies = value;
diff --git a/src/AutSoft.AspNetCore.Auth/AnyPolicies/AnyPoliciesPolicyProvider.cs b/src/AutSoft.AspNetCore.Auth/AnyPolicies/AnyPoliciesPolicyProvider.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Options;
 
-namespace AutSoft.Common.AnyPolicies;
+namespace AutSoft.AspNetCore.Auth.AnyPolicies;
 
 /// <summary>
 /// Dynamically generate policies based on <see cref="AnyPoliciesAuthorizeAttribute"/>,
diff --git a/src/AutSoft.AspNetCore.Auth/AnyPolicies/AnyPoliciesRequirement.cs b/src/AutSoft.AspNetCore.Auth/AnyPolicies/AnyPoliciesRequirement.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 
-namespace AutSoft.Common.AnyPolicies;
+namespace AutSoft.AspNetCore.Auth.AnyPolicies;
 
 /// <summary>
 /// Requirement of wanted to combine OR authorizations
diff --git a/src/AutSoft.AspNetCore.Auth/AutSoft.AspNetCore.Auth.csproj b/src/AutSoft.AspNetCore.Auth/AutSoft.AspNetCore.Auth.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/AutSoft.AspNetCore.Auth/ServiceCollectionExtensions.cs b/src/AutSoft.AspNetCore.Auth/ServiceCollectionExtensions.cs
@@ -0,0 +1,24 @@
+using AutSoft.AspNetCore.Auth.AnyPolicies;
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace AutSoft.AspNetCore.Auth;
+
+/// <summary>
+/// Register all relevant services into dependency injection container
+/// </summary>
+public static class ServiceCollectionExtensions
+{
+    /// <summary>
+    /// Register all relevant services into dependency injection container
+    /// </summary>
+    /// <returns>Expanded service collection</returns>
+    public static IServiceCollection AddAutSoftAspNetCoreAuth(this IServiceCollection services)
+    {
+        services.AddSingleton<IAuthorizationPolicyProvider, AnyPoliciesPolicyProvider>();
+        services.AddSingleton<IAuthorizationHandler, AnyPoliciesAuthorizationHandler>();
+
+        return services;
+    }
+}
diff --git a/src/AutSoft.Core/AutSoft.Common.csproj b/src/AutSoft.Core/AutSoft.Common.csproj
@@ -7,8 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" />
     <PackageReference Include="Stateless" />
diff --git a/src/AutSoft.Core/ServiceCollectionExtensions.cs b/src/AutSoft.Core/ServiceCollectionExtensions.cs
@@ -1,7 +1,5 @@
-using AutSoft.Common.AnyPolicies;
 using AutSoft.Common.Time;
 
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace AutSoft.Common;
@@ -17,11 +15,6 @@ public static class ServiceCollectionExtensions
     /// <returns>Expanded service collection</returns>
     public static IServiceCollection AddAutSoftCommon(this IServiceCollection services)
     {
-        services.AddSingleton<ITimeProvider, TimeProvider>();
-
-        services.AddSingleton<IAuthorizationPolicyProvider, AnyPoliciesPolicyProvider>();
-        services.AddSingleton<IAuthorizationHandler, AnyPoliciesAuthorizationHandler>();
-
-        return services;
+        return services.AddSingleton<ITimeProvider, TimeProvider>();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using AutSoft.AspNetCore.Auth;`
`1`	`2`	`using AutSoft.Common;`
`2`	`3`
`3`	`4`	`using Microsoft.Extensions.DependencyInjection;`
`@@ -15,6 +16,9 @@ public static class ServiceCollectionExtensions`
`15`	`16`	`/// <returns>Expanded service collection</returns>`
`16`	`17`	`public static IServiceCollection AddAutSoftAll(this IServiceCollection services)`
`17`	`18`	`{`
`18`		`- return services.AddAutSoftCommon();`
	`19`	`+ services.AddAutSoftAspNetCoreAuth();`
	`20`	`+ services.AddAutSoftCommon();`
	`21`	`+`
	`22`	`+ return services;`
`19`	`23`	`}`
`20`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Microsoft.AspNetCore.Authorization;`
`2`	`2`
`3`		`-namespace AutSoft.Common.AnyPolicies;`
	`3`	`+namespace AutSoft.AspNetCore.Auth.AnyPolicies;`
`4`	`4`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// The policies, which are specified in the constructor or <see cref="Policies"/> property`
`@@ -20,7 +20,6 @@ public class AnyPoliciesAuthorizeAttribute : AuthorizeAttribute`
`20`	`20`	`public string[] Policies`
`21`	`21`	`{`
`22`	`22`	`get => _policies;`
`23`		`-`
`24`	`23`	`set`
`25`	`24`	`{`
`26`	`25`	`_policies = value;`