Functionality added and all tests working.

Update correct use of permissions form.

app/main/views/manage_users.py

@@ -5,7 +5,8 @@ from flask import (
     render_template,
     redirect,
     url_for,
-    flash
+    flash,
+    abort
 )
 
 from flask_login import (
@@ -13,6 +14,7 @@ from flask_login import (
     current_user
 )
 
+from notifications_python_client import HTTPError
 from app.main import main
 from app.main.forms import (
     InviteUserForm,
@@ -20,6 +22,7 @@ from app.main.forms import (
 )
 from app.main.dao.services_dao import get_service_by_id
 from app import user_api_client
+from app import service_api_client
 from app import invite_api_client
 from app.utils import user_has_permissions
 
@@ -106,6 +109,45 @@ def edit_user_permissions(service_id, user_id):
     )
 
 
+@main.route("/services/<service_id>/users/<user_id>/delete", methods=['GET', 'POST'])
+@login_required
+@user_has_permissions('manage_users', admin_override=True)
+def remove_user_from_service(service_id, user_id):
+    user = user_api_client.get_user(user_id)
+    service = get_service_by_id(service_id)
+    # Need to make the email address read only, or a disabled field?
+    # Do it through the template or the form class?
+    form = PermissionsForm(**{
+        role: user.has_permissions(permissions=permissions) for role, permissions in roles.items()
+        })
+
+    if request.method == 'POST':
+        try:
+            service_api_client.remove_user_from_service(service_id, user_id)
+        except HTTPError as e:
+            msg = "You cannot remove the only user for a service"
+            if e.status_code == 400 and msg in e.message:
+                flash(msg, 'info')
+                return redirect(url_for(
+                    '.manage_users',
+                    service_id=service_id))
+            else:
+                abort(500, e)
+
+        return redirect(url_for(
+            '.manage_users',
+            service_id=service_id
+        ))
+
+    flash('Are you sure you want to remove {}?'.format(user.name), 'remove')
+    return render_template(
+        'views/edit-user-permissions.html',
+        user=user,
+        form=form,
+        service_id=service_id
+    )
+
+
 @main.route("/services/<service_id>/cancel-invited-user/<invited_user_id>", methods=['GET'])
 @user_has_permissions('manage_users', admin_override=True)
 def cancel_invited_user(service_id, invited_user_id):