Merge pull request #217 from alphagov/add_send_permission

Add send permission

app/main/views/send.py

@@ -26,15 +26,30 @@ from app.main.uploader import (
 from app.main.dao import templates_dao
 from app.main.dao import services_dao
 from app import job_api_client
-from app.utils import validate_recipient, InvalidPhoneError, InvalidEmailError
+from app.utils import (
+    validate_recipient, InvalidPhoneError, InvalidEmailError, user_has_permissions)
 from utils.process_csv import first_column_heading
 
-page_headings = {
+
+manage_service_page_headings = {
     'email': 'Send emails',
     'sms': 'Send text messages'
 }
 
 
+manage_templates_page_headings = {
+    'email': 'Manage templates',
+    'sms': 'Manage templates'
+}
+
+
+def get_page_headings(template_type):
+    if current_user.has_permissions(['manage_service']):
+        return manage_service_page_headings[template_type]
+    else:
+        return manage_templates_page_headings[template_type]
+
+
 @main.route("/services/<service_id>/send/letters", methods=['GET'])
 def letters_stub(service_id):
     return render_template(
@@ -43,6 +58,8 @@ def letters_stub(service_id):
 
 
 @main.route("/services/<service_id>/send/<template_type>", methods=['GET'])
+@login_required
+@user_has_permissions('send_messages', 'manage_templates', or_=True)
 def choose_template(service_id, template_type):
 
     service = services_dao.get_service_by_id_or_404(service_id)
@@ -66,7 +83,7 @@ def choose_template(service_id, template_type):
             if template['template_type'] == template_type
         ],
         template_type=template_type,
-        page_heading=page_headings[template_type],
+        page_heading=get_page_headings(template_type),
         service=service,
         has_jobs=len(jobs),
         service_id=service_id
@@ -75,6 +92,7 @@ def choose_template(service_id, template_type):
 
 @main.route("/services/<service_id>/send/<int:template_id>", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('send_messages')
 def send_messages(service_id, template_id):
 
     form = CsvUploadForm()
@@ -112,6 +130,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_messages', 'manage_templates', or_=True)
 def get_example_csv(service_id, template_id):
     template = Template(templates_dao.get_service_template_or_404(service_id, template_id)['data'])
     output = io.StringIO()
@@ -131,6 +150,7 @@ def get_example_csv(service_id, template_id):
 
 @main.route("/services/<service_id>/send/<template_id>/to-self", methods=['GET'])
 @login_required
+@user_has_permissions('send_messages')
 def send_message_to_self(service_id, template_id):
     template = Template(templates_dao.get_service_template_or_404(service_id, template_id)['data'])
     output = io.StringIO()
@@ -166,6 +186,7 @@ def send_message_to_self(service_id, template_id):
 @main.route("/services/<service_id>/check/<upload_id>",
             methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('send_messages')
 def check_messages(service_id, upload_id):
 
     upload_data = session['upload_data']
@@ -189,7 +210,7 @@ def check_messages(service_id, upload_id):
             'views/check.html',
             upload_result=upload_result,
             template=template,
-            page_heading=page_headings[template.template_type],
+            page_heading=get_page_headings(template.template_type),
             column_headers=[first_column_heading[template.template_type]] + list(template.placeholders_as_markup),
             original_file_name=upload_data.get('original_file_name'),
             service_id=service_id,

app/main/views/service_settings.py

@@ -3,6 +3,7 @@ from flask import (
 from flask_login import (login_required, current_user)
 
 from app.main import main
+from app.utils import user_has_permissions
 from app.main.dao.services_dao import (
     get_service_by_id, delete_service, update_service)
 from app.main.dao.users_dao import verify_password
@@ -12,6 +13,7 @@ from notifications_python_client.errors import HTTPError
 
 @main.route("/services/<service_id>/service-settings")
 @login_required
+@user_has_permissions('manage_service')
 def service_settings(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -29,6 +31,7 @@ def service_settings(service_id):
 
 @main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_name_change(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -53,6 +56,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_service')
 def service_name_change_confirm(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -82,6 +86,7 @@ def service_name_change_confirm(service_id):
 
 @main.route("/services/<service_id>/service-settings/request-to-go-live", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_request_to_go_live(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -104,6 +109,7 @@ def service_request_to_go_live(service_id):
 
 @main.route("/services/<service_id>/service-settings/status", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_status_change(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -125,6 +131,7 @@ def service_status_change(service_id):
 
 @main.route("/services/<service_id>/service-settings/status/confirm", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_status_change_confirm(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -153,6 +160,7 @@ def service_status_change_confirm(service_id):
 
 @main.route("/services/<service_id>/service-settings/delete", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_delete(service_id):
     try:
         service = get_service_by_id(service_id)['data']
@@ -174,6 +182,7 @@ def service_delete(service_id):
 
 @main.route("/services/<service_id>/service-settings/delete/confirm", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_service')
 def service_delete_confirm(service_id):
     try:
         service = get_service_by_id(service_id)['data']

app/main/views/templates.py

@@ -2,6 +2,7 @@ from flask import request, render_template, redirect, url_for, flash, abort
 from flask_login import login_required
 
 from app.main import main
+from app.utils import user_has_permissions
 from app.main.forms import SMSTemplateForm, EmailTemplateForm
 from app.main.dao import templates_dao as tdao
 from app.main.dao import services_dao as sdao
@@ -15,6 +16,7 @@ form_objects = {
 
 @main.route("/services/<service_id>/templates/add-<template_type>", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_templates')
 def add_service_template(service_id, template_type):
 
     service = sdao.get_service_by_id_or_404(service_id)
@@ -46,6 +48,7 @@ def add_service_template(service_id, template_type):
 
 @main.route("/services/<service_id>/templates/<int:template_id>", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_templates')
 def edit_service_template(service_id, template_id):
     template = tdao.get_service_template_or_404(service_id, template_id)['data']
     template['template_content'] = template['content']
@@ -73,6 +76,7 @@ def edit_service_template(service_id, template_id):
 
 @main.route("/services/<service_id>/templates/<int:template_id>/delete", methods=['GET', 'POST'])
 @login_required
+@user_has_permissions('manage_templates')
 def delete_service_template(service_id, template_id):
     template = tdao.get_service_template_or_404(service_id, template_id)['data']
 

app/notify_client/models.py

@@ -1,4 +1,5 @@
 from flask.ext.login import (UserMixin, login_fresh)
+from flask import session
 
 
 class User(UserMixin):
@@ -81,8 +82,14 @@ class User(UserMixin):
     def permissions(self, permissions):
         raise AttributeError("Read only property")
 
-    def has_permissions(self, service_id, permissions):
-        return True
+    def has_permissions(self, permissions, service_id=None, or_=False):
+        if service_id is None:
+            service_id = session.get('service_id', '')
+        if service_id in self._permissions:
+            if or_:
+                return any([x in self._permissions[service_id] for x in permissions])
+            return set(self._permissions[service_id]) > set(permissions)
+        return False
 
     @property
     def failed_login_count(self):

app/templates/main_nav.html

@@ -2,20 +2,26 @@
   <h2 class="navigation-service-name">
     <a href="{{ url_for('.service_dashboard', service_id=service_id) }}">{{ session.get('service_name', 'Service') }}</a>
   </h2>
-  {% if current_user.has_permissions(session.get('service_id', ''), ['send_messages']) %}
+  {% if current_user.has_permissions(['send_messages']) %}
   <ul>
     <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Send text messages</a></li>
     <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Send emails</a></li>
     <li><a href="{{ url_for('.letters_stub', service_id=service_id) }}">Send letters</a></li>
   </ul>
+  {% elif current_user.has_permissions(['manage_templates']) %}
+  <ul>
+    <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Message templates</a></li>
+    <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Email templates</a></li>
+    <li><a href="{{ url_for('.letters_stub', service_id=service_id) }}">Send letters</a></li>
+  </ul>
   {% endif %}
-  {% if current_user.has_permissions(session.get('service_id', ''), ['manage_service']) %}
+  {% if current_user.has_permissions(['manage_service']) %}
   <ul>
     <li><a href="{{ url_for('.manage_users', service_id=service_id) }}">Manage team</a></li>
     <li><a href="{{ url_for('.service_settings', service_id=service_id) }}">Manage settings</a></li>
   </ul>
   {% endif %}
-  {% if current_user.has_permissions(session.get('service_id', ''), ['manage_api_keys']) %}
+  {% if current_user.has_permissions(['manage_api_keys']) %}
   <ul>
     <li><a href="{{ url_for('.api_keys', service_id=service_id) }}">API keys</a></li>
     <li><a href="{{ url_for('.documentation', service_id=service_id) }}">Developer documentation</a></li>

app/templates/views/choose-template.html

@@ -16,6 +16,7 @@
 
     {% if templates %}
       {% if not has_jobs %}
+        {% if current_user.has_permissions(['manage_service']) %}
         {{ banner(
           """
             Send yourself a test message
@@ -23,6 +24,7 @@
           subhead='Next step',
           type="tip"
         )}}
+        {% endif %}
       {% endif %}
       <div class="grid-row">
         {% for template in templates %}
@@ -39,9 +41,13 @@
           </div>
           <div class="column-one-third">
             <div class="sms-message-use-links">
+              {% if current_user.has_permissions(['manage_service']) %}
               <a href="{{ url_for(".send_messages", service_id=service_id, template_id=template.id) }}">Add recipients</a>
               <a href="{{ url_for(".send_message_to_self", service_id=service_id, template_id=template.id) }}">Send yourself a test</a>
+              {% endif %}
+              {% if current_user.has_permissions(['manage_templates']) %}
               <a href="{{ url_for(".edit_service_template", service_id=service_id, template_id=template.id) }}">Edit template</a>
+              {% endif %}
             </div>
           </div>
         {% endfor %}
@@ -49,7 +55,9 @@
     {% endif %}
 
     <p>
+      {% if current_user.has_permissions(['manage_templates']) %}
       <a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button">Add a new template</a>
+      {% endif %}
     </p>
 
   </form>

app/utils.py

@@ -96,14 +96,12 @@ def validate_recipient(row, template_type):
     }[template_type](get_recipient_from_row(row, template_type))
 
 
-def user_has_permissions(*permissions):
+def user_has_permissions(*permissions, or_=False):
     def wrap(func):
         @wraps(func)
         def wrap_func(*args, **kwargs):
-            # We are making the assumption that the user is logged in.
             from flask_login import current_user
-            service_id = session.get('service_id', '')
-            if current_user and current_user.has_permissions(service_id, permissions):
+            if current_user and current_user.has_permissions(permissions, or_=or_):
                 return func(*args, **kwargs)
             else:
                 abort(403)