From 7ad56df78b2130b98ce0a94da8c5e60fb6b411a4 Mon Sep 17 00:00:00 2001
From: Imdad Ahad <imdad.ahad@digital.cabinet-office.gov.uk>
Date: Tue, 7 Feb 2017 13:31:46 +0000
Subject: [PATCH 1/2] Change user api client to update password with new
 endpoint

---
 app/notify_client/user_api_client.py        |  6 ++++++
 tests/app/notify_client/test_user_client.py | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/app/notify_client/user_api_client.py b/app/notify_client/user_api_client.py
index c1b129571..76573d2e9 100644
--- a/app/notify_client/user_api_client.py
+++ b/app/notify_client/user_api_client.py
@@ -72,6 +72,12 @@ class UserApiClient(NotifyAdminAPIClient):
         user_data = self.post(url, data=data)
         return User(user_data['data'], max_failed_login_count=self.max_failed_login_count)
 
+    def update_password(self, user_id, password):
+        data = {"_password": password}
+        url = "/user/{}/update-password".format(user_id)
+        user_data = self.post(url, data=data)
+        return User(user_data['data'], max_failed_login_count=self.max_failed_login_count)
+
     def verify_password(self, user_id, password):
         try:
             url = "/user/{}/verify/password".format(user_id)
diff --git a/tests/app/notify_client/test_user_client.py b/tests/app/notify_client/test_user_client.py
index 9062ba8bd..9c056c42b 100644
--- a/tests/app/notify_client/test_user_client.py
+++ b/tests/app/notify_client/test_user_client.py
@@ -22,3 +22,14 @@ def test_client_only_updates_allowed_attributes(mocker):
     with pytest.raises(TypeError) as error:
         UserApiClient().update_user_attribute('user_id', id='1')
     assert str(error.value) == 'Not allowed to update user attributes: id'
+
+
+def test_client_updates_password_separately(mocker, api_user_active):
+    expected_url = '/user/{}/update-password'.format(api_user_active.id)
+    expected_params = {'_password': 'newpassword'}
+    client = UserApiClient()
+    client.max_failed_login_count = 1  # doesn't matter for this test
+    mock_update_password = mocker.patch('app.notify_client.user_api_client.UserApiClient.post')
+
+    client.update_password(api_user_active.id, expected_params['_password'])
+    mock_update_password.assert_called_once_with(expected_url, data=expected_params)

From 48b4dce8486e9ccc9101f5144e01b5b44ffbb27e Mon Sep 17 00:00:00 2001
From: Imdad Ahad <imdad.ahad@digital.cabinet-office.gov.uk>
Date: Tue, 7 Feb 2017 13:32:20 +0000
Subject: [PATCH 2/2] Update password on user profile with new endpoint

---
 app/main/views/user_profile.py            | 3 +--
 tests/app/main/views/test_user_profile.py | 2 +-
 tests/conftest.py                         | 8 ++++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/main/views/user_profile.py b/app/main/views/user_profile.py
index 4107e53cd..e59619dab 100644
--- a/app/main/views/user_profile.py
+++ b/app/main/views/user_profile.py
@@ -201,8 +201,7 @@ def user_profile_password():
     form = ChangePasswordForm(_check_password)
 
     if form.validate_on_submit():
-        current_user.set_password(form.new_password.data)
-        user_api_client.update_user(current_user)
+        user_api_client.update_password(current_user.id, password=form.new_password.data)
         return redirect(url_for('.user_profile'))
 
     return render_template(
diff --git a/tests/app/main/views/test_user_profile.py b/tests/app/main/views/test_user_profile.py
index a1601460b..8f1f2c6a4 100644
--- a/tests/app/main/views/test_user_profile.py
+++ b/tests/app/main/views/test_user_profile.py
@@ -239,7 +239,7 @@ def test_should_redirect_after_password_change(
     api_user_active,
     mock_login,
     mock_get_user,
-    mock_update_user,
+    mock_update_user_password,
     mock_verify_password,
 ):
     data = {
diff --git a/tests/conftest.py b/tests/conftest.py
index 0e11976e4..53a9ca0b5 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -801,6 +801,14 @@ def mock_update_user(mocker, api_user_active):
     return mocker.patch('app.user_api_client.update_user', side_effect=_update)
 
 
+@pytest.fixture(scope='function')
+def mock_update_user_password(mocker, api_user_active):
+    def _update(user_id, **kwargs):
+        return api_user_active
+
+    return mocker.patch('app.user_api_client.update_password', side_effect=_update)
+
+
 @pytest.fixture(scope='function')
 def mock_update_user_attribute(mocker, api_user_active):
     def _update(user_id, **kwargs):