Added get_root_type to allow_any

mongkok · mongkok · commit f6acd762ba45 · 2023-08-03T15:05:34.000+07:00
diff --git a/graphql_jwt/_compat.py b/graphql_jwt/_compat.py
@@ -0,0 +1,12 @@
+import graphql
+
+try:
+    from graphql.execution.execute import GraphQLResolveInfo
+except ImportError:
+    from graphql.execution.base import ResolveInfo as GraphQLResolveInfo  # noqa
+
+
+def get_root_type(info):
+    if graphql.__version__.startswith("2"):
+        return getattr(info.schema, f"get_{info.operation.operation}_type")()
+    return getattr(info.schema, f"{info.operation.operation.value}_type")
diff --git a/graphql_jwt/compat.py b/graphql_jwt/compat.py
diff --git a/graphql_jwt/decorators.py b/graphql_jwt/decorators.py
@@ -9,7 +9,7 @@
 from graphene.utils.thenables import maybe_thenable
 
 from . import exceptions, signals
-from .compat import GraphQLResolveInfo
+from ._compat import GraphQLResolveInfo
 from .refresh_token.shortcuts import create_refresh_token, refresh_token_lazy
 from .settings import jwt_settings
 from .utils import delete_cookie, set_cookie
diff --git a/graphql_jwt/middleware.py b/graphql_jwt/middleware.py
@@ -2,7 +2,7 @@
 from django.contrib.auth.middleware import get_user
 from django.contrib.auth.models import AnonymousUser
 
-from .compat import get_operation_name
+from ._compat import get_root_type
 from .path import PathDict
 from .settings import jwt_settings
 from .utils import get_http_authorization, get_token_argument
@@ -14,8 +14,8 @@
 
 
 def allow_any(info, **kwargs):
-    operation_name = get_operation_name(info.operation.operation).title()
-    field = info.schema.get_type(operation_name).fields.get(info.field_name)
+    root_type = get_root_type(info)
+    field = root_type.fields.get(info.field_name)
 
     if field is None:
         return False
@@ -69,7 +69,6 @@ def resolve(self, next, root, info, **kwargs):
         if (
             _authenticate(context) or token_argument is not None
         ) and self.authenticate_context(info, **kwargs):
-
             user = authenticate(request=context, **kwargs)
 
             if user is not None:
diff --git a/tests/test_middleware.py b/tests/test_middleware.py
@@ -184,7 +184,7 @@ def info(self, user, **headers):
 
     def info_with_field_mock(self, user, field=None):
         info_mock = self.info(user)
-        info_mock.schema.get_type.return_value = mock.Mock(
+        info_mock.schema.get_root_type.return_value = mock.Mock(
             fields={
                 "test": field,
             }
diff --git a/tests/testcases.py b/tests/testcases.py
@@ -6,8 +6,8 @@
 
 import graphene
 from graphene_django.views import GraphQLView
+from graphql.execution.execute import GraphQLResolveInfo
 
-from graphql_jwt.compat import GraphQLResolveInfo
 from graphql_jwt.decorators import jwt_cookie
 from graphql_jwt.settings import jwt_settings
 from graphql_jwt.testcases import JSONWebTokenClient, JSONWebTokenTestCase

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ def info(self, user, **headers):`
`184`	`184`
`185`	`185`	`def info_with_field_mock(self, user, field=None):`
`186`	`186`	`info_mock = self.info(user)`
`187`		`- info_mock.schema.get_type.return_value = mock.Mock(`
	`187`	`+ info_mock.schema.get_root_type.return_value = mock.Mock(`
`188`	`188`	`fields={`
`189`	`189`	`"test": field,`
`190`	`190`	`}`