Revision 0b1f5802 snf-pithos-app/pithos/api/functions.py

b/snf-pithos-app/pithos/api/functions.py
68 68
@csrf_exempt
69 69
def top_demux(request):
70 70
    if request.method == 'GET':
71
        return account_list(request)
71
    	try:
72
    		request.GET['X-Auth-Token']
73
    	except KeyError:
74
    		try:
75
    			request.META['HTTP_X_AUTH_TOKEN']
76
    		except KeyError:
77
    			return authenticate(request)
78
    		return account_list(request)
72 79
    else:
73 80
        return method_not_allowed(request)
74 81

  
......
146 153
    # Normal Response Codes: 200, 204
147 154
    # Error Response Codes: internalServerError (500),
148 155
    #                       badRequest (400)
149
    if getattr(request, 'user', None) is None:
150
        return authenticate(request)
151
    
152 156
    response = HttpResponse()
153 157
    
154 158
    marker = request.GET.get('marker')

Also available in: Unified diff