Merge pull request #42 from graphql-dotnet/custom-validation-rules

Allow custom validation rules to be passed in
graphql-dotnet · May 4, 2017 · e256efc · e256efc
2 parents 540b954 + ff85785
commit e256efc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/src/GraphQL.Conventions/Adapters/Engine/GraphQLEngine.cs b/src/GraphQL.Conventions/Adapters/Engine/GraphQLEngine.cs
@@ -230,7 +230,7 @@ internal async Task<ExecutionResult> Execute(
                 OperationName = operationName,
                 Inputs = inputs,
                 UserContext = userContext,
-                ValidationRules = rules,
+                ValidationRules = rules != null && rules.Any() ? rules : null,
                 CancellationToken = cancellationToken,
             };
 

diff --git a/src/GraphQL.Conventions/Adapters/Engine/GraphQLExecutor.cs b/src/GraphQL.Conventions/Adapters/Engine/GraphQLExecutor.cs
@@ -27,6 +27,8 @@ public class GraphQLExecutor : IGraphQLExecutor<ExecutionResult>
 
         private bool _enableProfiling = false;
 
+        private IEnumerable<IValidationRule> _validationRules = null;
+
         internal GraphQLExecutor(GraphQLEngine engine, IRequestDeserializer requestDeserializer)
         {
             _engine = engine;
@@ -83,6 +85,12 @@ public IGraphQLExecutor<ExecutionResult> WithDependencyInjector(IDependencyInjec
             return this;
         }
 
+        public IGraphQLExecutor<ExecutionResult> WithValidationRules(IEnumerable<IValidationRule> rules)
+        {
+            _validationRules = rules;
+            return this;
+        }
+
         public IGraphQLExecutor<ExecutionResult> EnableValidation(bool enableValidation = true)
         {
             _enableValidation = enableValidation;
@@ -111,7 +119,7 @@ await _engine
                     _rootObject, _queryString, _operationName, _inputs, _userContext,
                     enableValidation: _enableValidation,
                     enableProfiling: _enableProfiling,
-                    rules: null,
+                    rules: _validationRules,
                     cancellationToken: _cancellationToken)
                 .ConfigureAwait(false);
 

diff --git a/src/GraphQL.Conventions/Adapters/Engine/IGraphQLExecutor.cs b/src/GraphQL.Conventions/Adapters/Engine/IGraphQLExecutor.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using GraphQL.Validation;
 
 namespace GraphQL.Conventions
 {
@@ -22,6 +23,8 @@ public interface IGraphQLExecutor<TResult>
 
         IGraphQLExecutor<TResult> WithDependencyInjector(IDependencyInjector injector);
 
+        IGraphQLExecutor<TResult> WithValidationRules(IEnumerable<IValidationRule> rules);
+
         IGraphQLExecutor<TResult> EnableValidation(bool enableValidation = true);
 
         IGraphQLExecutor<TResult> DisableValidation();

diff --git a/src/GraphQL.Conventions/CommonAssemblyInfo.cs b/src/GraphQL.Conventions/CommonAssemblyInfo.cs
@@ -8,8 +8,8 @@
 [assembly: AssemblyCopyright("Copyright 2016-2017 Tommy Lillehagen. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.4")]
-[assembly: AssemblyInformationalVersion("1.2.4")]
+[assembly: AssemblyFileVersion("1.2.5")]
+[assembly: AssemblyInformationalVersion("1.2.5")]
 [assembly: CLSCompliant(false)]
 
 [assembly: InternalsVisibleTo("GraphQL.Conventions.Tests")]
diff --git a/src/GraphQL.Conventions/GraphQL.Conventions.csproj b/src/GraphQL.Conventions/GraphQL.Conventions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>GraphQL Conventions for .NET</Description>
-    <VersionPrefix>1.2.4</VersionPrefix>
+    <VersionPrefix>1.2.5</VersionPrefix>
     <Authors>Tommy Lillehagen</Authors>
     <TargetFrameworks>netstandard1.5;net45</TargetFrameworks>
     <DebugType>portable</DebugType>

diff --git a/src/GraphQL.Conventions/project.json b/src/GraphQL.Conventions/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.4-*",
+  "version": "1.2.5-*",
   "description": "GraphQL Conventions for .NET",
   "authors": [
     "Tommy Lillehagen"