Confirm edit user email changes user email

app/main/views/manage_users.py

@@ -1,4 +1,12 @@
-from flask import abort, flash, redirect, render_template, request, url_for, session
+from flask import (
+    abort,
+    flash,
+    redirect,
+    render_template,
+    request,
+    session,
+    url_for,
+)
 from flask_login import current_user, login_required
 from notifications_python_client.errors import HTTPError
 
@@ -9,7 +17,12 @@ from app import (
     user_api_client,
 )
 from app.main import main
-from app.main.forms import InviteUserForm, PermissionsForm, SearchUsersForm, ChangeEmailForm
+from app.main.forms import (
+    ChangeEmailForm,
+    InviteUserForm,
+    PermissionsForm,
+    SearchUsersForm,
+)
 from app.models.user import permissions
 from app.utils import user_has_permissions
 
@@ -171,9 +184,11 @@ def confirm_edit_user_email(service_id, user_id):
     return render_template(
         'views/manage-users/confirm-edit-user-email.html',
         user=user,
-        service_id=service_id
+        service_id=service_id,
+        new_email=new_email
     )
 
+
 @main.route("/services/<service_id>/cancel-invited-user/<invited_user_id>", methods=['GET'])
 @user_has_permissions('manage_service')
 def cancel_invited_user(service_id, invited_user_id):

app/navigation.py

@@ -135,6 +135,7 @@ class HeaderNavigation(Navigation):
         'choose_template',
         'choose_template_to_copy',
         'confirm_edit_organisation_name',
+        'confirm_edit_user_email',
         'confirm_redact_template',
         'conversation',
         'conversation_reply',
@@ -157,6 +158,7 @@ class HeaderNavigation(Navigation):
         'edit_service_template',
         'edit_template_postage',
         'edit_user_org_permissions',
+        'edit_user_email',
         'edit_user_permissions',
         'email_not_received',
         'email_template',
@@ -326,6 +328,8 @@ class MainNavigation(Navigation):
             'view_template_versions',
         },
         'team-members': {
+            'confirm_edit_user_email',
+            'edit_user_email',
             'edit_user_permissions',
             'invite_user',
             'manage_users',
@@ -583,6 +587,7 @@ class CaseworkNavigation(Navigation):
         'choose_template_to_copy',
         'clear_cache',
         'confirm_edit_organisation_name',
+        'confirm_edit_user_email',
         'confirm_redact_template',
         'conversation',
         'conversation_reply',
@@ -607,6 +612,7 @@ class CaseworkNavigation(Navigation):
         'edit_provider',
         'edit_service_template',
         'edit_template_postage',
+        'edit_user_email',
         'edit_user_org_permissions',
         'edit_user_permissions',
         'email_branding',
@@ -822,6 +828,7 @@ class OrgNavigation(Navigation):
         'choose_template',
         'choose_template_to_copy',
         'clear_cache',
+        'confirm_edit_user_email',
         'confirm_redact_template',
         'conversation',
         'conversation_reply',
@@ -845,6 +852,7 @@ class OrgNavigation(Navigation):
         'edit_provider',
         'edit_service_template',
         'edit_template_postage',
+        'edit_user_email',
         'edit_user_permissions',
         'email_branding',
         'email_not_received',

app/templates/views/manage-users/confirm-edit-user-email.html

@@ -0,0 +1,27 @@
+{% extends "org_template.html" %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/form.html" import form_wrapper %}
+
+{% block per_page_title %}
+  Confirm changes to user email
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<h1 class="heading-large">Confirm changes to user email</h1>
+
+<div class="grid-row">
+  <div class="column-three-quarters">
+
+  {% call form_wrapper() %}
+    <p> Email address for {{ user.name }} will be changed from "{{ user.email_address }}" to "{{ new_email }}".</p>
+    {{ page_footer(
+      'Confirm',
+      destructive=destructive,
+      back_link=url_for('.edit_user_email', service_id=service_id, user_id=user.id)
+    ) }}
+  {% endcall %}
+  </div>
+</div>
+
+{% endblock %}

app/templates/views/manage-users/edit-user-email.html

@@ -1,15 +1,15 @@
-{% extends "withoutnav_template.html" %}
+{% extends "org_template.html" %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
 {% block per_page_title %}
-  Edit user email
+  Edit user email address
 {% endblock %}
 
 {% block maincolumn_content %}
 
-  <h1 class="heading-large">Edit user email</h1>
+  <h1 class="heading-large">Edit user email address</h1>
   <p id="user_name">for {{ user.name }}</p>
   <div class="grid-row">
     <div class="column-three-quarters">

tests/app/main/views/test_manage_users.py

@@ -39,7 +39,7 @@ from tests.conftest import service_one as create_sample_service
             'Can’t Add and edit templates '
             'Can’t Manage settings, team and usage '
             'Can’t Manage API integration '
-            'Edit permissions'
+            'Edit permissions Edit user email'
         )
     ),
     (
@@ -786,7 +786,7 @@ def test_edit_user_email_page(
         user_id=test_user.id
     )
 
-    assert page.find('h1').text == "Edit user email"
+    assert page.find('h1').text == "Edit user email address"
     assert page.select('p[id=user_name]')[0].text == "for " + user.name
     assert page.select('input[type=email]')[0].attrs["value"] == user.email_address
 
@@ -810,3 +810,49 @@ def test_edit_user_email_redirects_to_confirmation(
         user_id=active_user_with_permissions.id,
         _external=True
     )
+
+
+def test_confirm_edit_user_email_page(
+    logged_in_client,
+    active_user_with_permissions,
+    service_one,
+    mocker,
+    mock_get_user,
+):
+    new_email = 'new_email@gov.uk'
+    with logged_in_client.session_transaction() as session:
+        session['team_member_email_change'] = new_email
+    response = logged_in_client.get(url_for(
+        'main.confirm_edit_user_email',
+        service_id=service_one['id'],
+        user_id=active_user_with_permissions.id
+    ))
+
+    assert 'Confirm changes to user email' in response.get_data(as_text=True)
+    assert 'Email address for {} will be changed from "{}" to "{}".'.format(
+        active_user_with_permissions.name, active_user_with_permissions.email_address, new_email
+    ) in response.get_data(as_text=True)
+    assert 'Confirm' in response.get_data(as_text=True)
+    assert response.status_code == 200
+
+
+def test_confirm_edit_user_email_changes_user_email(
+    logged_in_client,
+    active_user_with_permissions,
+    service_one,
+    mocker,
+    mock_get_user,
+    mock_update_user_attribute
+):
+    new_email = 'new_email@gov.uk'
+    with logged_in_client.session_transaction() as session:
+        session['team_member_email_change'] = new_email
+    response = logged_in_client.post(
+        url_for(
+            'main.confirm_edit_user_email',
+            service_id=service_one['id'],
+            user_id=active_user_with_permissions.id))
+    assert response.status_code == 302
+    assert response.location == url_for(
+        'main.manage_users', service_id=service_one['id'], _external=True)
+    mock_update_user_attribute.assert_called_once_with(active_user_with_permissions.id, email_address=new_email)