Fix broken compatibility with cloud files
authorSofia Papagiannaki <papagian@gmail.com>
Mon, 2 Jul 2012 11:14:30 +0000 (13:14 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Mon, 2 Jul 2012 11:14:30 +0000 (13:14 +0200)
snf-pithos-app/pithos/api/functions.py

index 3a93425..5562254 100644 (file)
@@ -68,7 +68,14 @@ logger = logging.getLogger(__name__)
 @csrf_exempt
 def top_demux(request):
     if request.method == 'GET':
-        return account_list(request)
+       try:
+               request.GET['X-Auth-Token']
+       except KeyError:
+               try:
+                       request.META['HTTP_X_AUTH_TOKEN']
+               except KeyError:
+                       return authenticate(request)
+               return account_list(request)
     else:
         return method_not_allowed(request)
 
@@ -146,9 +153,6 @@ def account_list(request):
     # Normal Response Codes: 200, 204
     # Error Response Codes: internalServerError (500),
     #                       badRequest (400)
-    if getattr(request, 'user', None) is None:
-        return authenticate(request)
-    
     response = HttpResponse()
     
     marker = request.GET.get('marker')