Revision 61efb530 pithos/middleware/auth.py

b/pithos/middleware/auth.py
40 40

  
41 41
class AuthMiddleware(object):
42 42
    def process_request(self, request):
43
        request.user_obj = None
44 43
        request.user = None
44
        request.user_uniq = None
45 45
        
46 46
        # Try to find token in a parameter, in a request header, or in a cookie.
47 47
        token = request.GET.get('X-Auth-Token', None)
......
71 71
        if (time() - mktime(user.auth_token_expires.timetuple())) > 0:
72 72
            return
73 73
        
74
        request.user_obj = user
75
        request.user = user.uniq
74
        request.user = user
75
        request.user_uniq = user.uniq
76 76

  
77 77
    def process_response(self, request, response):
78
        if getattr(request, 'user_obj', None) and getattr(request, 'set_auth_cookie', False):
79
            expire_fmt = request.user_obj.auth_token_expires.strftime('%a, %d-%b-%Y %H:%M:%S %Z')
80
            response.set_cookie('X-Auth-Token', value=request.user_obj.auth_token, expires=expire_fmt, path='/')
78
        if getattr(request, 'user', None) and getattr(request, 'set_auth_cookie', False):
79
            expire_fmt = request.user.auth_token_expires.strftime('%a, %d-%b-%Y %H:%M:%S %Z')
80
            response.set_cookie('X-Auth-Token', value=request.user.auth_token, expires=expire_fmt, path='/')
81 81
        return response

Also available in: Unified diff