Revision b2ffa772 snf-astakos-app/astakos/im/target/redirect.py

b/snf-astakos-app/astakos/im/target/redirect.py
46 46
from urllib import quote
47 47
from urlparse import urlunsplit, urlsplit, urlparse, parse_qsl
48 48

  
49
from astakos.im.settings import COOKIE_NAME, COOKIE_DOMAIN
50
from astakos.im.util import set_cookie, restrict_next
49
from astakos.im.settings import COOKIE_DOMAIN
50
from astakos.im.util import restrict_next
51 51
from astakos.im.functions import login as auth_login, logout
52 52

  
53 53
import logging
......
75 75
    response = HttpResponse()
76 76
    if force == '':
77 77
        logout(request)
78
        response.delete_cookie(COOKIE_NAME, path='/', domain=COOKIE_DOMAIN)
79 78
    if request.user.is_authenticated():
80 79
        # if user has not signed the approval terms
81 80
        # redirect to approval terms with next the request path
......
105 104
            # authenticate before login
106 105
            user = authenticate(email=request.user.email, auth_token=request.user.auth_token)
107 106
            auth_login(request, user)
108
            set_cookie(response, user)
109 107
            logger.info('Token reset for %s' % request.user.email)
110 108
        parts = list(urlsplit(next))
111 109
        parts[3] = urlencode({'user': request.user.email, 'token': request.user.auth_token})

Also available in: Unified diff