Merge pull request #76 from graphql-dotnet/preview

Project upgrades
graphql-dotnet · May 14, 2020 · d8b6390 · d8b6390
2 parents d500861 + db8c10d
commit d8b6390
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 13 deletions.
diff --git a/src/GraphQL.Authorization.Tests/GraphQL.Authorization.Tests.csproj b/src/GraphQL.Authorization.Tests/GraphQL.Authorization.Tests.csproj
@@ -11,6 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="GraphQL.NewtonsoftJson" Version="3.0.0-preview-1648" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="Shouldly" Version="3.0.2" />
     <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/src/GraphQL.Authorization.Tests/ValidationTestBase.cs b/src/GraphQL.Authorization.Tests/ValidationTestBase.cs
@@ -2,13 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using GraphQL;
 using GraphQL.Execution;
-using GraphQL.Http;
+using GraphQL.NewtonsoftJson;
 using GraphQL.Types;
 using GraphQL.Validation;
 using Shouldly;
-using Xunit;
 
 namespace GraphQL.Authorization.Tests
 {
@@ -30,7 +28,7 @@ public void Rule(params IValidationRule[] rules)
 
     public class GraphQLUserContext : Dictionary<string, object>, IProvideClaimsPrincipal
     {
-        public ClaimsPrincipal User { get; set;}
+        public ClaimsPrincipal User { get; set; }
     }
 
     public class ValidationTestBase

diff --git a/src/GraphQL.Authorization/AuthorizationContext.cs b/src/GraphQL.Authorization/AuthorizationContext.cs
@@ -12,7 +12,7 @@ public class AuthorizationContext
 
         public object UserContext { get; set; }
 
-        public Dictionary<string, object> InputVariables { get; set; }
+        public IDictionary<string, object> InputVariables { get; set; }
 
         public IEnumerable<string> Errors => _errors;
 

diff --git a/src/GraphQL.Authorization/AuthorizationEvaluator.cs b/src/GraphQL.Authorization/AuthorizationEvaluator.cs
@@ -10,7 +10,7 @@ public interface IAuthorizationEvaluator
         Task<AuthorizationResult> Evaluate(
             ClaimsPrincipal principal,
             object userContext,
-            Dictionary<string, object> arguments,
+            IDictionary<string, object> arguments,
             IEnumerable<string> requiredPolicies);
     }
 
@@ -26,7 +26,7 @@ public AuthorizationEvaluator(AuthorizationSettings settings)
         public async Task<AuthorizationResult> Evaluate(
             ClaimsPrincipal principal,
             object userContext,
-            Dictionary<string, object> inputVariables,
+            IDictionary<string, object> inputVariables,
             IEnumerable<string> requiredPolicies)
         {
             var context = new AuthorizationContext();

diff --git a/src/GraphQL.Authorization/AuthorizationMetadataExtensions.cs b/src/GraphQL.Authorization/AuthorizationMetadataExtensions.cs
@@ -20,7 +20,7 @@ public static Task<AuthorizationResult> Authorize(
             this IProvideMetadata type,
             ClaimsPrincipal principal,
             object userContext,
-            Dictionary<string, object> inputVariables,
+            IDictionary<string, object> inputVariables,
             IAuthorizationEvaluator evaluator)
         {
             var list = GetPolicies(type);

diff --git a/src/GraphQL.Authorization/AuthorizationValidationRule.cs b/src/GraphQL.Authorization/AuthorizationValidationRule.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using System.Threading.Tasks;
 using GraphQL.Language.AST;
 using GraphQL.Types;

diff --git a/src/GraphQL.Authorization/GraphQL.Authorization.csproj b/src/GraphQL.Authorization/GraphQL.Authorization.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>A toolset for authorizing access to graph types for GraphQL .NET</Description>
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL" Version="3.0.0-preview-1352" />
+    <PackageReference Include="GraphQL" Version="3.0.0-preview-1648" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Harness/GraphQLAuthExtensions.cs b/src/Harness/GraphQLAuthExtensions.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using GraphQL.Authorization;
 using GraphQL.Validation;
-using System.Threading.Tasks;
 
 namespace Harness
 {

diff --git a/src/Harness/Harness.csproj b/src/Harness/Harness.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL" Version="3.0.0-preview-1352" />
+    <PackageReference Include="GraphQL" Version="3.0.0-preview-1648" />
     <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="3.5.0-alpha0027" />
     <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="3.5.0-alpha0027" />
     <PackageReference Include="Microsoft.AspNetCore.All" />