Merge branch 'master' of https://code.grnet.gr/git/pithos

[pithos] / pithos / middleware / auth.py

diff --git a/pithos/middleware/auth.py b/pithos/middleware/auth.py
index df89ee2..254f57b 100644 (file)
--- a/pithos/middleware/auth.py
+++ b/pithos/middleware/auth.py
@@ -42,12 +42,12 @@ class AuthMiddleware(object):
     def process_request(self, request):
         request.user = None
         
-        # Try to find token in a cookie, in a request header, or as a parameter.
-        token = request.COOKIES.get('X-Auth-Token', None)
+        # Try to find token in a parameter, in a request header, or in a cookie.
+        token = request.REQUEST.get('X-Auth-Token', None)
         if not token:
             token = request.META.get('HTTP_X_AUTH_TOKEN', None)
         if not token:
-            token = request.REQUEST.get('X-Auth-Token', None)
+            token = request.COOKIES.get('X-Auth-Token', None)
         if not token:
             return