mirror of
https://github.com/GSA/notifications-admin.git
synced 2025-12-11 07:33:36 -05:00
Redirect to confirmation page
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
from flask import abort, flash, redirect, render_template, request, url_for
|
from flask import abort, flash, redirect, render_template, request, url_for, session
|
||||||
from flask_login import current_user, login_required
|
from flask_login import current_user, login_required
|
||||||
from notifications_python_client.errors import HTTPError
|
from notifications_python_client.errors import HTTPError
|
||||||
|
|
||||||
@@ -122,13 +122,21 @@ def remove_user_from_service(service_id, user_id):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@main.route("/services/<service_id>/users/<user_id>/edit-email", methods=['GET'])
|
@main.route("/services/<service_id>/users/<user_id>/edit-email", methods=['GET', 'POST'])
|
||||||
@login_required
|
@login_required
|
||||||
@user_has_permissions('manage_service')
|
@user_has_permissions('manage_service')
|
||||||
def edit_user_email(service_id, user_id):
|
def edit_user_email(service_id, user_id):
|
||||||
user = user_api_client.get_user(user_id)
|
user = user_api_client.get_user(user_id)
|
||||||
user_email = user.email_address
|
user_email = user.email_address
|
||||||
form = ChangeEmailForm(user_api_client.is_email_already_in_use(user_email), email_address=user_email)
|
|
||||||
|
def _is_email_already_in_use(email):
|
||||||
|
return user_api_client.is_email_already_in_use(email)
|
||||||
|
|
||||||
|
form = ChangeEmailForm(_is_email_already_in_use, email_address=user_email)
|
||||||
|
if form.validate_on_submit():
|
||||||
|
session['team_member_email_change'] = form.email_address.data
|
||||||
|
|
||||||
|
return redirect(url_for('.confirm_edit_user_email', user_id=user.id, service_id=service_id))
|
||||||
|
|
||||||
return render_template(
|
return render_template(
|
||||||
'views/manage-users/edit-user-email.html',
|
'views/manage-users/edit-user-email.html',
|
||||||
@@ -138,6 +146,34 @@ def edit_user_email(service_id, user_id):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@main.route("/services/<service_id>/users/<user_id>/edit-email/confirm", methods=['GET', 'POST'])
|
||||||
|
@login_required
|
||||||
|
@user_has_permissions('manage_service')
|
||||||
|
def confirm_edit_user_email(service_id, user_id):
|
||||||
|
user = user_api_client.get_user(user_id)
|
||||||
|
new_email = session['team_member_email_change']
|
||||||
|
if request.method == 'POST':
|
||||||
|
try:
|
||||||
|
user_api_client.update_user_attribute(user_id, email_address=new_email)
|
||||||
|
except HTTPError as e:
|
||||||
|
if e.status_code == 403:
|
||||||
|
flash("You don't have permission to edit users emails for this service", 'info')
|
||||||
|
return redirect(url_for(
|
||||||
|
'.manage_users',
|
||||||
|
service_id=service_id))
|
||||||
|
else:
|
||||||
|
abort(500, e)
|
||||||
|
|
||||||
|
return redirect(url_for(
|
||||||
|
'.manage_users',
|
||||||
|
service_id=service_id
|
||||||
|
))
|
||||||
|
return render_template(
|
||||||
|
'views/manage-users/confirm-edit-user-email.html',
|
||||||
|
user=user,
|
||||||
|
service_id=service_id
|
||||||
|
)
|
||||||
|
|
||||||
@main.route("/services/<service_id>/cancel-invited-user/<invited_user_id>", methods=['GET'])
|
@main.route("/services/<service_id>/cancel-invited-user/<invited_user_id>", methods=['GET'])
|
||||||
@user_has_permissions('manage_service')
|
@user_has_permissions('manage_service')
|
||||||
def cancel_invited_user(service_id, invited_user_id):
|
def cancel_invited_user(service_id, invited_user_id):
|
||||||
|
|||||||
@@ -789,3 +789,24 @@ def test_edit_user_email_page(
|
|||||||
assert page.find('h1').text == "Edit user email"
|
assert page.find('h1').text == "Edit user email"
|
||||||
assert page.select('p[id=user_name]')[0].text == "for " + user.name
|
assert page.select('p[id=user_name]')[0].text == "for " + user.name
|
||||||
assert page.select('input[type=email]')[0].attrs["value"] == user.email_address
|
assert page.select('input[type=email]')[0].attrs["value"] == user.email_address
|
||||||
|
|
||||||
|
|
||||||
|
def test_edit_user_email_redirects_to_confirmation(
|
||||||
|
logged_in_client,
|
||||||
|
active_user_with_permissions,
|
||||||
|
service_one,
|
||||||
|
mocker,
|
||||||
|
mock_get_user,
|
||||||
|
):
|
||||||
|
response = logged_in_client.post(
|
||||||
|
url_for(
|
||||||
|
'main.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.confirm_edit_user_email',
|
||||||
|
service_id=service_one['id'],
|
||||||
|
user_id=active_user_with_permissions.id,
|
||||||
|
_external=True
|
||||||
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user