Merge with master.

app/__init__.py

@@ -1,11 +1,9 @@
 import os
 import re
-import ast
 
 import dateutil
 from flask import (Flask, session, Markup, escape, render_template, make_response)
 from flask._compat import string_types
-from flask.ext.sqlalchemy import SQLAlchemy
 from flask_login import LoginManager
 from flask_wtf import CsrfProtect
 from werkzeug.exceptions import abort

app/main/views/templates.py

@@ -1,14 +1,9 @@
 from flask import request, render_template, redirect, url_for, flash, abort
 from flask_login import login_required
 
-from notifications_python_client.errors import HTTPError
-from utils.template import Template
-
 from app.main import main
 from app.utils import user_has_permissions
 from app.main.forms import SMSTemplateForm, EmailTemplateForm
-from app import job_api_client
-from app.main.dao.services_dao import get_service_by_id_or_404
 from app.main.dao import templates_dao as tdao
 from app.main.dao import services_dao as sdao
 

app/notify_client/invite_api_client.py

@@ -1,5 +1,6 @@
 
 from notifications_python_client.base import BaseAPIClient
+from app.notify_client.models import User
 
 
 class InviteApiClient(BaseAPIClient):
@@ -26,4 +27,4 @@ class InviteApiClient(BaseAPIClient):
     def get_invites_for_service(self, service_id):
         endpoint = '/service/{}/invite'.format(service_id)
         resp = self.get(endpoint)
-        return resp['data']
+        return [User(data) for data in resp['data']]

app/notify_client/models.py

@@ -0,0 +1,116 @@
+from flask.ext.login import (UserMixin, login_fresh)
+
+
+class User(UserMixin):
+    def __init__(self, fields, max_failed_login_count=3):
+        self._id = fields.get('id')
+        self._name = fields.get('name')
+        self._email_address = fields.get('email_address')
+        self._mobile_number = fields.get('mobile_number')
+        self._password_changed_at = fields.get('password_changed_at')
+        self._permissions = fields.get('permissions')
+        self._failed_login_count = 0
+        self._state = fields.get('state')
+        self.max_failed_login_count = max_failed_login_count
+
+    def get_id(self):
+        return self.id
+
+    def is_active(self):
+        return self.state == 'active'
+
+    def is_authenticated(self):
+        # To handle remember me token renewal
+        if not login_fresh():
+            return False
+        return super(User, self).is_authenticated()
+
+    @property
+    def id(self):
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        self._id = id
+
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        self._name = name
+
+    @property
+    def email_address(self):
+        return self._email_address
+
+    @email_address.setter
+    def email_address(self, email_address):
+        self._email_address = email_address
+
+    @property
+    def mobile_number(self):
+        return self._mobile_number
+
+    @mobile_number.setter
+    def mobile_number(self, mobile_number):
+        self._mobile_number = mobile_number
+
+    @property
+    def password_changed_at(self):
+        return self._password_changed_at
+
+    @password_changed_at.setter
+    def password_changed_at(self, password_changed_at):
+        self._password_changed_at = password_changed_at
+
+    @property
+    def state(self):
+        return self._state
+
+    @state.setter
+    def state(self, state):
+        self._state = state
+
+    @property
+    def permissions(self):
+        return self._permissions
+
+    @permissions.setter
+    def permissions(self, permissions):
+        raise AttributeError("Read only property")
+
+    def has_permissions(self, service_id, permissions, or_=False):
+        if service_id in self._permissions:
+            if or_:
+                return any([x in self._permissions[service_id] for x in permissions])
+            return set(self._permissions[service_id]) > set(permissions)
+        return False
+
+    @property
+    def failed_login_count(self):
+        return self._failed_login_count
+
+    @failed_login_count.setter
+    def failed_login_count(self, num):
+        self._failed_login_count += num
+
+    def is_locked(self):
+        return self.failed_login_count >= self.max_failed_login_count
+
+    def serialize(self):
+        dct = {"id": self.id,
+               "name": self.name,
+               "email_address": self.email_address,
+               "mobile_number": self.mobile_number,
+               "password_changed_at": self.password_changed_at,
+               "state": self.state,
+               "failed_login_count": self.failed_login_count,
+               "permissions": [x for x in self._permissions]}
+        if getattr(self, '_password', None):
+            dct['password'] = self._password
+        return dct
+
+    def set_password(self, pwd):
+        self._password = pwd

app/notify_client/user_api_client.py

@@ -1,7 +1,7 @@
 from notifications_python_client.notifications import BaseAPIClient
 from notifications_python_client.errors import HTTPError
 
-from flask.ext.login import (UserMixin, login_fresh)
+from app.notify_client.models import User
 
 
 class UserApiClient(BaseAPIClient):
@@ -84,119 +84,4 @@ class UserApiClient(BaseAPIClient):
     def get_users_for_service(self, service_id):
         endpoint = '/service/{}/users'.format(service_id)
         resp = self.get(endpoint)
-        return resp['data']
-
-
-class User(UserMixin):
-    def __init__(self, fields, max_failed_login_count=3):
-        self._id = fields.get('id')
-        self._name = fields.get('name')
-        self._email_address = fields.get('email_address')
-        self._mobile_number = fields.get('mobile_number')
-        self._password_changed_at = fields.get('password_changed_at')
-        self._permissions = fields.get('permissions')
-        self._failed_login_count = 0
-        self._state = fields.get('state')
-        self.max_failed_login_count = max_failed_login_count
-
-    def get_id(self):
-        return self.id
-
-    def is_active(self):
-        return self.state == 'active'
-
-    def is_authenticated(self):
-        # To handle remember me token renewal
-        if not login_fresh():
-            return False
-        return super(User, self).is_authenticated()
-
-    @property
-    def id(self):
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        self._id = id
-
-    @property
-    def name(self):
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        self._name = name
-
-    @property
-    def email_address(self):
-        return self._email_address
-
-    @email_address.setter
-    def email_address(self, email_address):
-        self._email_address = email_address
-
-    @property
-    def mobile_number(self):
-        return self._mobile_number
-
-    @mobile_number.setter
-    def mobile_number(self, mobile_number):
-        self._mobile_number = mobile_number
-
-    @property
-    def password_changed_at(self):
-        return self._password_changed_at
-
-    @password_changed_at.setter
-    def password_changed_at(self, password_changed_at):
-        self._password_changed_at = password_changed_at
-
-    @property
-    def state(self):
-        return self._state
-
-    @state.setter
-    def state(self, state):
-        self._state = state
-
-    @property
-    def permissions(self):
-        return self._permissions
-
-    @permissions.setter
-    def permissions(self, permissions):
-        raise AttributeError("Read only property")
-
-    def has_permissions(self, service_id, permissions, or_=False):
-        if service_id in self._permissions:
-            if or_:
-                return any([x in self._permissions[service_id] for x in permissions])
-            return set(self._permissions[service_id]) > set(permissions)
-        return False
-
-    @property
-    def failed_login_count(self):
-        return self._failed_login_count
-
-    @failed_login_count.setter
-    def failed_login_count(self, num):
-        self._failed_login_count += num
-
-    def is_locked(self):
-        return self.failed_login_count >= self.max_failed_login_count
-
-    def serialize(self):
-        dct = {"id": self.id,
-               "name": self.name,
-               "email_address": self.email_address,
-               "mobile_number": self.mobile_number,
-               "password_changed_at": self.password_changed_at,
-               "state": self.state,
-               "failed_login_count": self.failed_login_count,
-               "permissions": [x for x in self._permissions]}
-        if getattr(self, '_password', None):
-            dct['password'] = self._password
-        return dct
-
-    def set_password(self, pwd):
-        self._password = pwd
+        return [User(data) for data in resp['data']]

app/templates/views/manage-users.html

@@ -28,9 +28,9 @@ Manage users – GOV.UK Notify
     {% call field() %}
       {{ item.name }}
     {% endcall %}
-    {{ boolean_field(item.permission_send_messages) }}
-    {{ boolean_field(item.permission_manage_service) }}
-    {{ boolean_field(item.permission_manage_api_keys) }}
+    {{ boolean_field(item.has_permissions(service_id, 'send_messages')) }}
+    {{ boolean_field(item.has_permissions(service_id, 'manage_service')) }}
+    {{ boolean_field(item.has_permissions(service_id, 'manage_api_keys')) }}
     {% call field(align='right') %}
       <a href="{{ url_for('.edit_user', service_id=service_id, user_id=item.id)}}">Change</a>
     {% endcall %}
@@ -43,9 +43,9 @@ Manage users – GOV.UK Notify
       {% call field() %}
         {{ item.email_address }}
       {% endcall %}
-      {{ boolean_field(item.permission_send_messages) }}
-      {{ boolean_field(item.permission_manage_service) }}
-      {{ boolean_field(item.permission_manage_api_keys) }}
+      {{ boolean_field(item.has_permissions(service_id, 'send_messages')) }}
+      {{ boolean_field(item.has_permissions(service_id, 'manage_service')) }}
+      {{ boolean_field(item.has_permissions(service_id, 'api_keys')) }}
       {% call field(align='right') %}
         <a href="{{ url_for('.edit_user', service_id=service_id, user_id=item.id)}}">Change</a>
       {% endcall %}