Run middleware on a per-field basis

config/config.php

@@ -33,10 +33,16 @@
     | Additional configuration for the route group.
     | Check options here https://lumen.laravel.com/docs/routing#route-groups
     |
+    | Beware that middleware defined here runs before the GraphQL execution phase.
+    | This means that errors will cause the whole query to abort and return a
+    | response that is not spec-compliant. It is preferable to use directives
+    | to add middleware to single fields in the schema.
+    | Read more about this in the docs https://lighthouse-php.netlify.com/docs/auth.html#apply-auth-middleware
+    |
     */
     'route' => [
         'prefix' => '',
-        // 'middleware' => ['web','api'],    // [ 'loghttp']
+        // 'middleware' => ['loghttp']
     ],
 
     /*

src/Execution/ContextFactory.php

@@ -18,6 +18,6 @@ class ContextFactory implements CreatesContext
      */
     public function generate(Request $request): GraphQLContext
     {
-        return new Context($request, $request->user());
+        return new Context($request);
     }
 }

src/GraphQL.php

@@ -17,7 +17,6 @@
 use Nuwave\Lighthouse\Schema\AST\ASTBuilder;
 use Nuwave\Lighthouse\Schema\AST\DocumentAST;
 use Nuwave\Lighthouse\Schema\DirectiveRegistry;
-use Nuwave\Lighthouse\Schema\MiddlewareRegistry;
 use GraphQL\Validator\Rules\DisableIntrospection;
 use Nuwave\Lighthouse\Execution\DataLoader\BatchLoader;
 use Nuwave\Lighthouse\Schema\Source\SchemaSourceProvider;
@@ -326,16 +325,6 @@ public function schema(): TypeRegistry
         return $this->types();
     }
 
-    /**
-     * @return MiddlewareRegistry
-     *
-     * @deprecated Use resolve() instead, will be removed in v3
-     */
-    public function middleware(): MiddlewareRegistry
-    {
-        return resolve(MiddlewareRegistry::class);
-    }
-
     /**
      * @return NodeRegistry
      *

src/Providers/LighthouseServiceProvider.php

@@ -10,7 +10,6 @@
 use Nuwave\Lighthouse\Schema\TypeRegistry;
 use Nuwave\Lighthouse\Execution\ContextFactory;
 use Nuwave\Lighthouse\Schema\DirectiveRegistry;
-use Nuwave\Lighthouse\Schema\MiddlewareRegistry;
 use Nuwave\Lighthouse\Execution\GraphQLValidator;
 use Nuwave\Lighthouse\Schema\Source\SchemaStitcher;
 use Nuwave\Lighthouse\Schema\Factories\ValueFactory;
@@ -67,7 +66,6 @@ public function register()
         $this->app->singleton(DirectiveRegistry::class);
         $this->app->singleton(ExtensionRegistry::class);
         $this->app->singleton(NodeRegistry::class);
-        $this->app->singleton(MiddlewareRegistry::class);
         $this->app->singleton(TypeRegistry::class);
         $this->app->singleton(CreatesContext::class, ContextFactory::class);
 

src/Schema/Context.php

@@ -15,35 +15,26 @@ class Context implements GraphQLContext
      */
     public $request;
 
-    /**
-     * Authenticated user.
-     *
-     * May be null since some fields may be accessible without authentication.
-     *
-     * @var User|null
-     */
-    public $user;
-
     /**
      * Create new context.
      *
      * @param Request   $request
-     * @param User|null $user
      */
-    public function __construct(Request $request, User $user = null)
+    public function __construct(Request $request)
     {
         $this->request = $request;
-        $this->user = $user;
     }
 
     /**
-     * Get instance of authorized user.
+     * Get instance of authenticated user.
+     *
+     * May be null since some fields may be accessible without authentication.
      *
      * @return User|null
      */
     public function user()
     {
-        return $this->user;
+        return $this->request->user();
     }
 
     /**

src/Schema/Directives/Fields/MiddlewareDirective.php

@@ -2,19 +2,43 @@
 
 namespace Nuwave\Lighthouse\Schema\Directives\Fields;
 
+use Illuminate\Http\Request;
+use Illuminate\Routing\Router;
+use GraphQL\Type\Definition\ResolveInfo;
+use Nuwave\Lighthouse\Support\Pipeline;
+use Illuminate\Routing\MiddlewareNameResolver;
 use Nuwave\Lighthouse\Schema\Values\FieldValue;
-use Nuwave\Lighthouse\Schema\MiddlewareRegistry;
 use Nuwave\Lighthouse\Schema\Directives\BaseDirective;
+use Nuwave\Lighthouse\Support\Contracts\CreatesContext;
+use Nuwave\Lighthouse\Support\Contracts\GraphQLContext;
 use Nuwave\Lighthouse\Support\Contracts\FieldMiddleware;
 
 class MiddlewareDirective extends BaseDirective implements FieldMiddleware
 {
+    /** @var string todo remove as soon as name() is static itself */
+    const NAME = 'middleware';
+
+    /** @var Pipeline */
+    protected $pipeline;
+    /** @var CreatesContext */
+    protected $createsContext;
+
+    /**
+     * @param Pipeline $pipeline
+     * @param CreatesContext $createsContext
+     */
+    public function __construct(Pipeline $pipeline, CreatesContext $createsContext)
+    {
+        $this->pipeline = $pipeline;
+        $this->createsContext = $createsContext;
+    }
+
     /**
      * Name of the directive.
      *
      * @return string
      */
-    public function name()
+    public function name(): string
     {
         return 'middleware';
     }
@@ -27,52 +51,49 @@ public function name()
      *
      * @return FieldValue
      */
-    public function handleField(FieldValue $value, \Closure $next)
+    public function handleField(FieldValue $value, \Closure $next): FieldValue
     {
-        $checks = $this->getChecks($value);
-
-        if ($checks) {
-            $middlewareRegistry = resolve(MiddlewareRegistry::class);
-
-            if ('Query' === $value->getNodeName()) {
-                $middlewareRegistry->registerQuery(
-                    $value->getFieldName(),
-                    $checks
-                );
-            } elseif ('Mutation' === $value->getNodeName()) {
-                $middlewareRegistry->registerMutation(
-                    $value->getFieldName(),
-                    $checks
-                );
-            }
-        }
-
-        return $next($value);
-    }
-
-    /**
-     * Get middleware checks.
-     *
-     * @param FieldValue $value
-     *
-     * @return array|null
-     */
-    protected function getChecks(FieldValue $value)
-    {
-        if (! in_array($value->getNodeName(), ['Mutation', 'Query'])) {
-            return null;
-        }
-
-        $checks = $this->directiveArgValue('checks');
+        /** @var Router $router */
+        $router = resolve('router');
+        $middleware = $router->getMiddleware();
+        $middlewareGroups = $router->getMiddlewareGroups();
 
-        if (! $checks) {
-            return null;
-        }
+        $middleware = collect($this->directiveArgValue('checks'))
+            ->map(function ($name) use ($middleware, $middlewareGroups){
+                return (array) MiddlewareNameResolver::resolve($name, $middleware, $middlewareGroups);
+            })
+            ->flatten();
 
-        if (is_string($checks)) {
-            $checks = [$checks];
-        }
+        $resolver = $value->getResolver();
 
-        return $checks;
+        return $next(
+            $value->setResolver(
+                function ($root, array $args, GraphQLContext $context, ResolveInfo $resolveInfo) use ($resolver, $middleware) {
+                    dump($resolveInfo->fieldName, $middleware);
+                    return $this->pipeline
+                        ->send(
+                            Request::createFrom(
+                                $context->request()
+                            )
+                            // Duplicate the request so we have independent lifecycles for the fields
+//                            $context->request()
+//                                ->instance()
+//                                ->duplicate()
+                        )
+                        ->through(
+                            $middleware
+                        )
+                        ->then(function (Request $request) use ($resolver, $root, $args, $resolveInfo){
+                            dump(data_get($request,'foo'));
+                            return $resolver(
+                                $root,
+                                $args,
+                                $this->createsContext->generate($request),
+                                $resolveInfo
+                            );
+                        });
+                }
+            )
+        );
     }
 }

src/Schema/Directives/Fields/NamespaceDirective.php

@@ -19,13 +19,16 @@
  */
 class NamespaceDirective implements Directive
 {
+    /** @var string todo remove as soon as name() is static itself */
+    const NAME = 'namespace';
+
     /**
      * Name of the directive.
      *
      * @return string
      */
-    public function name()
+    public function name(): string
     {
-        return 'namespace';
+        return self::NAME;
     }
 }

src/Schema/Directives/Nodes/GroupDirective.php

@@ -31,7 +31,7 @@ class GroupDirective extends BaseDirective implements NodeManipulator
      *
      * @return string
      */
-    public function name()
+    public function name(): string
     {
         return 'group';
     }
@@ -40,20 +40,12 @@ public function name()
      * @param Node $node
      * @param DocumentAST $documentAST
      *
-     * @throws DirectiveException
+     * @throws \Exception
      *
      * @return DocumentAST
      */
-    public function manipulateSchema(Node $node, DocumentAST $documentAST)
+    public function manipulateSchema(Node $node, DocumentAST $documentAST): DocumentAST
     {
-        $nodeName = $node->name->value;
-
-        if (! in_array($nodeName, ['Query', 'Mutation'])) {
-            $message = "The group directive can only be placed on a Query or Mutation [$nodeName]";
-
-            throw new DirectiveException($message);
-        }
-
         $node = $this->setMiddlewareDirectiveOnFields($node);
         $node = $this->setNamespaceDirectiveOnFields($node);
 
@@ -77,14 +69,26 @@ protected function setMiddlewareDirectiveOnFields($objectType)
             return $objectType;
         }
 
-        $middlewareValues = '["'.implode('", "', $middlewareValues).'"]';
-        $middlewareDirective = PartialParser::directive("@middleware(checks: $middlewareValues)");
+        $middlewareValues = addslashes(
+            implode('", "', $middlewareValues)
+        );
+        $middlewareDirective = PartialParser::directive("@middleware(checks: [\"$middlewareValues\"])");
+
+        $objectType->fields = new NodeList(
+            collect($objectType->fields)
+                ->map(function (FieldDefinitionNode $fieldDefinition) use ($middlewareDirective) {
+                    // If the field already has middleware defined, skip over it
+                    // Field middleware are more specific then those defined by @group
+//                    if (ASTHelper::directiveDefinition($fieldDefinition, MiddlewareDirective::NAME)){
+//                       return $fieldDefinition;
+//                    }
 
-        $objectType->fields = new NodeList(collect($objectType->fields)->map(function (FieldDefinitionNode $fieldDefinition) use ($middlewareDirective) {
-            $fieldDefinition->directives = $fieldDefinition->directives->merge([$middlewareDirective]);
+                    $fieldDefinition->directives = $fieldDefinition->directives->merge([$middlewareDirective]);
 
-            return $fieldDefinition;
-        })->toArray());
+                    return $fieldDefinition;
+                })
+                ->toArray()
+        );
 
         return $objectType;
     }
@@ -110,19 +114,24 @@ protected function setNamespaceDirectiveOnFields($objectType)
 
         $namespaceValue = addslashes($namespaceValue);
 
-        $objectType->fields = new NodeList(collect($objectType->fields)->map(function (FieldDefinitionNode $fieldDefinition) use ($namespaceValue) {
-            $previousNamespaces = ASTHelper::directiveDefinition(
-                $fieldDefinition,
-                (new NamespaceDirective)->name()
-            );
+        $objectType->fields = new NodeList(
+            collect($objectType->fields)
+                ->map(function (FieldDefinitionNode $fieldDefinition) use ($namespaceValue) {
+                    $existingNamespaces = ASTHelper::directiveDefinition(
+                        $fieldDefinition,
+                        NamespaceDirective::NAME
+                    );
+
+                    $newNamespaceDirective = $existingNamespaces
+                        ? $this->mergeNamespaceOnExistingDirective($namespaceValue, $existingNamespaces)
+                        : PartialParser::directive("@namespace(field: \"$namespaceValue\", complexity: \"$namespaceValue\")");
 
-            $previousNamespaces = $previousNamespaces
-                ? $this->mergeNamespaceOnExistingDirective($namespaceValue, $previousNamespaces)
-                : PartialParser::directive("@namespace(field: \"$namespaceValue\", complexity: \"$namespaceValue\")");
-            $fieldDefinition->directives = $fieldDefinition->directives->merge([$previousNamespaces]);
+                    $fieldDefinition->directives = $fieldDefinition->directives->merge([$newNamespaceDirective]);
 
-            return $fieldDefinition;
-        })->toArray());
+                    return $fieldDefinition;
+                })
+                ->toArray()
+        );
 
         return $objectType;
     }