Merge with master.

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/manage_users.py

@@ -40,9 +40,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)
@@ -50,6 +49,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))
 
@@ -63,7 +63,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
@@ -73,11 +73,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():
@@ -100,7 +100,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: