From c426c826f70306eb919ea5a9a2cd119e893bb3f1 Mon Sep 17 00:00:00 2001 From: Omer Lachish Date: Mon, 10 Dec 2018 12:27:39 +0200 Subject: [PATCH] fix tests that rely on sessions --- redash/handlers/users.py | 7 +++++-- tests/__init__.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/redash/handlers/users.py b/redash/handlers/users.py index f7eeb4ea0..f14ed8d04 100644 --- a/redash/handlers/users.py +++ b/redash/handlers/users.py @@ -169,8 +169,11 @@ class UserResource(BaseResource): @after_this_request def update_identity_cookie(response): session['user_id'] = user.get_id() + remember_token = request.cookies.get('remember_token') - response.set_cookie('remember_token', re.sub('.*\\|', user.get_id() + '|', remember_token)) + if remember_token: + response.set_cookie('remember_token', re.sub('.*\\|', user.get_id() + '|', remember_token)) + return response require_admin_or_owner(user_id) @@ -192,7 +195,7 @@ class UserResource(BaseResource): if 'groups' in params and not self.current_user.has_permission('admin'): abort(403, message="Must be admin to change groups membership.") - + if 'email' in params: _, domain = params['email'].split('@', 1) diff --git a/tests/__init__.py b/tests/__init__.py index ca89d0645..62c720b22 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -26,7 +26,7 @@ logging.getLogger("metrics").setLevel("ERROR") def authenticate_request(c, user): with c.session_transaction() as sess: - sess['user_id'] = user.id + sess['user_id'] = user.get_id() @contextmanager