mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-11 10:28:41 -04:00
Edit user permissions page shows redacted phone number and Change link
Also make plan for story development
This commit is contained in:
@@ -24,7 +24,7 @@ from app.main.forms import (
|
|||||||
SearchUsersForm,
|
SearchUsersForm,
|
||||||
)
|
)
|
||||||
from app.models.user import permissions
|
from app.models.user import permissions
|
||||||
from app.utils import user_has_permissions
|
from app.utils import redact_mobile_number, user_has_permissions
|
||||||
|
|
||||||
|
|
||||||
@main.route("/services/<service_id>/users")
|
@main.route("/services/<service_id>/users")
|
||||||
@@ -78,7 +78,10 @@ def invite_user(service_id):
|
|||||||
def edit_user_permissions(service_id, user_id):
|
def edit_user_permissions(service_id, user_id):
|
||||||
service_has_email_auth = current_service.has_permission('email_auth')
|
service_has_email_auth = current_service.has_permission('email_auth')
|
||||||
user = current_service.get_team_member(user_id)
|
user = current_service.get_team_member(user_id)
|
||||||
user_has_no_mobile_number = user.mobile_number is None
|
|
||||||
|
mobile_number = None
|
||||||
|
if user.mobile_number:
|
||||||
|
mobile_number = redact_mobile_number(user.mobile_number)
|
||||||
|
|
||||||
form = PermissionsForm.from_user(user, service_id)
|
form = PermissionsForm.from_user(user, service_id)
|
||||||
|
|
||||||
@@ -96,7 +99,7 @@ def edit_user_permissions(service_id, user_id):
|
|||||||
user=user,
|
user=user,
|
||||||
form=form,
|
form=form,
|
||||||
service_has_email_auth=service_has_email_auth,
|
service_has_email_auth=service_has_email_auth,
|
||||||
user_has_no_mobile_number=user_has_no_mobile_number
|
mobile_number=mobile_number
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -200,6 +203,13 @@ def confirm_edit_user_email(service_id, user_id):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@main.route("/services/<service_id>/users/<user_id>/edit-phone-number", methods=['GET', 'POST'])
|
||||||
|
@login_required
|
||||||
|
@user_has_permissions('manage_service')
|
||||||
|
def edit_user_phone_number(service_id, user_id):
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
@main.route("/services/<service_id>/cancel-invited-user/<uuid:invited_user_id>", methods=['GET'])
|
@main.route("/services/<service_id>/cancel-invited-user/<uuid: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):
|
||||||
|
|||||||
@@ -159,6 +159,7 @@ class HeaderNavigation(Navigation):
|
|||||||
'edit_template_postage',
|
'edit_template_postage',
|
||||||
'edit_user_org_permissions',
|
'edit_user_org_permissions',
|
||||||
'edit_user_email',
|
'edit_user_email',
|
||||||
|
'edit_user_phone_number',
|
||||||
'edit_user_permissions',
|
'edit_user_permissions',
|
||||||
'email_not_received',
|
'email_not_received',
|
||||||
'email_template',
|
'email_template',
|
||||||
@@ -328,6 +329,7 @@ class MainNavigation(Navigation):
|
|||||||
'team-members': {
|
'team-members': {
|
||||||
'confirm_edit_user_email',
|
'confirm_edit_user_email',
|
||||||
'edit_user_email',
|
'edit_user_email',
|
||||||
|
'edit_user_phone_number',
|
||||||
'edit_user_permissions',
|
'edit_user_permissions',
|
||||||
'invite_user',
|
'invite_user',
|
||||||
'manage_users',
|
'manage_users',
|
||||||
@@ -609,6 +611,7 @@ class CaseworkNavigation(Navigation):
|
|||||||
'edit_service_template',
|
'edit_service_template',
|
||||||
'edit_template_postage',
|
'edit_template_postage',
|
||||||
'edit_user_email',
|
'edit_user_email',
|
||||||
|
'edit_user_phone_number',
|
||||||
'edit_user_org_permissions',
|
'edit_user_org_permissions',
|
||||||
'edit_user_permissions',
|
'edit_user_permissions',
|
||||||
'email_branding',
|
'email_branding',
|
||||||
@@ -847,6 +850,7 @@ class OrgNavigation(Navigation):
|
|||||||
'edit_service_template',
|
'edit_service_template',
|
||||||
'edit_template_postage',
|
'edit_template_postage',
|
||||||
'edit_user_email',
|
'edit_user_email',
|
||||||
|
'edit_user_phone_number',
|
||||||
'edit_user_permissions',
|
'edit_user_permissions',
|
||||||
'email_branding',
|
'email_branding',
|
||||||
'email_not_received',
|
'email_not_received',
|
||||||
|
|||||||
@@ -16,7 +16,11 @@
|
|||||||
<p>
|
<p>
|
||||||
{{ user.email_address }} <a href="{{ url_for('.edit_user_email', service_id=current_service.id, user_id=user.id)}}">Change</a>
|
{{ user.email_address }} <a href="{{ url_for('.edit_user_email', service_id=current_service.id, user_id=user.id)}}">Change</a>
|
||||||
</p>
|
</p>
|
||||||
|
{% if mobile_number %}
|
||||||
|
<p id="user_phone_number">
|
||||||
|
{{ mobile_number }} <a href="{{ url_for('.edit_user_phone_number', service_id=current_service.id, user_id=user.id)}}">Change</a>
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
<div class="grid-row">
|
<div class="grid-row">
|
||||||
{% call form_wrapper(class="column-three-quarters") %}
|
{% call form_wrapper(class="column-three-quarters") %}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
{% if service_has_email_auth %}
|
{% if service_has_email_auth %}
|
||||||
{% if user_has_no_mobile_number %}
|
{% if not mobile_number %}
|
||||||
{{ radios(
|
{{ radios(
|
||||||
form.login_authentication,
|
form.login_authentication,
|
||||||
disable=['sms_auth'],
|
disable=['sms_auth'],
|
||||||
|
|||||||
+11
-3
@@ -650,9 +650,9 @@ def guess_name_from_email_address(email_address):
|
|||||||
|
|
||||||
def should_skip_template_page(template_type):
|
def should_skip_template_page(template_type):
|
||||||
return (
|
return (
|
||||||
current_user.has_permissions('send_messages') and
|
current_user.has_permissions('send_messages')
|
||||||
not current_user.has_permissions('manage_templates', 'manage_api_keys') and
|
and not current_user.has_permissions('manage_templates', 'manage_api_keys')
|
||||||
template_type != 'letter'
|
and template_type != 'letter'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -671,3 +671,11 @@ def printing_today_or_tomorrow():
|
|||||||
return 'today'
|
return 'today'
|
||||||
else:
|
else:
|
||||||
return 'tomorrow'
|
return 'tomorrow'
|
||||||
|
|
||||||
|
|
||||||
|
def redact_mobile_number(mobile_number):
|
||||||
|
indices = [-4, -5, -6, -7]
|
||||||
|
mobile_number_list = list(mobile_number.replace(" ", ""))
|
||||||
|
for i in indices:
|
||||||
|
mobile_number_list[i] = "*"
|
||||||
|
return "".join(mobile_number_list)
|
||||||
|
|||||||
@@ -1005,3 +1005,51 @@ def test_confirm_edit_user_email_doesnt_change_user_email_for_non_team_member(
|
|||||||
user_id=USER_ONE_ID,
|
user_id=USER_ONE_ID,
|
||||||
_expected_status=404,
|
_expected_status=404,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_confirm_edit_user_email_with_no_permission_aborts():
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def test_edit_user_permissions_page_displays_redacted_phone_number_and_change_link(
|
||||||
|
client_request,
|
||||||
|
active_user_with_permissions,
|
||||||
|
service_one,
|
||||||
|
mocker
|
||||||
|
):
|
||||||
|
user = active_user_with_permissions
|
||||||
|
mocker.patch('app.user_api_client.get_user', return_value=user)
|
||||||
|
|
||||||
|
page = client_request.get(
|
||||||
|
'main.edit_user_permissions',
|
||||||
|
service_id=service_one['id'],
|
||||||
|
user_id=user.id
|
||||||
|
)
|
||||||
|
|
||||||
|
assert user.name in page.find('h1').text
|
||||||
|
phone_number_paragraph = page.select('p[id=user_phone_number]')[0]
|
||||||
|
assert '0770****762' in phone_number_paragraph.text
|
||||||
|
change_link = phone_number_paragraph.findChild()
|
||||||
|
assert change_link.attrs['href'] == '/services/{}/users/{}/edit-phone-number'.format(
|
||||||
|
service_one['id'], user.id
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_edit_user_phone_number_page():
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def test_edit_user_phone_number_redirects_to_confirmation():
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def test_confirm_edit_user_phone_number_page():
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def test_confirm_edit_user_phone_number_changes_user_mobile_number():
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def test_confirm_edit_user_phone_number_with_no_permission_aborts():
|
||||||
|
pass
|
||||||
|
|||||||
Reference in New Issue
Block a user