Replace authorization project with new rule (#803)

graphql-dotnet · Jun 22, 2022 · a80ad6a · a80ad6a
1 parent 5e6a888
commit a80ad6a
Show file tree

Hide file tree

Showing 26 changed files with 757 additions and 601 deletions.
diff --git a/GraphQL.Server.sln b/GraphQL.Server.sln
@@ -29,8 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ui.GraphiQL", "src\Ui.Graph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ui.Voyager", "src\Ui.Voyager\Ui.Voyager.csproj", "{B2C278E4-6A1A-4F83-AE53-C9469B4056EE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authorization.AspNetCore", "src\Authorization.AspNetCore\Authorization.AspNetCore.csproj", "{7A71AF0D-FE5F-4607-A6F6-960FD98CF840}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authorization.AspNetCore.Tests", "tests\Authorization.AspNetCore.Tests\Authorization.AspNetCore.Tests.csproj", "{741DEEE6-FD0B-4F99-8A6F-43584B3E8D5F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Server.Tests", "tests\Samples.Server.Tests\Samples.Server.Tests.csproj", "{62E7B30D-CB34-45EA-A410-2CAE127385D7}"
@@ -103,10 +101,6 @@ Global
 		{B2C278E4-6A1A-4F83-AE53-C9469B4056EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B2C278E4-6A1A-4F83-AE53-C9469B4056EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B2C278E4-6A1A-4F83-AE53-C9469B4056EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A71AF0D-FE5F-4607-A6F6-960FD98CF840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A71AF0D-FE5F-4607-A6F6-960FD98CF840}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A71AF0D-FE5F-4607-A6F6-960FD98CF840}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A71AF0D-FE5F-4607-A6F6-960FD98CF840}.Release|Any CPU.Build.0 = Release|Any CPU
 		{741DEEE6-FD0B-4F99-8A6F-43584B3E8D5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{741DEEE6-FD0B-4F99-8A6F-43584B3E8D5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{741DEEE6-FD0B-4F99-8A6F-43584B3E8D5F}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/samples/Samples.Server/CustomErrorInfoProvider.cs b/samples/Samples.Server/CustomErrorInfoProvider.cs
@@ -1,6 +1,6 @@
 using System.Text;
 using GraphQL.Execution;
-using GraphQL.Server.Authorization.AspNetCore;
+using GraphQL.Server.Transports.AspNetCore.Errors;
 using Microsoft.AspNetCore.Authorization;
 
 namespace GraphQL.Samples.Server;
@@ -11,30 +11,22 @@ namespace GraphQL.Samples.Server;
 /// </summary>
 public class CustomErrorInfoProvider : ErrorInfoProvider
 {
-    private readonly IAuthorizationErrorMessageBuilder _messageBuilder;
-
-    public CustomErrorInfoProvider(IAuthorizationErrorMessageBuilder messageBuilder)
-    {
-        _messageBuilder = messageBuilder;
-    }
-
     public override ErrorInfo GetInfo(ExecutionError executionError)
     {
         var info = base.GetInfo(executionError);
-        info.Message = executionError switch
-        {
-            AuthorizationError authorizationError => GetAuthorizationErrorMessage(authorizationError),
-            _ => info.Message,
-        };
+
+        if (executionError is AccessDeniedError accessDeniedError)
+            info.Message = GetAuthorizationErrorMessage(accessDeniedError);
+
         return info;
     }
 
-    private string GetAuthorizationErrorMessage(AuthorizationError error)
+    private string GetAuthorizationErrorMessage(AccessDeniedError error)
     {
         var errorMessage = new StringBuilder();
-        _messageBuilder.AppendFailureHeader(errorMessage, error.OperationType);
+        errorMessage.Append(error.Message);
 
-        foreach (var failedRequirement in error.AuthorizationResult.Failure.FailedRequirements)
+        foreach (var failedRequirement in error.PolicyAuthorizationResult.Failure.FailedRequirements)
         {
             switch (failedRequirement)
             {
@@ -44,9 +36,6 @@ private string GetAuthorizationErrorMessage(AuthorizationError error)
                     errorMessage.Append(minimumAgeRequirement.MinimumAge);
                     errorMessage.Append(" years old.");
                     break;
-                default:
-                    _messageBuilder.AppendFailureLine(errorMessage, failedRequirement);
-                    break;
             }
         }
 

diff --git a/samples/Samples.Server/Samples.Server.csproj b/samples/Samples.Server/Samples.Server.csproj
@@ -18,7 +18,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Transports.AspNetCore\Transports.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\src\Authorization.AspNetCore\Authorization.AspNetCore.csproj" />
     <ProjectReference Include="..\..\src\Ui.GraphiQL\Ui.GraphiQL.csproj" />
     <ProjectReference Include="..\..\src\Ui.Playground\Ui.Playground.csproj" />
     <ProjectReference Include="..\..\src\Ui.Altair\Ui.Altair.csproj" />

diff --git a/samples/Samples.Server/Startup.cs b/samples/Samples.Server/Startup.cs
@@ -3,7 +3,6 @@
 using GraphQL.MicrosoftDI;
 using GraphQL.Samples.Schemas.Chat;
 using GraphQL.Server;
-using GraphQL.Server.Authorization.AspNetCore;
 using GraphQL.Server.Transports.AspNetCore;
 using GraphQL.Server.Ui.Altair;
 using GraphQL.Server.Ui.GraphiQL;
@@ -30,8 +29,7 @@ public void ConfigureServices(IServiceCollection services)
     {
         services
             .AddSingleton<IChat, Chat>()
-            .Configure<ErrorInfoProviderOptions>(opt => opt.ExposeExceptionStackTrace = Environment.IsDevelopment())
-            .AddTransient<IAuthorizationErrorMessageBuilder, DefaultAuthorizationErrorMessageBuilder>(); // required by CustomErrorInfoProvider
+            .Configure<ErrorInfoProviderOptions>(opt => opt.ExposeExceptionStackTrace = Environment.IsDevelopment());
 
         services.AddGraphQL(builder => builder
             .AddApolloTracing()

diff --git a/samples/Samples.Server/StartupWithRouting.cs b/samples/Samples.Server/StartupWithRouting.cs
@@ -3,7 +3,6 @@
 using GraphQL.MicrosoftDI;
 using GraphQL.Samples.Schemas.Chat;
 using GraphQL.Server;
-using GraphQL.Server.Authorization.AspNetCore;
 using GraphQL.Server.Transports.AspNetCore;
 using GraphQL.Server.Ui.Altair;
 using GraphQL.Server.Ui.GraphiQL;
@@ -31,8 +30,7 @@ public void ConfigureServices(IServiceCollection services)
         services
             .AddRouting()
             .AddSingleton<IChat, Chat>()
-            .Configure<ErrorInfoProviderOptions>(opt => opt.ExposeExceptionStackTrace = Environment.IsDevelopment())
-            .AddTransient<IAuthorizationErrorMessageBuilder, DefaultAuthorizationErrorMessageBuilder>(); // required by CustomErrorInfoProvider
+            .Configure<ErrorInfoProviderOptions>(opt => opt.ExposeExceptionStackTrace = Environment.IsDevelopment());
 
         services.AddGraphQL(builder => builder
             .AddApolloTracing()

diff --git a/src/All/All.csproj b/src/All/All.csproj
@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Authorization.AspNetCore\Authorization.AspNetCore.csproj" />
     <ProjectReference Include="..\Transports.AspNetCore\Transports.AspNetCore.csproj" />
     <ProjectReference Include="..\Ui.Altair\Ui.Altair.csproj" />
     <ProjectReference Include="..\Ui.GraphiQL\Ui.GraphiQL.csproj" />

diff --git a/src/Authorization.AspNetCore/Authorization.AspNetCore.csproj b/src/Authorization.AspNetCore/Authorization.AspNetCore.csproj
diff --git a/src/Authorization.AspNetCore/AuthorizationError.cs b/src/Authorization.AspNetCore/AuthorizationError.cs
diff --git a/src/Authorization.AspNetCore/AuthorizationValidationRule.cs b/src/Authorization.AspNetCore/AuthorizationValidationRule.cs