django-pfx 1.7.3.dev16__tar.gz → 1.7.3.dev18__tar.gz

{django_pfx-1.7.3.dev16 → django_pfx-1.7.3.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.3.dev16
+Version: 1.7.3.dev18
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.7.3.dev16 → django_pfx-1.7.3.dev18}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.3.dev16
+Version: 1.7.3.dev18
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

django_pfx-1.7.3.dev18/pfx/pfxcore/middleware/ws_cookie_authentication_middleware.py

@@ -0,0 +1,35 @@
+import logging
+
+from django.contrib.auth.models import AnonymousUser
+from django.http import parse_cookie
+
+from channels.db import database_sync_to_async
+from channels.middleware import BaseMiddleware
+
+from pfx.pfxcore.middleware.authentication import JWTTokenDecodeMixin
+
+logger = logging.getLogger(__name__)
+
+
+class WSCookieAuthenticationMiddleware(JWTTokenDecodeMixin, BaseMiddleware):
+    async def __call__(self, scope, receive, send):
+        if scope.get("user") is not None:
+            return await super().__call__(scope, receive, send)
+
+        headers = dict(scope.get("headers", []))
+        cookies = {}
+        if b"cookie" in headers:
+            cookies = parse_cookie(headers[b"cookie"].decode())
+
+        key = cookies.get("token")
+        if key:
+            try:
+                user, __, __ = await database_sync_to_async(
+                    self.decode_jwt)(key)
+            except Exception as e:
+                logger.exception(e, exc_info=True)
+                user = AnonymousUser()
+        else:
+            user = AnonymousUser()
+        scope['user'] = user
+        return await super().__call__(scope, receive, send)

{django_pfx-1.7.3.dev16 → django_pfx-1.7.3.dev18}/pfx/pfxcore/views/rest_views.py

@@ -366,7 +366,7 @@ class ModelResponseMixin(ModelMixin):
         return dict(
             created=created,
             message=f(
-                message, model=self.model_name, obj=object))
+                message, model=self.model_name, obj=obj))
 
     def _save(self, obj, created=False, rel_data=None):
         with transaction.atomic():

django_pfx-1.7.3.dev16/pfx/pfxcore/middleware/ws_cookie_authentication_middleware.py

@@ -1,45 +0,0 @@
-import logging
-
-from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser
-from django.http import parse_cookie
-
-from channels.db import database_sync_to_async
-from channels.middleware import BaseMiddleware
-
-from pfx.pfxcore.exceptions import APIError
-from pfx.pfxcore.http import JsonResponse
-from pfx.pfxcore.middleware.authentication import JWTTokenDecodeMixin
-
-logger = logging.getLogger(__name__)
-
-
-class WSCookieAuthenticationMiddleware(JWTTokenDecodeMixin, BaseMiddleware):
-    async def __call__(self, scope, receive, send):
-        scope = dict(scope)
-        if "headers" not in scope:
-            raise ValueError("No headers")
-        # Go through headers to find the cookie one
-        for name, value in scope.get("headers", []):
-            if name == b"cookie":
-                cookies = parse_cookie(value.decode("utf-8"))
-                break
-        else:
-            # No cookie header found - add an empty default.
-            cookies = {}
-        # Return inner application
-        key = cookies.get('token')
-        if key:
-            try:
-                user, __, __ = await database_sync_to_async(
-                    self.decode_jwt)(key)
-            except get_user_model().DoesNotExist:
-                return JsonResponse(
-                    {'message': 'Authentication error'}, status=401)
-            except APIError as e:
-                return e.response
-        elif not scope.get('user'):
-            user = AnonymousUser()
-
-        scope['user'] = user
-        return await super().__call__(scope, receive, send)