Merge pull request #1387 from mmkhitaryan/master

Fix of TypeError when returning None in AuthBase.__call__ from async code #1386

Author: vitalik

ninja/operation.py

@@ -1,3 +1,4 @@
+import inspect
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -204,7 +205,9 @@ def _run_authentication(self, request: HttpRequest) -> Optional[HttpResponse]:
         for callback in self.auth_callbacks:
             try:
                 if is_async_callable(callback) or getattr(callback, "is_async", False):
-                    result = async_to_sync(callback)(request)
+                    result = callback(request)
+                    if inspect.iscoroutine(result):
+                        result = async_to_sync(callback)(request)
                 else:
                     result = callback(request)
             except Exception as exc:

tests/test_auth.py

@@ -65,6 +65,14 @@ def authenticate(self, request, token):
             raise AuthorizationError
 
 
+class AsyncBearerAuth(HttpBearer):
+    async def authenticate(self, request, token):
+        if token == "bearertoken":
+            return token
+        if token == "nottherightone":
+            raise AuthorizationError
+
+
 def demo_operation(request):
     return {"auth": request.auth}
 
@@ -87,6 +95,7 @@ def on_custom_error(request, exc):
     ("apikeycookie", KeyCookie()),
     ("basic", BasicAuth()),
     ("bearer", BearerAuth()),
+    ("async_bearer", AsyncBearerAuth()),
     ("customexception", KeyHeaderCustomException()),
 ]:
     api.get(f"/{path}", auth=auth, operation_id=path)(demo_operation)
@@ -216,6 +225,18 @@ class MockStaffUser(str):
             401,
             BODY_UNAUTHORIZED_DEFAULT,
         ),
+        (
+            "/async_bearer",
+            dict(headers={"Authorization": "Bearer nonexistingtoken"}),
+            401,
+            BODY_UNAUTHORIZED_DEFAULT,
+        ),
+        (
+            "/async_bearer",
+            dict(headers={}),
+            401,
+            BODY_UNAUTHORIZED_DEFAULT,
+        ),
         (
             "/bearer",
             dict(headers={"Authorization": "Bearer nottherightone"}),
@@ -244,6 +265,7 @@ def test_schema():
     assert schema["components"]["securitySchemes"] == {
         "BasicAuth": {"scheme": "basic", "type": "http"},
         "BearerAuth": {"scheme": "bearer", "type": "http"},
+        "AsyncBearerAuth": {"scheme": "bearer", "type": "http"},
         "KeyCookie": {"in": "cookie", "name": "key", "type": "apiKey"},
         "KeyHeader": {"in": "header", "name": "key", "type": "apiKey"},
         "KeyHeaderCustomException": {"in": "header", "name": "key", "type": "apiKey"},