Merge branch 'master' into forgot-password

Conflicts:
	app/main/views/two_factor.py

app/main/forms.py

@@ -104,7 +104,7 @@ class RegisterUserFromInviteForm(Form):
     mobile_number = mobile_number()
     password = password()
     service = HiddenField('service')
-    email_address = HiddenField('email_address')
+    email_address = email_address()
 
 
 class InviteUserForm(Form):
@@ -127,7 +127,6 @@ class TwoFactorForm(Form):
         super(TwoFactorForm, self).__init__(*args, **kwargs)
 
     sms_code = sms_code()
-    remember_me = BooleanField("Remember me")
 
     def validate_sms_code(self, field):
         is_valid, reason = self.validate_code_func(field.data)

app/main/views/add_service.py

@@ -12,7 +12,10 @@ from app.main.dao import services_dao, users_dao
 from app.main.forms import AddServiceForm
 from app.notify_client.models import InvitedUser
 
-from app import user_api_client
+from app import (
+    invite_api_client,
+    user_api_client
+)
 
 
 @main.route("/add-service", methods=['GET', 'POST'])
@@ -25,8 +28,8 @@ def add_service():
         # if invited user add to service and redirect to dashboard
         user = users_dao.get_user_by_id(session['user_id'])
         service_id = invited_user['service']
-        user_api_client.add_user_to_service(service_id, user.id, invitation)
-        session.pop('invited_user', None)
+        user_api_client.add_user_to_service(service_id, user.id, invitation.permissions)
+        invite_api_client.accept_invite(service_id, invitation.id)
         return redirect(url_for('main.service_dashboard', service_id=service_id))
 
     form = AddServiceForm(services_dao.find_all_service_names)

app/main/views/dashboard.py

@@ -1,4 +1,10 @@
-from flask import (abort, render_template, session)
+from flask import (
+    abort,
+    render_template,
+    session,
+    flash
+)
+
 from flask_login import login_required
 from app.main import main
 from app.main.dao.services_dao import get_service_by_id
@@ -6,8 +12,6 @@ from app.main.dao import templates_dao
 from notifications_python_client.errors import HTTPError
 from app import job_api_client
 
-from app.utils import user_has_permissions
-
 
 @main.route("/services/<service_id>/dashboard")
 @login_required
@@ -24,6 +28,12 @@ def service_dashboard(service_id):
         service = get_service_by_id(service_id)
         session['service_name'] = service['data']['name']
         session['service_id'] = service['data']['id']
+
+        if session.get('invited_user'):
+            session.pop('invited_user', None)
+            service_name = service['data']['name']
+            message = 'You have sucessfully accepted your invitation and been added to {}'.format(service_name)
+            flash(message, 'default_with_tick')
     except HTTPError as e:
         if e.status_code == 404:
             abort(404)

app/main/views/invites.py

@@ -1,10 +1,15 @@
 from flask import (
     redirect,
     url_for,
-    session
+    session,
+    abort,
+    render_template
 )
 
+from notifications_python_client.errors import HTTPError
+
 from app.main import main
+from app.main.dao.services_dao import get_service_by_id_or_404
 from app import (
     invite_api_client,
     user_api_client
@@ -14,14 +19,30 @@ from app import (
 @main.route("/invitation/<token>")
 def accept_invite(token):
 
-    invited_user = invite_api_client.accept_invite(token)
-    existing_user = user_api_client.get_user_by_email(invited_user.email_address)
+    try:
 
-    if existing_user:
-        user_api_client.add_user_to_service(invited_user.service,
-                                            existing_user.id,
-                                            invited_user)
-        return redirect(url_for('main.service_dashboard', service_id=invited_user.service))
-    else:
+        invited_user = invite_api_client.check_token(token)
+        if invited_user.status == 'cancelled':
+            from_user = user_api_client.get_user(invited_user.from_user)
+            service = get_service_by_id_or_404(invited_user.service)
+            return render_template('views/cancelled-invitation.html',
+                                   from_user=from_user.name,
+                                   service_name=service['name'])
+
+        existing_user = user_api_client.get_user_by_email(invited_user.email_address)
         session['invited_user'] = invited_user.serialize()
-        return redirect(url_for('main.register_from_invite'))
+
+        if existing_user:
+            user_api_client.add_user_to_service(invited_user.service,
+                                                existing_user.id,
+                                                invited_user.permissions)
+            invite_api_client.accept_invite(invited_user.service, invited_user.id)
+            return redirect(url_for('main.service_dashboard', service_id=invited_user.service))
+        else:
+            return redirect(url_for('main.register_from_invite'))
+
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e

app/main/views/manage_users.py

@@ -28,11 +28,15 @@ from app.utils import user_has_permissions
 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)
+    filtered_invites = []
+    for invite in invited_users:
+        if invite.status != 'accepted':
+            filtered_invites.append(invite)
     return render_template('views/manage-users.html',
                            service_id=service_id,
                            users=users,
                            current_user=current_user,
-                           invited_users=invited_users)
+                           invited_users=filtered_invites)
 
 
 @main.route("/services/<service_id>/users/invite", methods=['GET', 'POST'])

app/main/views/two_factor.py

@@ -1,6 +1,10 @@
 
 from flask import (
-    render_template, redirect, session, url_for)
+    render_template,
+    redirect,
+    session,
+    url_for
+)
 
 from flask_login import login_user
 
@@ -30,7 +34,7 @@ def two_factor():
             if 'password' in session['user_details']:
                 user.set_password(session['user_details']['password'])
                 users_dao.update_user(user)
-            login_user(user, remember=form.remember_me.data if form.remember_me.data else False)
+            login_user(user, remember=True)
         finally:
             del session['user_details']
         if len(services) == 1:

app/notify_client/api_client.py

@@ -68,7 +68,7 @@ class NotificationsAdminAPIClient(NotificationsAPIClient):
             "users": users
         }
         endpoint = "/service/{0}".format(service_id)
-        return self.put(endpoint, data)
+        return self.post(endpoint, data)
 
     def create_service_template(self, name, type_, content, service_id, subject=None):
         """

app/notify_client/invite_api_client.py

@@ -31,7 +31,7 @@ class InviteApiClient(BaseAPIClient):
         invited_users = self._get_invited_users(invites)
         return invited_users
 
-    def accept_invite(self, token):
+    def check_token(self, token):
         resp = self.get(url='/invite/{}'.format(token))
         return InvitedUser(**resp['data'])
 
@@ -40,6 +40,11 @@ class InviteApiClient(BaseAPIClient):
         self.post(url='/service/{0}/invite/{1}'.format(service_id, invited_user_id),
                   data=data)
 
+    def accept_invite(self, service_id, invited_user_id):
+        data = {'status': 'accepted'}
+        self.post(url='/service/{0}/invite/{1}'.format(service_id, invited_user_id),
+                  data=data)
+
     def _get_invited_users(self, invites):
         invited_users = []
         for invite in invites:

app/notify_client/user_api_client.py

@@ -94,9 +94,9 @@ class UserApiClient(BaseAPIClient):
         resp = self.get(endpoint)
         return [User(data) for data in resp['data']]
 
-    def add_user_to_service(self, service_id, user_id, invited_user):
+    def add_user_to_service(self, service_id, user_id, permissions):
         endpoint = '/service/{}/users/{}'.format(service_id, user_id)
-        resp = self.post(endpoint, data=invited_user.serialize(permissions_as_string=True))
+        resp = self.post(endpoint, data={'permissions': permissions})
         return User(resp['data'], max_failed_login_count=self.max_failed_login_count)
 
     def set_user_permissions(self, user_id, service_id, permissions):

app/templates/components/textbox.html

@@ -6,7 +6,8 @@
   help_link=None,
   help_link_text=None,
   width='2-3',
-  suffix=None
+  suffix=None,
+  disabled=False
 ) %}
   <div class="form-group{% if field.errors %} error{% endif %}" {% if autofocus %}data-module="autofocus"{% endif %}>
     <label class="form-label" for="{{ field.name }}">
@@ -22,10 +23,21 @@
         </span>
       {% endif %}
     </label>
-    {{ field(**{
-      'class': 'form-control form-control-{} textbox-highlight-textbox'.format(width) if highlight_tags else 'form-control form-control-{} {}'.format(width, 'textbox-right-aligned' if suffix else ''),
-      'data-module': 'highlight-tags' if highlight_tags else ''
-    }) }}
+      {% if disabled %}
+        <p>{{ field(**{
+          'class': 'form-control form-control-{} textbox-highlight-textbox'.format(width) if highlight_tags else 'form-control form-control-{} {}'.format(width, 'textbox-right-aligned' if suffix else ''),
+          'data-module': 'highlight-tags' if highlight_tags else '',
+          'disabled': 'disabled'
+        }) }}
+      </p>
+      {% else %}
+        {{ field(**{
+          'class': 'form-control form-control-{} textbox-highlight-textbox'.format(width) if highlight_tags else 'form-control form-control-{} {}'.format(width, 'textbox-right-aligned' if suffix else ''),
+          'data-module': 'highlight-tags' if highlight_tags else ''
+        }) }}
+      {% endif %}
+
+
     {% if suffix %}
       <span>{{ suffix }}</span>
     {% endif %}

app/templates/views/cancelled-invitation.html

@@ -0,0 +1,17 @@
+{% extends "withoutnav_template.html" %}
+{% block page_title %}Invitation has been cancelled{% endblock %}
+{% block maincolumn_content %}
+    <div class="grid-row">
+      <div class="column-two-thirds">
+        <h1 class="heading-large">
+          The invitation you were sent has been cancelled
+        </h1>
+        <p>
+          {{ from_user }} decided to cancel this invitation.
+        </p>
+        <p>
+          If you need access to {{ service_name }}, you’ll have to ask them to invite you again.
+        </p>
+      </div>
+    </div>
+{% endblock %}

app/templates/views/register-from-invite.html

@@ -12,12 +12,12 @@ Create an account – GOV.UK Notify
   <div class="column-two-thirds">
     <h1 class="heading-large">Create an account</h1>
     <form method="post" autocomplete="nope">
+      {{ textbox(form.email_address, width='3-4', disabled=True ) }}
       {{ textbox(form.name, width='3-4') }}
       {{ textbox(form.mobile_number, width='3-4') }}
       {{ textbox(form.password, hint="Your password must have at least 10 characters", width='3-4') }}
       {{ page_footer("Continue") }}
       {{form.service}}
-      {{form.email_address}}
     </form>
   </div>
 </div>

app/templates/views/service_dashboard.html

@@ -56,7 +56,7 @@
         jobs,
         caption="Recent text messages",
         empty_message='You haven’t sent any text messages yet',
-        field_headings=['Job', 'Created', right_aligned_field_heading('Status')]
+        field_headings=['Job', 'Created', right_aligned_field_heading('completion')]
       ) %}
         {% call field() %}
           <a href="{{ url_for('.view_job', service_id=service_id, job_id=item.id) }}">{{ item.original_file_name }}</a>
@@ -65,7 +65,7 @@
           {{ item.created_at|format_datetime }}
         {% endcall %}
         {% call field(align='right') %}
-          {{ item.status }}
+          {{ (item.notifications_sent / item.notification_count * 100)|round|int }}%
         {% endcall %}
       {% endcall %}
       {% if more_jobs_to_show %}

app/templates/views/two-factor.html

@@ -23,7 +23,6 @@
         help_link=url_for('.verification_code_not_received'),
         help_link_text='I haven’t received a text message'
       ) }}
-      {{ checkbox(form.remember_me) }}
       {{ page_footer(
         "Continue"
       ) }}