Only remove the opened session cookie when the feature is activated (#6265)

This commit is contained in:
Benjamin Dauvergne 2015-01-08 16:57:17 +01:00
parent ab50dcee8b
commit a838d08d1d
1 changed files with 8 additions and 7 deletions

View File

@ -94,14 +94,15 @@ class CollectIPMiddleware(object):
class OpenedSessionCookieMiddleware(object):
def process_response(self, request, response):
if not app_settings.A2_OPENED_SESSION_COOKIE_DOMAIN:
return response
if hasattr(request, 'user') and request.user.is_authenticated():
if app_settings.A2_OPENED_SESSION_COOKIE_DOMAIN:
response.set_cookie(
app_settings.A2_OPENED_SESSION_COOKIE_NAME,
value='1',
max_age=None,
domain=app_settings.A2_OPENED_SESSION_COOKIE_DOMAIN)
else:
response.set_cookie(
app_settings.A2_OPENED_SESSION_COOKIE_NAME,
value='1',
max_age=None,
domain=app_settings.A2_OPENED_SESSION_COOKIE_DOMAIN)
elif app_settings.A2_OPENED_SESSION_COOKIE_NAME in request.COOKIES:
response.delete_cookie(
app_settings.A2_OPENED_SESSION_COOKIE_NAME,
domain=app_settings.A2_OPENED_SESSION_COOKIE_DOMAIN)