Merge branch 'master' into fix-permissions

app/main/views/choose_service.py

@@ -1,13 +1,29 @@
 from flask import (render_template, redirect, url_for, session)
 from flask_login import login_required, current_user
-from app.main.dao import services_dao
+from app.main.dao.services_dao import ServicesBrowsableItem
+from app import service_api_client
 from app.main import main
 
 
 @main.route("/services")
 @login_required
 def choose_service():
-    services = services_dao.get_services(current_user.id)
     return render_template(
         'views/choose-service.html',
-        services=[services_dao.ServicesBrowsableItem(x) for x in services['data']])
+        services=[ServicesBrowsableItem(x) for x in service_api_client.get_services()['data']]
+    )
+
+
+@main.route("/services-or-dashboard")
+def show_all_services_or_dashboard():
+
+    if current_user.is_authenticated():
+
+        services = service_api_client.get_services()['data']
+
+        if 1 == len(services):
+            return redirect(url_for('.service_dashboard', service_id=services[0]['id']))
+        else:
+            return redirect(url_for('.choose_service'))
+
+    return redirect(url_for('main.index'))

app/main/views/send.py

@@ -26,8 +26,10 @@ from app.main.uploader import (
     s3download
 )
 from app.main.dao import templates_dao
-from app.main.dao import services_dao
-from app import job_api_client
+from app import (
+    job_api_client,
+    service_api_client
+)
 from app.utils import user_has_permissions, get_errors_for_csv
 
 
@@ -74,7 +76,7 @@ def get_page_headings(template_type):
                       admin_override=True, or_=True)
 def choose_template(service_id, template_type):
 
-    service = services_dao.get_service_by_id_or_404(service_id)
+    service = service_api_client.get_service(service_id)['data']
 
     if template_type not in ['email', 'sms']:
         abort(404)
@@ -102,6 +104,12 @@ def choose_template(service_id, template_type):
 @user_has_permissions('send_texts', 'send_emails', 'send_letters')
 def send_messages(service_id, template_id):
 
+    service = service_api_client.get_service(service_id)['data']
+    template = Template(
+        templates_dao.get_service_template_or_404(service_id, template_id)['data'],
+        prefix=service['name']
+    )
+
     form = CsvUploadForm()
     if form.validate_on_submit():
         try:
@@ -121,18 +129,13 @@ def send_messages(service_id, template_id):
             }
             return redirect(url_for('.check_messages',
                                     service_id=service_id,
-                                    upload_id=upload_id))
+                                    upload_id=upload_id,
+                                    template_type=template.template_type))
         except ValueError as e:
             flash('There was a problem uploading: {}'.format(form.file.data.filename))
             flash(str(e))
             return redirect(url_for('.send_messages', service_id=service_id, template_id=template_id))
 
-    service = services_dao.get_service_by_id_or_404(service_id)
-    template = Template(
-        templates_dao.get_service_template_or_404(service_id, template_id)['data'],
-        prefix=service['name']
-    )
-
     return render_template(
         'views/send.html',
         template=template,
@@ -188,12 +191,14 @@ def send_message_to_self(service_id, template_id):
         'data': output.getvalue()
     }
     upload_id = str(uuid.uuid4())
+
     s3upload(upload_id, service_id, filedata, current_app.config['AWS_REGION'])
     session['upload_data'] = {"template_id": template_id, "original_file_name": filedata['file_name']}
 
     return redirect(url_for('.check_messages',
                             service_id=service_id,
-                            upload_id=upload_id))
+                            upload_id=upload_id,
+                            template_type=template.template_type))
 
 
 @main.route("/services/<service_id>/send/<template_id>/from-api", methods=['GET'])
@@ -218,12 +223,15 @@ def send_from_api(service_id, template_id):
     )
 
 
-@main.route("/services/<service_id>/check/<upload_id>", methods=['GET'])
+@main.route("/services/<service_id>/<template_type>/check/<upload_id>", methods=['GET'])
 @login_required
 @user_has_permissions('send_texts', 'send_emails', 'send_letters')
-def check_messages(service_id, upload_id):
+def check_messages(service_id, template_type, upload_id):
 
-    service = services_dao.get_service_by_id_or_404(service_id)
+    if not session.get('upload_data'):
+        return redirect(url_for('main.choose_template', service_id=service_id, template_type=template_type))
+
+    service = service_api_client.get_service(service_id)['data']
 
     contents = s3download(service_id, upload_id)
     if not contents:
@@ -270,17 +278,18 @@ def check_messages(service_id, upload_id):
         send_button_text=get_send_button_text(template.template_type, session['upload_data']['notification_count']),
         service_id=service_id,
         service=service,
+        upload_id=upload_id,
         form=CsvUploadForm()
     )
 
 
-@main.route("/services/<service_id>/check/<upload_id>", methods=['POST'])
+@main.route("/services/<service_id>/start-job/<upload_id>", methods=['POST'])
 @login_required
 @user_has_permissions('send_texts', 'send_emails', 'send_letters')
 def start_job(service_id, upload_id):
 
     upload_data = session['upload_data']
-    services_dao.get_service_by_id_or_404(service_id)
+    service = service_api_client.get_service(service_id)['data']
 
     if request.files or not upload_data.get('valid'):
         # The csv was invalid, validate the csv again

app/main/views/sign_in.py

@@ -31,6 +31,9 @@ def sign_in():
     if form.validate_on_submit():
         user = user_api_client.get_user_by_email_or_none(form.email_address.data)
         user = _get_and_verify_user(user, form.password.data)
+        if user and user.state == 'pending':
+            flash("You haven't verified your email or mobile number yet.")
+            return redirect(url_for('main.sign_in'))
         if user:
             # Remember me login
             if not login_fresh() and \
@@ -45,9 +48,7 @@ def sign_in():
                     return redirect(url_for('main.choose_service'))
 
             session['user_details'] = {"email": user.email_address, "id": user.id}
-            if user.state == 'pending':
-                return redirect(url_for('.verify'))
-            elif user.is_active():
+            if user.is_active():
                 user_api_client.send_verify_code(user.id, 'sms', user.mobile_number)
                 if request.args.get('next'):
                     return redirect(url_for('.two_factor', next=request.args.get('next')))

app/main/views/verify.py

@@ -6,7 +6,8 @@ from flask import (
     session,
     url_for,
     current_app,
-    flash
+    flash,
+    abort
 )
 
 from itsdangerous import SignatureExpired
@@ -55,10 +56,17 @@ def verify_email(token):
 
         token_data = json.loads(token_data)
         verified = user_api_client.check_verify_code(token_data['user_id'], token_data['secret_code'], 'email')
+        user = user_api_client.get_user(token_data['user_id'])
+        if not user:
+            abort(404)
+
+        if user.is_active():
+            flash("That verification link has expired.")
+            return redirect(url_for('main.sign_in'))
+
+        session['user_details'] = {"email": user.email_address, "id": user.id}
         if verified[0]:
-            user = user_api_client.get_user(token_data['user_id'])
             user_api_client.send_verify_code(user.id, 'sms', user.mobile_number)
-            session['user_details'] = {"email": user.email_address, "id": user.id}
             return redirect('verify')
         else:
             if verified[1] == 'Code has expired':

app/templates/admin_template.html

@@ -59,12 +59,7 @@
 
 {% set global_header_text = "GOV.UK Notify" %}
 
-
-{% if not current_user.is_authenticated() %}
-    {% set homepage_url = url_for('main.index') %}
-{% else %}
-    {% set homepage_url = url_for('main.choose_service') %}
-{% endif %}
+{% set homepage_url = url_for('main.show_all_services_or_dashboard') %}
 
 {% block content %}
   <div id="content">

app/templates/views/check.html

@@ -64,7 +64,7 @@
   {% if errors %}
     {{file_upload(form.file, button_text='Re-upload your file')}}
   {% else %}
-    <form method="post" enctype="multipart/form-data">
+    <form method="post" enctype="multipart/form-data" action="{{url_for('main.start_job', service_id=service_id, upload_id=upload_id)}}">
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
       <input type="submit" class="button" value="{{ send_button_text }}" />
       <a href="{{url_for('.send_messages', service_id=service_id, template_id=template.id)}}" class="page-footer-back-link">Back</a>