mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-09 17:45:32 -04:00
Remove the upload_letters permission
Every service has it now, and we haven’t had any services ask to toggle it off again.
This commit is contained in:
@@ -67,7 +67,6 @@ from app.utils import (
|
|||||||
PLATFORM_ADMIN_SERVICE_PERMISSIONS = OrderedDict([
|
PLATFORM_ADMIN_SERVICE_PERMISSIONS = OrderedDict([
|
||||||
('inbound_sms', {'title': 'Receive inbound SMS', 'requires': 'sms', 'endpoint': '.service_set_inbound_number'}),
|
('inbound_sms', {'title': 'Receive inbound SMS', 'requires': 'sms', 'endpoint': '.service_set_inbound_number'}),
|
||||||
('email_auth', {'title': 'Email authentication'}),
|
('email_auth', {'title': 'Email authentication'}),
|
||||||
('upload_letters', {'title': 'Uploading letters', 'requires': 'letter'}),
|
|
||||||
('international_letters', {'title': 'Send international letters', 'requires': 'letter'}),
|
('international_letters', {'title': 'Send international letters', 'requires': 'letter'}),
|
||||||
('broadcast', {'title': 'Send cell broadcasts'}),
|
('broadcast', {'title': 'Send cell broadcasts'}),
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -341,7 +341,7 @@ def view_letter_upload_as_preview(service_id, file_id):
|
|||||||
@main.route("/services/<uuid:service_id>/upload-letter/send/<uuid:file_id>", methods=['POST'])
|
@main.route("/services/<uuid:service_id>/upload-letter/send/<uuid:file_id>", methods=['POST'])
|
||||||
@user_has_permissions('send_messages', restrict_admin_usage=True)
|
@user_has_permissions('send_messages', restrict_admin_usage=True)
|
||||||
def send_uploaded_letter(service_id, file_id):
|
def send_uploaded_letter(service_id, file_id):
|
||||||
if not (current_service.has_permission('letter') and current_service.has_permission('upload_letters')):
|
if not current_service.has_permission('letter'):
|
||||||
abort(403)
|
abort(403)
|
||||||
|
|
||||||
metadata = get_letter_metadata(service_id, file_id)
|
metadata = get_letter_metadata(service_id, file_id)
|
||||||
|
|||||||
@@ -64,7 +64,6 @@ class Service(JSONModel):
|
|||||||
'international_letters',
|
'international_letters',
|
||||||
'international_sms',
|
'international_sms',
|
||||||
'upload_document',
|
'upload_document',
|
||||||
'upload_letters',
|
|
||||||
'broadcast',
|
'broadcast',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
caption="Recent files uploaded",
|
caption="Recent files uploaded",
|
||||||
caption_visible=False,
|
caption_visible=False,
|
||||||
empty_message=(
|
empty_message=(
|
||||||
'Upload a letter and Notify will print, pack and post it for you.' if current_service.can_upload_letters else 'You have not uploaded any files yet'
|
'Upload a letter and Notify will print, pack and post it for you.'
|
||||||
),
|
),
|
||||||
field_headings=[
|
field_headings=[
|
||||||
'File',
|
'File',
|
||||||
|
|||||||
@@ -119,9 +119,6 @@ def test_service_set_permission(
|
|||||||
({'restricted': False}, '.service_switch_live', {}, 'Live On Change service status'),
|
({'restricted': False}, '.service_switch_live', {}, 'Live On Change service status'),
|
||||||
({'permissions': ['sms']}, '.service_set_inbound_number', {},
|
({'permissions': ['sms']}, '.service_set_inbound_number', {},
|
||||||
'Receive inbound SMS Off Change your settings for Receive inbound SMS'),
|
'Receive inbound SMS Off Change your settings for Receive inbound SMS'),
|
||||||
({'permissions': ['letter']},
|
|
||||||
'.service_set_permission', {'permission': 'upload_letters'},
|
|
||||||
'Uploading letters Off Change your settings for Uploading letters'),
|
|
||||||
({'permissions': ['letter']},
|
({'permissions': ['letter']},
|
||||||
'.service_set_permission', {'permission': 'international_letters'},
|
'.service_set_permission', {'permission': 'international_letters'},
|
||||||
'Send international letters Off Change your settings for Send international letters'),
|
'Send international letters Off Change your settings for Send international letters'),
|
||||||
|
|||||||
@@ -629,8 +629,7 @@ def test_send_uploaded_letter_sends_letter_and_redirects_to_notification_page(
|
|||||||
|
|
||||||
@pytest.mark.parametrize('permissions', [
|
@pytest.mark.parametrize('permissions', [
|
||||||
['email'],
|
['email'],
|
||||||
['letter'],
|
['sms'],
|
||||||
['upload_letters'],
|
|
||||||
])
|
])
|
||||||
def test_send_uploaded_letter_when_service_does_not_have_correct_permissions(
|
def test_send_uploaded_letter_when_service_does_not_have_correct_permissions(
|
||||||
mocker,
|
mocker,
|
||||||
|
|||||||
Reference in New Issue
Block a user