Fix DRF request and response types

apitally/django_rest_framework.py

@@ -10,15 +10,15 @@
 
 
 if TYPE_CHECKING:
-    from django.http import HttpRequest
+    from rest_framework.request import Request
     from rest_framework.views import APIView
 
 
 __all__ = ["ApitallyMiddleware", "HasAPIKey", "KeyInfo"]
 
 
 class HasAPIKey(BasePermission):  # type: ignore[misc]
-    def has_permission(self, request: HttpRequest, view: APIView) -> bool:
+    def has_permission(self, request: Request, view: APIView) -> bool:
         authorization = request.headers.get("Authorization")
         if not authorization:
             return False
@@ -30,6 +30,5 @@ def has_permission(self, request: HttpRequest, view: APIView) -> bool:
             return False
         if hasattr(view, "required_scopes") and not key_info.check_scopes(view.required_scopes):
             return False
-        if not hasattr(request, "key_info"):
-            setattr(request, "key_info", key_info)
+        request.auth = key_info
         return True

tests/django_rest_framework_urls.py

@@ -1,5 +1,6 @@
-from django.http import HttpRequest, HttpResponse
 from django.urls import path
+from rest_framework.request import Request
+from rest_framework.response import Response
 from rest_framework.views import APIView
 
 from apitally.django_rest_framework import HasAPIKey
@@ -8,30 +9,30 @@
 class FooView(APIView):
     permission_classes = [HasAPIKey]
 
-    def get(self, request: HttpRequest) -> HttpResponse:
-        return HttpResponse("foo")
+    def get(self, request: Request) -> Response:
+        return Response("foo")
 
 
 class FooBarView(APIView):
     permission_classes = [HasAPIKey]
     required_scopes = ["foo"]
 
-    def get(self, request: HttpRequest, bar: int) -> HttpResponse:
-        return HttpResponse(f"foo: {bar}")
+    def get(self, request: Request, bar: int) -> Response:
+        return Response(f"foo: {bar}")
 
 
 class BarView(APIView):
     permission_classes = [HasAPIKey]
     required_scopes = ["bar"]
 
-    def post(self, request: HttpRequest) -> HttpResponse:
-        return HttpResponse("bar")
+    def post(self, request: Request) -> Response:
+        return Response("bar")
 
 
 class BazView(APIView):
     permission_classes = [HasAPIKey]
 
-    def put(self, request: HttpRequest) -> HttpResponse:
+    def put(self, request: Request) -> Response:
         raise ValueError("baz")