Remove GraphQLAuthorizeAttribute (#553)

sungam3r · web-flow · commit 2ce4c6ae42c0 · 2021-04-17T08:12:32.000+03:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>5.0.1-preview</VersionPrefix>
+    <VersionPrefix>6.0.0-preview</VersionPrefix>
     <LangVersion>latest</LangVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>logo.64x64.png</PackageIcon>
diff --git a/Tests.props b/Tests.props
@@ -11,14 +11,14 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="NSubstitute" Version="4.2.2" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.13" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.4" Condition="'$(TargetFramework)' == 'net5'" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.5" Condition="'$(TargetFramework)' == 'net5'" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Samples.Server/Samples.Server.csproj b/samples/Samples.Server/Samples.Server.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="4.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
   </ItemGroup>
 
diff --git a/src/All/All.csproj b/src/All/All.csproj
@@ -21,9 +21,9 @@
     <ProjectReference Include="..\Ui.Playground\Ui.Playground.csproj" />
     <ProjectReference Include="..\Ui.Voyager\Ui.Voyager.csproj" />
 
-    <PackageReference Include="GraphQL.MemoryCache" Version="4.1.0" />
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="4.1.0" />
-    <PackageReference Include="GraphQL.SystemReactive" Version="4.1.0" />
+    <PackageReference Include="GraphQL.MemoryCache" Version="4.3.0" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="4.3.0" />
+    <PackageReference Include="GraphQL.SystemReactive" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Authorization.AspNetCore/GraphQLAuthorizeAttribute.cs b/src/Authorization.AspNetCore/GraphQLAuthorizeAttribute.cs
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
@@ -8,8 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL" Version="4.1.0" />
-    <PackageReference Include="GraphQL.DataLoader" Version="4.1.0" />
+    <PackageReference Include="GraphQL.DataLoader" Version="4.3.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.0" />
   </ItemGroup>
 
diff --git a/src/Transports.AspNetCore.NewtonsoftJson/Transports.AspNetCore.NewtonsoftJson.csproj b/src/Transports.AspNetCore.NewtonsoftJson/Transports.AspNetCore.NewtonsoftJson.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Transports.AspNetCore\Transports.AspNetCore.csproj" />
-    <PackageReference Include="GraphQL.NewtonsoftJson" Version="4.1.0" />
+    <PackageReference Include="GraphQL.NewtonsoftJson" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Transports.AspNetCore.SystemTextJson/Transports.AspNetCore.SystemTextJson.csproj b/src/Transports.AspNetCore.SystemTextJson/Transports.AspNetCore.SystemTextJson.csproj
@@ -10,7 +10,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <ProjectReference Include="..\Transports.AspNetCore\Transports.AspNetCore.csproj" />
     <ProjectReference Include="..\Transports.Subscriptions.Abstractions\Transports.Subscriptions.Abstractions.csproj" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="4.1.0" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="4.3.0" />
     <PackageReference Include="System.IO.Pipelines" Version="5.0.1" />
   </ItemGroup>
 
diff --git a/src/Transports.Subscriptions.Abstractions/Transports.Subscriptions.Abstractions.csproj b/src/Transports.Subscriptions.Abstractions/Transports.Subscriptions.Abstractions.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.SystemReactive" Version="4.1.0" />
-    <PackageReference Include="GraphQL.NewtonsoftJson" Version="4.1.0" />
+    <PackageReference Include="GraphQL.SystemReactive" Version="4.3.0" />
+    <PackageReference Include="GraphQL.NewtonsoftJson" Version="4.3.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" />
   </ItemGroup>
diff --git a/tests/ApiApprovalTests/GraphQL.Server.Authorization.AspNetCore.approved.txt b/tests/ApiApprovalTests/GraphQL.Server.Authorization.AspNetCore.approved.txt
@@ -20,13 +20,6 @@ namespace GraphQL.Server.Authorization.AspNetCore
         public DefaultClaimsPrincipalAccessor(Microsoft.AspNetCore.Http.IHttpContextAccessor contextAccessor) { }
         public System.Security.Claims.ClaimsPrincipal GetClaimsPrincipal(GraphQL.Validation.ValidationContext context) { }
     }
-    public class GraphQLAuthorizeAttribute : GraphQL.GraphQLAttribute
-    {
-        public GraphQLAuthorizeAttribute() { }
-        public string Policy { get; set; }
-        public override void Modify(GraphQL.Utilities.FieldConfig field) { }
-        public override void Modify(GraphQL.Utilities.TypeConfig type) { }
-    }
     public interface IClaimsPrincipalAccessor
     {
         System.Security.Claims.ClaimsPrincipal GetClaimsPrincipal(GraphQL.Validation.ValidationContext context);
diff --git a/tests/Authorization.AspNetCore.Tests/AuthorizationValidationRuleTests.cs b/tests/Authorization.AspNetCore.Tests/AuthorizationValidationRuleTests.cs
@@ -276,7 +276,7 @@ type Query {
         }
 
         [GraphQLMetadata("Query")]
-        [GraphQLAuthorize(Policy = "ClassPolicy")]
+        [GraphQLAuthorize("ClassPolicy")]
         public class BasicQueryWithAttributesAndClassPolicy
         {
             [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "for tests")]
@@ -286,7 +286,7 @@ public class BasicQueryWithAttributesAndClassPolicy
         [GraphQLMetadata("Query")]
         public class BasicQueryWithAttributesAndFieldPolicy
         {
-            [GraphQLAuthorize(Policy = "FieldPolicy")]
+            [GraphQLAuthorize("FieldPolicy")]
             [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "for tests")]
             public string Post(string id) => "";
         }
@@ -323,7 +323,7 @@ public class NestedQueryWithAttributes
             public IEnumerable<Post> PostsNonNull() => null;
         }
 
-        [GraphQLAuthorize(Policy = "PostPolicy")]
+        [GraphQLAuthorize("PostPolicy")]
         public class Post
         {
             public string Id { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,6 @@ namespace GraphQL.Server.Authorization.AspNetCore`
`20`	`20`	`public DefaultClaimsPrincipalAccessor(Microsoft.AspNetCore.Http.IHttpContextAccessor contextAccessor) { }`
`21`	`21`	`public System.Security.Claims.ClaimsPrincipal GetClaimsPrincipal(GraphQL.Validation.ValidationContext context) { }`
`22`	`22`	`}`
`23`		`- public class GraphQLAuthorizeAttribute : GraphQL.GraphQLAttribute`
`24`		`- {`
`25`		`- public GraphQLAuthorizeAttribute() { }`
`26`		`- public string Policy { get; set; }`
`27`		`- public override void Modify(GraphQL.Utilities.FieldConfig field) { }`
`28`		`- public override void Modify(GraphQL.Utilities.TypeConfig type) { }`
`29`		`- }`
`30`	`23`	`public interface IClaimsPrincipalAccessor`
`31`	`24`	`{`
`32`	`25`	`System.Security.Claims.ClaimsPrincipal GetClaimsPrincipal(GraphQL.Validation.ValidationContext context);`