From 91465520a08985c6e0aa16571669d6e0410cd8b9 Mon Sep 17 00:00:00 2001 From: Adam Shimali Date: Thu, 28 Jan 2016 12:31:24 +0000 Subject: [PATCH] Call to client for password check incorrectly passed user instead of user.id --- app/main/views/sign_in.py | 2 +- tests/app/main/views/test_sign_in.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py index af96db8e9..3aed7a5ae 100644 --- a/app/main/views/sign_in.py +++ b/app/main/views/sign_in.py @@ -39,7 +39,7 @@ def _get_and_verify_user(email_address, password): return None elif not user.is_active(): return None - elif not users_dao.verify_password(user, password): + elif not users_dao.verify_password(user.id, password): return None else: return user diff --git a/tests/app/main/views/test_sign_in.py b/tests/app/main/views/test_sign_in.py index a1eeb3f1f..35420f7dc 100644 --- a/tests/app/main/views/test_sign_in.py +++ b/tests/app/main/views/test_sign_in.py @@ -31,6 +31,7 @@ def test_logged_in_user_redirects_to_choose_service(app_, def test_process_sign_in_return_2fa_template(app_, + api_user_active, mock_send_verify_code, mock_get_user, mock_get_user_by_email, @@ -43,6 +44,7 @@ def test_process_sign_in_return_2fa_template(app_, 'password': 'val1dPassw0rd!'}) assert response.status_code == 302 assert response.location == 'http://localhost/two-factor' + mock_verify_password.assert_called_with(api_user_active.id, 'val1dPassw0rd!') def test_should_return_locked_out_true_when_user_is_locked(app_,