Merge 6db87fc into 4f3e943

graphql-python · Nov 28, 2018 · f3f2747 · f3f2747
2 parents 4f3e943 + 6db87fc
commit f3f2747
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/graphene_tornado/tornado_graphql_handler.py b/graphene_tornado/tornado_graphql_handler.py
@@ -220,7 +220,7 @@ def execute_graphql_request(self, method, query, variables, operation_name, show
                 root_value=self.root_value,
                 variable_values=variables,
                 operation_name=operation_name,
-                context_value=self.request,
+                context_value=self.context,
                 middleware=self.middleware,
                 executor=self.executor or TornadoExecutor(),
                 return_promise=True
@@ -267,7 +267,7 @@ def content_type(self):
 
     @property
     def context(self):
-        return None
+        return self.request
 
     @staticmethod
     def instantiate_middleware(middlewares):