fixed test coverage

Author: eadwinCode

ellar/auth/guard.py

@@ -21,6 +21,4 @@ def openapi_security_scheme(self) -> t.Dict:
         return {}
 
     async def can_activate(self, context: IExecutionContext) -> bool:
-        return (  # type:ignore[no-any-return]
-            context.switch_to_http_connection().get_request().user.is_authenticated
-        )
+        return context.user.is_authenticated

ellar/core/connection/http.py

@@ -1,5 +1,6 @@
 import typing as t
 
+from ellar.common import Identity
 from ellar.common.constants import SCOPE_SERVICE_PROVIDER
 from starlette.requests import (
     HTTPConnection as StarletteHTTPConnection,
@@ -20,6 +21,10 @@ def service_provider(self) -> "EllarInjector":
         ), "RequestServiceProviderMiddleware must be installed to access request.service_provider"
         return t.cast("EllarInjector", self.scope[SCOPE_SERVICE_PROVIDER])
 
+    @property
+    def user(self) -> Identity:
+        return t.cast(Identity, self.scope["user"])
+
 
 class Request(StarletteRequest, HTTPConnection):
     pass

tests/test_auth/app/controllers.py

@@ -19,7 +19,7 @@ async def fast_x(self):
 @Authorize()
 class ArticleController:
     @get("/create")
-    @AuthenticationRequired("SimpleHeaderAuthHandler")
+    @AuthenticationRequired
     @CheckPolicies(RequiredClaimsPolicy("article", "create", "publish"))
     async def create_and_publish(self):
         return "fast and furious 10 Article"

tests/test_guard.py

@@ -1,5 +1,12 @@
 import pytest
-from ellar.common import APIException, Inject, UseGuards, get, serialize_object
+from ellar.common import (
+    APIException,
+    GlobalGuard,
+    Inject,
+    UseGuards,
+    get,
+    serialize_object,
+)
 from ellar.core import AppFactory, Reflector, Request
 from ellar.core.guards import (
     GuardAPIKeyCookie,
@@ -9,7 +16,7 @@
     GuardHttpBearerAuth,
     GuardHttpDigestAuth,
 )
-from ellar.di import injectable
+from ellar.di import ProviderConfig, injectable
 from ellar.openapi import OpenAPIDocumentBuilder
 from ellar.testing import TestClient
 from starlette.status import HTTP_401_UNAUTHORIZED
@@ -78,6 +85,17 @@ async def authentication_handler(self, context, credentials):
         if credentials.credentials == "digesttoken":
             return credentials.credentials
 
+        if credentials.credentials == "dict":
+            return {
+                "username": "ellar",
+                "message": "converted to Identity Object",
+                "auth_type": "digest",
+                "id": "12",
+            }
+
+        if credentials.credentials == "boolean":
+            return True
+
 
 app = AppFactory.create_app()
 
@@ -247,7 +265,7 @@ def test_auth_schema():
     }
 
 
-def test_global_guard_works():
+def test_global_guard_case_1_works():
     _app = AppFactory.create_app(global_guards=[DigestAuth])
 
     @get("/global")
@@ -262,3 +280,65 @@ def _auth_demo_endpoint(request: Inject[Request]):
     data = res.json()
 
     assert data == {"detail": "Forbidden"}
+
+
+def test_global_guard_case_2_works():
+    _app = AppFactory.create_app(
+        providers=[ProviderConfig(GlobalGuard, use_class=DigestAuth)]
+    )
+
+    @get("/global")
+    def _auth_demo_endpoint(request: Request):
+        return {"authentication": request.user}
+
+    _app.router.append(_auth_demo_endpoint)
+    _client = TestClient(_app)
+    res = _client.get("/global")
+
+    assert res.status_code == 401
+    data = res.json()
+
+    assert data == {"detail": "Forbidden"}
+
+
+@pytest.mark.parametrize(
+    "input_type, is_authenticated, expect_result",
+    [
+        (
+            "dict",
+            True,
+            {
+                "authentication": {
+                    "username": "ellar",
+                    "message": "converted to Identity Object",
+                    "id": "12",
+                    "auth_type": "digest",
+                }
+            },
+        ),
+        ("boolean", False, {"authentication": {"id": None, "auth_type": None}}),
+    ],
+)
+def test_if_an_auth_guard_return_converts_to_identity(
+    input_type, is_authenticated, expect_result
+):
+    _app = AppFactory.create_app(
+        providers=[ProviderConfig(GlobalGuard, use_class=DigestAuth)]
+    )
+
+    @get("/global")
+    def _auth_demo_endpoint(request: Request):
+        assert request.user.is_authenticated == is_authenticated
+        return {"authentication": request.user}
+
+    _app.router.append(_auth_demo_endpoint)
+    _client = TestClient(_app)
+    res = _client.get(
+        "/global",
+        **{"headers": {"Authorization": f"Digest {input_type}"}},
+    )
+
+    assert res.status_code == 200
+    data = res.json()
+
+    assert data == expect_result