darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 08:44:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove all instances of db style permissions

Browse Source 
lots of renaming of send_texts/emails/letters to send_messages, and
manage_settings/users to manage_service
This commit is contained in:
Leo Hemsted
2018-02-28 17:22:20 +00:00
parent 17061e0d06
commit 09824078dd
24 changed files with 108 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/views/conversation.py
View File

@@ -39,7 +39,7 @@ def conversation_updates(service_id, notification_id):
@main.route("/services/<service_id>/conversation/<notification_id>/reply-with")
@login_required
@user_has_permissions('send_texts', admin_override=True)
@user_has_permissions('send_messages', admin_override=True)
def conversation_reply(
service_id,
notification_id,
@@ -63,7 +63,7 @@ def conversation_reply(
@main.route("/services/<service_id>/conversation/<notification_id>/reply-with/<template_id>")
@login_required
@user_has_permissions('send_texts', admin_override=True)
@user_has_permissions('send_messages', admin_override=True)
def conversation_reply_with_template(
service_id,
notification_id,

2
app/main/views/dashboard.py
View File

@@ -138,7 +138,7 @@ def template_usage(service_id):
@main.route("/services/<service_id>/usage")
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def usage(service_id):
year, current_financial_year = requested_and_current_financial_year(request)

2
app/main/views/jobs.py
View File

@@ -142,7 +142,7 @@ def view_job_csv(service_id, job_id):
@main.route("/services/<service_id>/jobs/<job_id>", methods=['POST'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters', admin_override=True)
@user_has_permissions('send_messages', admin_override=True)
def cancel_job(service_id, job_id):
job_api_client.cancel_job(service_id, job_id)
return redirect(url_for('main.service_dashboard', service_id=service_id))

8
app/main/views/manage_users.py
View File

@@ -37,7 +37,7 @@ def manage_users(service_id):
@main.route("/services/<service_id>/users/invite", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_users', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def invite_user(service_id):
form = InviteUserForm(
@@ -71,7 +71,7 @@ def invite_user(service_id):
@main.route("/services/<service_id>/users/<user_id>", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_users', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def edit_user_permissions(service_id, user_id):
service_has_email_auth = 'email_auth' in current_service['permissions']
# TODO we should probably using the service id here in the get user
@@ -103,7 +103,7 @@ def edit_user_permissions(service_id, user_id):
@main.route("/services/<service_id>/users/<user_id>/delete", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_users', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def remove_user_from_service(service_id, user_id):
user = user_api_client.get_user(user_id)
# Need to make the email address read only, or a disabled field?
@@ -139,7 +139,7 @@ def remove_user_from_service(service_id, user_id):
@main.route("/services/<service_id>/cancel-invited-user/<invited_user_id>", methods=['GET'])
@user_has_permissions('manage_users', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def cancel_invited_user(service_id, invited_user_id):
invite_api_client.cancel_invited_user(service_id=service_id, invited_user_id=invited_user_id)

24
app/main/views/send.py
View File

@@ -90,7 +90,7 @@ def get_example_letter_address(key):
@main.route("/services/<service_id>/send/<template_id>/csv", methods=['GET', 'POST'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
@user_has_permissions('send_messages')
def send_messages(service_id, template_id):
session['sender_id'] = None
db_template = service_api_client.get_service_template(service_id, template_id)['data']
@@ -159,7 +159,7 @@ def send_messages(service_id, template_id):
@main.route("/services/<service_id>/send/<template_id>.csv", methods=['GET'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', any_=True)
@user_has_permissions('send_messages', 'manage_templates', any_=True)
def get_example_csv(service_id, template_id):
template = get_template(
service_api_client.get_service_template(service_id, template_id)['data'], current_service
@@ -175,7 +175,7 @@ def get_example_csv(service_id, template_id):
@main.route("/services/<service_id>/send/<template_id>/set-sender", methods=['GET', 'POST'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
@user_has_permissions('send_messages')
def set_sender(service_id, template_id):
session['sender_id'] = None
redirect_to_one_off = redirect(
@@ -265,7 +265,7 @@ def get_sender_details(service_id, template_type):
@main.route("/services/<service_id>/send/<template_id>/test", endpoint='send_test')
@main.route("/services/<service_id>/send/<template_id>/one-off", endpoint='send_one_off')
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
@user_has_permissions('send_messages')
def send_test(service_id, template_id):
session['recipient'] = None
session['placeholders'] = {}
@@ -319,7 +319,7 @@ def get_notification_check_endpoint(service_id, template):
endpoint='send_one_off_step',
)
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
@user_has_permissions('send_messages')
def send_test_step(service_id, template_id, step_index):
if {'recipient', 'placeholders'} - set(session.keys()):
return redirect(url_for(
@@ -443,7 +443,7 @@ def send_test_step(service_id, template_id, step_index):
@main.route("/services/<service_id>/send/<template_id>/test.<filetype>", methods=['GET'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
@user_has_permissions('send_messages')
def send_test_preview(service_id, template_id, filetype):
if filetype not in ('pdf', 'png'):
@@ -572,7 +572,7 @@ def _check_messages(service_id, template_type, upload_id, preview_row, letters_a
@main.route("/services/<service_id>/<template_type>/check/<upload_id>", methods=['GET'])
@main.route("/services/<service_id>/<template_type>/check/<upload_id>/row-<int:row_index>", methods=['GET'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
@user_has_permissions('send_messages')
def check_messages(service_id, template_type, upload_id, row_index=2):
data = _check_messages(service_id, template_type, upload_id, row_index)
@@ -601,7 +601,7 @@ def check_messages(service_id, template_type, upload_id, row_index=2):
@main.route("/services/<service_id>/<template_type>/check/<upload_id>.<filetype>", methods=['GET'])
@main.route("/services/<service_id>/<template_type>/check/<upload_id>/row-<int:row_index>.<filetype>", methods=['GET'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
@user_has_permissions('send_messages')
def check_messages_preview(service_id, template_type, upload_id, filetype, row_index=2):
if filetype not in ('pdf', 'png'):
abort(404)
@@ -615,7 +615,7 @@ def check_messages_preview(service_id, template_type, upload_id, filetype, row_i
@main.route("/services/<service_id>/<template_type>/check/<upload_id>", methods=['POST'])
@main.route("/services/<service_id>/<template_type>/check/<upload_id>/row-<int:row_index>", methods=['POST'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
@user_has_permissions('send_messages')
def recheck_messages(service_id, template_type, upload_id, row_index=0):
if not session.get('upload_data'):
@@ -626,7 +626,7 @@ def recheck_messages(service_id, template_type, upload_id, row_index=0):
@main.route("/services/<service_id>/start-job/<upload_id>", methods=['POST'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
@user_has_permissions('send_messages')
def start_job(service_id, upload_id):
upload_data = session['upload_data']
@@ -767,7 +767,7 @@ def get_back_link(service_id, template_id, step_index):
@main.route("/services/<service_id>/template/<template_id>/notification/check", methods=['GET'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
@user_has_permissions('send_messages')
def check_notification(service_id, template_id):
return _check_notification(service_id, template_id)
@@ -831,7 +831,7 @@ def get_template_error_dict(exception):
@main.route("/services/<service_id>/template/<template_id>/notification/check", methods=['POST'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
@user_has_permissions('send_messages')
def send_notification(service_id, template_id):
if {'recipient', 'placeholders'} - set(session.keys()):
return redirect(url_for(

54
app/main/views/service_settings.py
View File

@@ -53,7 +53,7 @@ from app.utils import (
@main.route("/services/<service_id>/service-settings")
@login_required
@user_has_permissions('manage_settings', 'manage_api_keys', admin_override=True, any_=True)
@user_has_permissions('manage_service', 'manage_api_keys', admin_override=True, any_=True)
def service_settings(service_id):
letter_branding_organisations = email_branding_client.get_letter_email_branding()
organisation = organisations_client.get_service_organisation(service_id).get('name', None)
@@ -105,7 +105,7 @@ def service_settings(service_id):
@main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_name_change(service_id):
form = RenameServiceForm()
@@ -127,7 +127,7 @@ def service_name_change(service_id):
@main.route("/services/<service_id>/service-settings/name/confirm", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_name_change_confirm(service_id):
# Validate password for form
def _check_password(pwd):
@@ -161,14 +161,14 @@ def service_name_change_confirm(service_id):
@main.route("/services/<service_id>/service-settings/request-to-go-live")
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def request_to_go_live(service_id):
return render_template('views/service-settings/request-to-go-live.html')
@main.route("/services/<service_id>/service-settings/submit-request-to-go-live", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def submit_request_to_go_live(service_id):
form = RequestToGoLiveForm()
@@ -307,7 +307,7 @@ def service_switch_can_send_precompiled_letter(service_id):
@main.route("/services/<service_id>/service-settings/archive", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def archive_service(service_id):
if request.method == 'POST':
service_api_client.archive_service(service_id)
@@ -319,7 +319,7 @@ def archive_service(service_id):
@main.route("/services/<service_id>/service-settings/suspend", methods=["GET", "POST"])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def suspend_service(service_id):
if request.method == 'POST':
service_api_client.suspend_service(service_id)
@@ -332,7 +332,7 @@ def suspend_service(service_id):
@main.route("/services/<service_id>/service-settings/resume", methods=["GET", "POST"])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def resume_service(service_id):
if request.method == 'POST':
service_api_client.resume_service(service_id)
@@ -344,7 +344,7 @@ def resume_service(service_id):
@main.route("/services/<service_id>/service-settings/set-email", methods=['GET'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_set_email(service_id):
return render_template(
'views/service-settings/set-email.html',
@@ -353,14 +353,14 @@ def service_set_email(service_id):
@main.route("/services/<service_id>/service-settings/set-reply-to-email", methods=['GET'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_set_reply_to_email(service_id):
return redirect(url_for('.service_email_reply_to', service_id=service_id))
@main.route("/services/<service_id>/service-settings/email-reply-to", methods=['GET'])
@login_required
@user_has_permissions('manage_settings', 'manage_api_keys', admin_override=True, any_=True)
@user_has_permissions('manage_service', 'manage_api_keys', admin_override=True, any_=True)
def service_email_reply_to(service_id):
reply_to_email_addresses = service_api_client.get_reply_to_email_addresses(service_id)
return render_template(
@@ -370,7 +370,7 @@ def service_email_reply_to(service_id):
@main.route("/services/<service_id>/service-settings/email-reply-to/add", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_add_email_reply_to(service_id):
form = ServiceReplyToEmailForm()
reply_to_email_address_count = len(service_api_client.get_reply_to_email_addresses(service_id))
@@ -390,7 +390,7 @@ def service_add_email_reply_to(service_id):
@main.route("/services/<service_id>/service-settings/email-reply-to/<reply_to_email_id>/edit", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_edit_email_reply_to(service_id, reply_to_email_id):
form = ServiceReplyToEmailForm()
reply_to_email_address = service_api_client.get_reply_to_email_address(service_id, reply_to_email_id)
@@ -413,7 +413,7 @@ def service_edit_email_reply_to(service_id, reply_to_email_id):
@main.route("/services/<service_id>/service-settings/set-inbound-number", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_set_inbound_number(service_id):
available_inbound_numbers = inbound_number_client.get_available_inbound_sms_numbers()
service_has_inbound_number = inbound_number_client.get_inbound_sms_number_for_service(service_id)['data'] != {}
@@ -443,7 +443,7 @@ def service_set_inbound_number(service_id):
@main.route("/services/<service_id>/service-settings/set-sms", methods=['GET'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_set_sms(service_id):
return render_template(
'views/service-settings/set-sms.html',
@@ -452,7 +452,7 @@ def service_set_sms(service_id):
@main.route("/services/<service_id>/service-settings/sms-prefix", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_set_sms_prefix(service_id):
form = SMSPrefixForm(enabled=(
@@ -476,7 +476,7 @@ def service_set_sms_prefix(service_id):
@main.route("/services/<service_id>/service-settings/set-international-sms", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_set_international_sms(service_id):
form = InternationalSMSForm(
enabled='on' if 'international_sms' in current_service['permissions'] else 'off'
@@ -498,7 +498,7 @@ def service_set_international_sms(service_id):
@main.route("/services/<service_id>/service-settings/set-inbound-sms", methods=['GET'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_set_inbound_sms(service_id):
number = inbound_number_client.get_inbound_sms_number_for_service(service_id)['data'].get('number', '')
return render_template(
@@ -509,7 +509,7 @@ def service_set_inbound_sms(service_id):
@main.route("/services/<service_id>/service-settings/set-letters", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_set_letters(service_id):
form = ServiceSwitchLettersForm(
enabled='on' if 'letter' in current_service['permissions'] else 'off'
@@ -531,7 +531,7 @@ def service_set_letters(service_id):
@main.route("/services/<service_id>/service-settings/set-auth-type", methods=['GET'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_set_auth_type(service_id):
return render_template(
'views/service-settings/set-auth-type.html',
@@ -540,7 +540,7 @@ def service_set_auth_type(service_id):
@main.route("/services/<service_id>/service-settings/letter-contacts", methods=['GET'])
@login_required
@user_has_permissions('manage_settings', 'manage_api_keys', admin_override=True, any_=True)
@user_has_permissions('manage_service', 'manage_api_keys', admin_override=True, any_=True)
def service_letter_contact_details(service_id):
letter_contact_details = service_api_client.get_letter_contacts(service_id)
return render_template(
@@ -550,7 +550,7 @@ def service_letter_contact_details(service_id):
@main.route("/services/<service_id>/service-settings/letter-contact/add", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_add_letter_contact(service_id):
form = ServiceLetterContactBlockForm()
letter_contact_blocks_count = len(service_api_client.get_letter_contacts(service_id))
@@ -574,7 +574,7 @@ def service_add_letter_contact(service_id):
@main.route("/services/<service_id>/service-settings/letter-contact/<letter_contact_id>/edit", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_edit_letter_contact(service_id, letter_contact_id):
letter_contact_block = service_api_client.get_letter_contact(service_id, letter_contact_id)
form = ServiceLetterContactBlockForm(letter_contact_block=letter_contact_block['contact_block'])
@@ -596,7 +596,7 @@ def service_edit_letter_contact(service_id, letter_contact_id):
@main.route("/services/<service_id>/service-settings/sms-sender", methods=['GET'])
@login_required
@user_has_permissions('manage_settings', 'manage_api_keys', admin_override=True, any_=True)
@user_has_permissions('manage_service', 'manage_api_keys', admin_override=True, any_=True)
def service_sms_senders(service_id):
def attach_hint(sender):
@@ -621,7 +621,7 @@ def service_sms_senders(service_id):
@main.route("/services/<service_id>/service-settings/sms-sender/add", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_add_sms_sender(service_id):
form = ServiceSmsSenderForm()
sms_sender_count = len(service_api_client.get_sms_senders(service_id))
@@ -641,7 +641,7 @@ def service_add_sms_sender(service_id):
@main.route("/services/<service_id>/service-settings/sms-sender/<sms_sender_id>/edit", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_edit_sms_sender(service_id, sms_sender_id):
sms_sender = service_api_client.get_sms_sender(service_id, sms_sender_id)
is_inbound_number = sms_sender['inbound_number_id']
@@ -670,7 +670,7 @@ def service_edit_sms_sender(service_id, sms_sender_id):
@main.route("/services/<service_id>/service-settings/set-letter-contact-block", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
@user_has_permissions('manage_service', admin_override=True)
def service_set_letter_contact_block(service_id):
if 'letter' not in current_service['permissions']: