Merge with master.

app/__init__.py

@@ -13,7 +13,7 @@ from pygments.lexers import JavascriptLexer
 from pygments.formatters import HtmlFormatter
 from werkzeug.exceptions import abort
 
-from app.notify_client.api_client import NotificationsAdminAPIClient
+from app.notify_client.api_client import ServiceAPIClient
 from app.notify_client.api_key_api_client import ApiKeyApiClient
 from app.notify_client.user_api_client import UserApiClient
 from app.notify_client.job_api_client import JobApiClient
@@ -25,12 +25,13 @@ from app.its_dangerous_session import ItsdangerousSessionInterface
 from app.asset_fingerprinter import AssetFingerprinter
 from utils.recipients import validate_phone_number, InvalidPhoneError
 import app.proxy_fix
+from config import configs
 from utils import logging
 
 login_manager = LoginManager()
 csrf = CsrfProtect()
 
-notifications_api_client = NotificationsAdminAPIClient()
+service_api_client = ServiceAPIClient()
 user_api_client = UserApiClient()
 api_key_api_client = ApiKeyApiClient()
 job_api_client = JobApiClient()
@@ -50,7 +51,7 @@ def create_app():
     logging.init_app(application)
     init_csrf(application)
 
-    notifications_api_client.init_app(application)
+    service_api_client.init_app(application)
     user_api_client.init_app(application)
     api_key_api_client.init_app(application)
     job_api_client.init_app(application)

app/main/__init__.py

@@ -22,5 +22,6 @@ from app.main.views import (
     choose_service,
     api_keys,
     manage_users,
-    invites
+    invites,
+    all_services
 )

app/main/dao/services_dao.py

@@ -1,10 +1,10 @@
 from flask import url_for, current_app
-from app import notifications_api_client
+from app import service_api_client
 from app.utils import BrowsableItem
 
 
 def update_service(service):
-    return notifications_api_client.update_service(
+    return service_api_client.update_service(
         service['id'],
         service['name'],
         service['active'],
@@ -14,24 +14,24 @@ def update_service(service):
 
 
 def get_service_by_id(id_):
-    return notifications_api_client.get_service(id_)
+    return service_api_client.get_service(id_)
 
 
 def get_service_by_id_or_404(id_):
-    return notifications_api_client.get_service(id_)['data']
+    return service_api_client.get_service(id_)['data']
 
 
 def get_services(user_id=None):
     if user_id:
-        return notifications_api_client.get_services({'user_id': str(user_id)})
+        return service_api_client.get_services({'user_id': str(user_id)})
     else:
-        return notifications_api_client.get_services()
+        return service_api_client.get_services()
 
 
 def unrestrict_service(service_id):
-    resp = notifications_api_client.get_service(service_id)
+    resp = service_api_client.get_service(service_id)
     if resp['data']['restricted']:
-        resp = notifications_api_client.update_service(
+        resp = service_api_client.update_service(
             service_id,
             resp['data']['name'],
             resp['data']['active'],
@@ -41,9 +41,9 @@ def unrestrict_service(service_id):
 
 
 def activate_service(service_id):
-    resp = notifications_api_client.get_service(service_id)
+    resp = service_api_client.get_service(service_id)
     if not resp['data']['active']:
-        resp = notifications_api_client.update_service(
+        resp = service_api_client.update_service(
             service_id,
             resp['data']['name'],
             True,
@@ -54,7 +54,7 @@ def activate_service(service_id):
 
 # TODO Fix when functionality is added to the api.
 def find_service_by_service_name(service_name, user_id=None):
-    resp = notifications_api_client.get_services(user_id)
+    resp = service_api_client.get_services(user_id)
     retval = None
     for srv_json in resp['data']:
         if srv_json['name'] == service_name:
@@ -64,11 +64,11 @@ def find_service_by_service_name(service_name, user_id=None):
 
 
 def delete_service(id_):
-    return notifications_api_client.delete_service(id_)
+    return service_api_client.delete_service(id_)
 
 
 def find_all_service_names(user_id=None):
-    resp = notifications_api_client.get_services(user_id)
+    resp = service_api_client.get_services(user_id)
     return [x['name'] for x in resp['data']]
 
 

app/main/dao/templates_dao.py

@@ -1,28 +1,28 @@
 from flask import url_for
-from app import notifications_api_client
+from app import service_api_client
 from app.utils import BrowsableItem
 
 
 def insert_service_template(name, type_, content, service_id, subject=None):
-    return notifications_api_client.create_service_template(
+    return service_api_client.create_service_template(
         name, type_, content, service_id, subject)
 
 
 def update_service_template(id_, name, type_, content, service_id, subject=None):
-    return notifications_api_client.update_service_template(
+    return service_api_client.update_service_template(
         id_, name, type_, content, service_id)
 
 
 def get_service_templates(service_id):
-    return notifications_api_client.get_service_templates(service_id)
+    return service_api_client.get_service_templates(service_id)
 
 
 def get_service_template_or_404(service_id, template_id):
-    return notifications_api_client.get_service_template(service_id, template_id)
+    return service_api_client.get_service_template(service_id, template_id)
 
 
 def delete_service_template(service_id, template_id):
-    return notifications_api_client.delete_service_template(
+    return service_api_client.delete_service_template(
         service_id, template_id)
 
 

app/main/views/add_service.py

@@ -15,7 +15,7 @@ from app.notify_client.models import InvitedUser
 from app import (
     invite_api_client,
     user_api_client,
-    notifications_api_client
+    service_api_client
 )
 
 
@@ -36,7 +36,7 @@ def add_service():
     heading = 'Which service do you want to set up notifications for?'
     if form.validate_on_submit():
         session['service_name'] = form.name.data
-        service_id = notifications_api_client.create_service(
+        service_id = service_api_client.create_service(
             session['service_name'], False, current_app.config['DEFAULT_SERVICE_LIMIT'], True, session['user_id'])
 
         return redirect(url_for('main.service_dashboard', service_id=service_id))

app/main/views/all_services.py

@@ -0,0 +1,15 @@
+from flask import render_template
+from flask_login import login_required
+
+from app import service_api_client
+from app.main import main
+from app.main.dao import services_dao
+from app.utils import user_has_permissions
+
+
+@main.route("/all-services")
+@login_required
+@user_has_permissions(None, admin_override=True)
+def show_all_services():
+    services = [services_dao.ServicesBrowsableItem(x) for x in service_api_client.get_services()['data']]
+    return render_template('views/all-services.html', services=services)

app/main/views/code_not_received.py

@@ -41,4 +41,7 @@ def check_and_resend_verification_code():
     # TODO there needs to be a way to generate a new session id
     user = user_api_client.get_user_by_email(session['user_details']['email'])
     user_api_client.send_verify_code(user.id, 'sms', user.mobile_number)
-    return redirect(url_for('main.two_factor'))
+    if user.state == 'pending':
+        return redirect(url_for('main.verify'))
+    else:
+        return redirect(url_for('main.two_factor'))

app/main/views/manage_users.py

@@ -24,7 +24,7 @@ from app.utils import user_has_permissions
 
 @main.route("/services/<service_id>/users")
 @login_required
-@user_has_permissions('manage_users', 'manage_templates', 'manage_settings')
+@user_has_permissions('manage_users', admin_override=True)
 def manage_users(service_id):
     users = user_api_client.get_users_for_service(service_id=service_id)
     invited_users = invite_api_client.get_invites_for_service(service_id=service_id)
@@ -41,9 +41,8 @@ def manage_users(service_id):
 
 @main.route("/services/<service_id>/users/invite", methods=['GET', 'POST'])
 @login_required
-@user_has_permissions('manage_users', 'manage_templates', 'manage_settings')
+@user_has_permissions('manage_users', admin_override=True)
 def invite_user(service_id):
-
     service = get_service_by_id(service_id)
 
     form = InviteUserForm(current_user.email_address)
@@ -51,6 +50,7 @@ def invite_user(service_id):
         email_address = form.email_address.data
         permissions = _get_permissions(request.form)
         invited_user = invite_api_client.create_invite(current_user.id, service_id, email_address, permissions)
+
         flash('Invite sent to {}'.format(invited_user.email_address), 'default_with_tick')
         return redirect(url_for('.manage_users', service_id=service_id))
 
@@ -64,7 +64,7 @@ def invite_user(service_id):
 
 @main.route("/services/<service_id>/users/<user_id>", methods=['GET', 'POST'])
 @login_required
-@user_has_permissions('manage_users', 'manage_templates', 'manage_settings')
+@user_has_permissions('manage_users', admin_override=True)
 def edit_user_permissions(service_id, user_id):
     # TODO we should probably using the service id here in the get user
     # call as well. eg. /user/<user_id>?&service_id=service_id
@@ -74,11 +74,11 @@ def edit_user_permissions(service_id, user_id):
     # Do it through the template or the form class?
     form = PermisisonsForm(**{
         'send_messages': 'yes' if user.has_permissions(
-            ['send_texts', 'send_emails', 'send_letters']) else 'no',
+            permissions=['send_texts', 'send_emails', 'send_letters']) else 'no',
         'manage_service': 'yes' if user.has_permissions(
-            ['manage_users', 'manage_templates', 'manage_settings']) else 'no',
+            permissions=['manage_users', 'manage_templates', 'manage_settings']) else 'no',
         'manage_api_keys': 'yes' if user.has_permissions(
-            ['manage_api_keys', 'access_developer_docs']) else 'no'
+            permissions=['manage_api_keys', 'access_developer_docs']) else 'no'
         })
 
     if form.validate_on_submit():
@@ -101,7 +101,7 @@ def edit_user_permissions(service_id, user_id):
 
 
 @main.route("/services/<service_id>/cancel-invited-user/<invited_user_id>", methods=['GET'])
-@user_has_permissions('manage_users', 'manage_templates', 'manage_settings')
+@user_has_permissions('manage_users', 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)
 

app/main/views/send.py

@@ -66,7 +66,8 @@ def get_page_headings(template_type):
 
 @main.route("/services/<service_id>/send/<template_type>", methods=['GET'])
 @login_required
-@user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', 'manage_api_keys', or_=True)
+@user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', 'manage_api_keys',
+                      admin_override=True, or_=True)
 def choose_template(service_id, template_type):
 
     service = services_dao.get_service_by_id_or_404(service_id)

app/main/views/service_settings.py

@@ -3,7 +3,6 @@ from flask import (
     redirect,
     request,
     url_for,
-    abort,
     session,
     flash
 )
@@ -29,7 +28,7 @@ from app.main.forms import ConfirmPasswordForm, ServiceNameForm
 
 @main.route("/services/<service_id>/service-settings")
 @login_required
-@user_has_permissions('manage_settings')
+@user_has_permissions('manage_settings', admin_override=True)
 def service_settings(service_id):
     service = get_service_by_id(service_id)['data']
 
@@ -42,7 +41,7 @@ def service_settings(service_id):
 
 @main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])
 @login_required
-@user_has_permissions('manage_settings')
+@user_has_permissions('manage_settings', admin_override=True)
 def service_name_change(service_id):
     service = get_service_by_id(service_id)['data']
 
@@ -61,7 +60,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')
+@user_has_permissions('manage_settings', admin_override=True)
 def service_name_change_confirm(service_id):
     service = get_service_by_id(service_id)['data']
 
@@ -95,7 +94,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_settings')
+@user_has_permissions('manage_settings', admin_override=True)
 def service_request_to_go_live(service_id):
     service = get_service_by_id(service_id)['data']
     if request.method == 'GET':
@@ -112,7 +111,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_settings')
+@user_has_permissions('manage_settings', admin_override=True)
 def service_status_change(service_id):
     service = get_service_by_id(service_id)['data']
 
@@ -128,7 +127,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_settings')
+@user_has_permissions('manage_settings', admin_override=True)
 def service_status_change_confirm(service_id):
     service = get_service_by_id(service_id)['data']
 
@@ -151,7 +150,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_settings')
+@user_has_permissions('manage_settings', admin_override=True)
 def service_delete(service_id):
     service = get_service_by_id(service_id)['data']
 
@@ -167,7 +166,7 @@ def service_delete(service_id):
 
 @main.route("/services/<service_id>/service-settings/delete/confirm", methods=['GET', 'POST'])
 @login_required
-@user_has_permissions('manage_settings')
+@user_has_permissions('manage_settings', admin_override=True)
 def service_delete_confirm(service_id):
     service = get_service_by_id(service_id)['data']
 

app/main/views/templates.py

@@ -21,7 +21,7 @@ page_headings = {
 
 @main.route("/services/<service_id>/templates/add-<template_type>", methods=['GET', 'POST'])
 @login_required
-@user_has_permissions('manage_templates')
+@user_has_permissions('manage_templates', admin_override=True)
 def add_service_template(service_id, template_type):
 
     service = sdao.get_service_by_id_or_404(service_id)
@@ -54,7 +54,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')
+@user_has_permissions('manage_templates', admin_override=True)
 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']
@@ -83,7 +83,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')
+@user_has_permissions('manage_templates', admin_override=True)
 def delete_service_template(service_id, template_id):
     template = tdao.get_service_template_or_404(service_id, template_id)['data']
 

app/main/views/two_factor.py

@@ -7,8 +7,7 @@ from flask import (
     request
 )
 
-from flask_login import login_user
-
+from flask_login import login_user, current_user
 from app.main import main
 from app.main.dao import users_dao, services_dao
 from app.main.forms import TwoFactorForm
@@ -43,6 +42,8 @@ def two_factor():
         if next_url and _is_safe_redirect_url(next_url):
             return redirect(next_url)
 
+        if current_user.platform_admin:
+            return redirect(url_for('main.show_all_services'))
         if len(services) == 1:
             return redirect(url_for('main.service_dashboard', service_id=services[0]['id']))
         else:

app/notify_client/api_client.py

@@ -2,14 +2,14 @@ from __future__ import unicode_literals
 from notifications_python_client.notifications import NotificationsAPIClient
 
 
-class NotificationsAdminAPIClient(NotificationsAPIClient):
+class ServiceAPIClient(NotificationsAPIClient):
 
     # Fudge assert in the super __init__ so
     # we can set those variables later.
     def __init__(self):
-        super(NotificationsAdminAPIClient, self).__init__("api_url",
-                                                          "client",
-                                                          "secret")
+        super(ServiceAPIClient, self).__init__("api_url",
+                                               "client",
+                                               "secret")
 
     def init_app(self, application):
         self.base_url = application.config['API_HOST_NAME']
@@ -128,21 +128,3 @@ class NotificationsAdminAPIClient(NotificationsAPIClient):
         """
         endpoint = "/service/{0}/template/{1}".format(service_id, template_id)
         return self.delete(endpoint)
-
-    # The implementation of these will change after the notifications-api
-    # functionality updates to include the ability to send notifications.
-    def send_sms(self,
-                 mobile_number,
-                 message,
-                 job_id=None,
-                 description=None):
-        self.send_sms_notification(mobile_number, message)
-
-    def send_email(self,
-                   email_address,
-                   message,
-                   from_address,
-                   subject,
-                   job_id=None,
-                   description=None):
-        self.send_email_notification(email_address, message, from_address, subject)

app/notify_client/models.py

@@ -1,5 +1,4 @@
 from flask.ext.login import (UserMixin, login_fresh)
-from flask import session
 
 
 class User(UserMixin):
@@ -13,6 +12,7 @@ class User(UserMixin):
         self._failed_login_count = fields.get('failed_login_count')
         self._state = fields.get('state')
         self.max_failed_login_count = max_failed_login_count
+        self.platform_admin = fields.get('platform_admin')
 
     def get_id(self):
         return self.id
@@ -82,9 +82,18 @@ class User(UserMixin):
     def permissions(self, permissions):
         raise AttributeError("Read only property")
 
-    def has_permissions(self, permissions, service_id=None, or_=False):
-        if service_id is None:
-            service_id = session.get('service_id', '')
+    def has_permissions(self, permissions=[], or_=False, admin_override=False):
+        # Only available to the platform admin user
+        if admin_override and self.platform_admin:
+            return True
+        # Not available to the non platform admin users.
+        # For example the list all-services page is only available to platform admin users and is not service specific
+        if admin_override and not permissions:
+            return False
+
+        from flask import request
+        # Service id is always set on the request for service specific views.
+        service_id = request.view_args.get('service_id', None)
         if service_id in self._permissions:
             if or_:
                 return any([x in self._permissions[service_id] for x in permissions])

app/templates/main_nav.html

@@ -7,13 +7,13 @@
     <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>
   </ul>
-  {% elif current_user.has_permissions(['manage_templates', 'manage_api_keys'], or_=True) %}
+  {% elif current_user.has_permissions(['manage_templates','manage_api_keys'], admin_override=True, or_=True) %}
   <ul>
     <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Text message templates</a></li>
     <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Email templates</a></li>
   </ul>
   {% endif %}
-  {% if current_user.has_permissions(['manage_users', 'manage_settings']) %}
+  {% if current_user.has_permissions(['manage_users', 'manage_settings'], admin_override=True) %}
   <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>
@@ -24,8 +24,14 @@
     <li><a href="{{ url_for('.api_keys', service_id=service_id) }}">API keys</a></li>
   </ul>
   {% endif %}
+
   <ul>
     <li><a href="{{ url_for('.view_notifications', service_id=service_id) }}">Notification history</a></li>
     <li><a href="{{ url_for('.view_jobs', service_id=service_id) }}">Job history</a><li>
   </ul>
+  {% if current_user.has_permissions(admin_override=True) %}
+    <ul>
+      <li><a href="{{ url_for('.show_all_services') }}"> List all services </a></li>
+    </ul>
+  {% endif %}
 </nav>

app/templates/views/all-services.html

@@ -0,0 +1,16 @@
+{% extends "withoutnav_template.html" %}
+{% from "components/browse-list.html" import browse_list %}
+
+{% block page_title %}
+  All service – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  <h1 class="heading-large">
+    All services
+  </h1>
+
+  {{ browse_list(services) }}
+
+{% endblock %}

app/templates/views/choose-service.html

@@ -10,6 +10,14 @@
   <h1 class="heading-large">
     Choose service
   </h1>
+  {% if current_user.has_permissions(admin_override=True) %}
+    {{ browse_list([
+      {
+          'title': 'List all services',
+          'link': url_for('.show_all_services')
+      }
+      ]) }}
+  {% endif %}
 
   {{ browse_list(services) }}
   {{ browse_list([
@@ -19,4 +27,5 @@
     },
   ]) }}
 
+
 {% endblock %}

app/templates/views/choose-template.html

@@ -14,7 +14,7 @@
 
     <h1 class="heading-large">{{ page_heading }}</h1>
 
-    {% if current_user.has_permissions(['manage_templates']) %}
+    {% if current_user.has_permissions(permissions=['manage_templates'], admin_override=True) %}
       <a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button">Add a new template</a>
     {% else %}
       <p>You need to ask your service manager to add templates before you can send messages</p>
@@ -26,7 +26,7 @@
       <div class="column-two-thirds">
         <h1 class="heading-large">{{ page_heading }}</h1>
       </div>
-      {% if current_user.has_permissions(['manage_templates']) %}
+      {% if current_user.has_permissions(permissions=['manage_templates'], admin_override=True) %}
         <div class="column-one-third">
           <a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button align-with-heading">Add new template</a>
         </div>
@@ -34,7 +34,7 @@
     </div>
 
     {% if not has_jobs %}
-      {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters'], or_=True) %}
+      {% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters'], or_=True) %}
       {{ banner(
         """
           Send yourself a test
@@ -54,7 +54,7 @@
               name=template.name,
               edit_link=(
                 url_for(".edit_service_template", service_id=service_id, template_id=template.id)
-                if current_user.has_permissions(['manage_templates']) else
+                if current_user.has_permissions(permissions=['manage_templates'], admin_override=True) else
                 None
               )
             ) }}
@@ -64,7 +64,7 @@
                 name=template.name,
                 edit_link=(
                   url_for(".edit_service_template", service_id=service_id, template_id=template.id)
-                  if current_user.has_permissions(['manage_templates']) else
+                  if current_user.has_permissions(permissions=['manage_templates'], admin_override=True) else
                   None
                 )
               ) }}
@@ -72,11 +72,11 @@
         </div>
         <div class="column-one-third">
           <div class="sms-message-use-links">
-            {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
+            {% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters']) %}
               <a href="{{ url_for(".send_messages", service_id=service_id, template_id=template.id) }}">Send a batch</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_api_keys', 'access_developer_docs']) %}
+            {% if current_user.has_permissions(permissions=['manage_api_keys', 'access_developer_docs']) %}
               <a href="{{ url_for(".send_from_api", service_id=service_id, template_id=template.id) }}">API integration</a>
             {% endif %}
           </div>

app/templates/views/manage-users.html

@@ -33,9 +33,9 @@ Manage users – GOV.UK Notify
     {% call field() %}
       {{ item.name }}
     {% endcall %}
-    {{ boolean_field(item.has_permissions(['send_texts', 'send_emails', 'send_letters'], service_id=service_id)) }}
-    {{ boolean_field(item.has_permissions(['manage_users', 'manage_templates', 'manage_settings'], service_id=service_id)) }}
-    {{ boolean_field(item.has_permissions(['manage_api_keys', 'access_developer_docs'], service_id=service_id)) }}
+    {{ boolean_field(item.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters'])) }}
+    {{ boolean_field(item.has_permissions(permissions=['manage_users', 'manage_templates', 'manage_settings'])) }}
+    {{ boolean_field(item.has_permissions(permissions=['manage_api_keys', 'access_developer_docs'])) }}
     {% call field(align='right') %}
       {% if current_user.id != item.id %}
         <a href="{{ url_for('.edit_user_permissions', service_id=service_id, user_id=item.id)}}">Edit permission</a>
@@ -50,9 +50,9 @@ Manage users – GOV.UK Notify
       {% call field() %}
         {{ item.email_address }}
       {% endcall %}
-      {{ boolean_field(item.has_permissions(['send_texts', 'send_emails', 'send_letters'])) }}
-      {{ boolean_field(item.has_permissions(['manage_users', 'manage_templates', 'manage_settings'])) }}
-      {{ boolean_field(item.has_permissions(['manage_api_keys', 'access_developer_docs'])) }}
+      {{ boolean_field(item.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters'])) }}
+      {{ boolean_field(item.has_permissions(permissions=['manage_users', 'manage_templates', 'manage_settings'])) }}
+      {{ boolean_field(item.has_permissions(permissions=['manage_api_keys', 'access_developer_docs'])) }}
       {% if item.status == 'pending' %}
         {% call field(align='right') %}
           <a href="{{ url_for('.cancel_invited_user', service_id=service_id, invited_user_id=item.id)}}">Cancel invitation</a>

app/templates/views/service_dashboard.html

@@ -25,15 +25,15 @@
     </ul>
 
     {% if not template_count and not jobs %}
-      {% if current_user.has_permissions(['manage_templates', 'send_texts', 'send_emails', 'send_letters'], or_=True) %}
+      {% if current_user.has_permissions(['manage_templates', 'send_texts', 'send_emails', 'send_letters'], or_=True, admin_override=True) %}
         {% call banner_wrapper(subhead='Get started', type="tip") %}
           <ol>
-            {% if current_user.has_permissions(['manage_templates']) %}
+            {% if current_user.has_permissions(['manage_templates'], admin_override=True) %}
               <li>
                 <a href='{{ url_for(".add_service_template", service_id=service_id, template_type="sms") }}'>Add a template</a>
               </li>
             {% endif %}
-            {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
+            {% if current_user.has_permissions(['send_texts']) %}
               <li>
                 <a href='{{ url_for(".choose_template", service_id=service_id, template_type="sms") }}'>Send yourself a text message</a>
               </li>
@@ -43,7 +43,7 @@
       {% endif %}
     {% elif not jobs %}
       {% call banner_wrapper(subhead='Next step', type="tip") %}
-        {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
+        {% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters']) %}
           <a href='{{ url_for(".choose_template", service_id=service_id, template_type="sms") }}'>Send yourself a text message</a>
         {% endif %}
       {% endcall %}
@@ -65,7 +65,7 @@
         {% endcall %}
       {% endcall %}
       {% if more_jobs_to_show %}
-        {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
+        {% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters']) %}
           <p class="table-show-more-link">
             <a href="{{ url_for('.view_notifications', service_id=service_id) }}">See all sent text messages</a>
           </p>

app/templates/views/verification-not-received.html

@@ -16,7 +16,7 @@
 
 
       <p>
-      <a class="button" href="send-new-code" role="button">Resend verification code</a>
+      <a class="button" href="{{url_for('main.check_and_resend_verification_code')}}" role="button">Resend verification code</a>
       </p>
   </div>
 </div>

app/utils.py

@@ -30,12 +30,13 @@ class BrowsableItem(object):
         pass
 
 
-def user_has_permissions(*permissions, or_=False):
+def user_has_permissions(*permissions, admin_override=False, or_=False):
     def wrap(func):
         @wraps(func)
         def wrap_func(*args, **kwargs):
             from flask_login import current_user
-            if current_user and current_user.has_permissions(permissions, or_=or_):
+            if current_user and current_user.has_permissions(permissions=permissions,
+                                                             admin_override=admin_override, or_=or_):
                 return func(*args, **kwargs)
             else:
                 abort(403)