merge master

app/main/__init__.py

@@ -28,6 +28,7 @@ from app.main.views import (
     providers,
     platform_admin,
     letter_jobs,
+    organisations,
     conversation,
     notifications,
     inbound_number

app/main/forms.py

@@ -3,6 +3,7 @@ import pytz
 
 from flask_wtf import FlaskForm as Form
 from datetime import datetime, timedelta
+
 from notifications_utils.recipients import (
     validate_phone_number,
     InvalidPhoneError
@@ -25,6 +26,7 @@ from wtforms import (
     SelectField)
 from wtforms.fields.html5 import EmailField, TelField, SearchField
 from wtforms.validators import (DataRequired, Email, Length, Regexp, Optional)
+from flask_wtf.file import FileField as FileField_wtf, FileAllowed
 
 from app.main.validators import (Blacklist, CsvFileValidator, ValidGovEmail, NoCommasInPlaceHolders, OnlyGSMCharacters)
 
@@ -210,38 +212,8 @@ class TextNotReceivedForm(Form):
     mobile_number = mobile_number()
 
 
-class AddServiceForm(Form):
-    def __init__(self, names_func, *args, **kwargs):
-        """
-        Keyword arguments:
-        names_func -- Returns a list of unique service_names already registered
-        on the system.
-        """
-        self._names_func = names_func
-        super(AddServiceForm, self).__init__(*args, **kwargs)
-
-    name = StringField(
-        'Service name',
-        validators=[
-            DataRequired(message='Can’t be empty')
-        ]
-    )
-
-    def validate_name(self, a):
-        from app.utils import email_safe
-        # make sure the email_from will be unique to all services
-        if email_safe(a.data) in self._names_func():
-            raise ValidationError('This service name is already in use')
-
-
 class ServiceNameForm(Form):
-    def __init__(self, names_func, *args, **kwargs):
-        """
-        Keyword arguments:
-        names_func -- Returns a list of unique service_names already registered
-        on the system.
-        """
-        self._names_func = names_func
+    def __init__(self, *args, **kwargs):
         super(ServiceNameForm, self).__init__(*args, **kwargs)
 
     name = StringField(
@@ -250,12 +222,6 @@ class ServiceNameForm(Form):
             DataRequired(message='Can’t be empty')
         ])
 
-    def validate_name(self, a):
-        from app.utils import email_safe
-        # make sure the email_from will be unique to all services
-        if email_safe(a.data) in self._names_func():
-            raise ValidationError('This service name is already in use')
-
 
 class ConfirmPasswordForm(Form):
     def __init__(self, validate_password_func, *args, **kwargs):
@@ -559,6 +525,28 @@ class ServiceBrandingOrg(Form):
     )
 
 
+class ServiceSelectOrg(Form):
+
+    def __init__(self, organisations=[], *args, **kwargs):
+        self.organisation.choices = organisations
+        super(ServiceSelectOrg, self).__init__(*args, **kwargs)
+
+    organisation = RadioField(
+        'Organisation',
+        validators=[
+            DataRequired()
+        ]
+    )
+
+
+class ServiceManageOrg(Form):
+
+    name = StringField('Name')
+
+    colour = StringField('Colour', render_kw={'onkeyup': 'update_colour_span()', 'onblur': 'update_colour_span()'})
+    file = FileField_wtf('Upload a PNG logo', validators=[FileAllowed(['png'], 'PNG Images only!')])
+
+
 class LetterBranding(Form):
 
     def __init__(self, choices=[], *args, **kwargs):

app/main/s3_client.py

@@ -0,0 +1,102 @@
+import uuid
+import botocore
+from boto3 import resource
+from flask import current_app
+from notifications_utils.s3 import s3upload as utils_s3upload
+
+FILE_LOCATION_STRUCTURE = 'service-{}-notify/{}.csv'
+TEMP_TAG = 'temp-{user_id}_'
+LOGO_LOCATION_STRUCTURE = '{temp}{unique_id}-{filename}'
+
+
+def get_s3_object(bucket_name, filename):
+    s3 = resource('s3')
+    return s3.Object(bucket_name, filename)
+
+
+def delete_s3_object(filename):
+    bucket_name = current_app.config['LOGO_UPLOAD_BUCKET_NAME']
+    get_s3_object(bucket_name, filename).delete()
+
+
+def rename_s3_object(old_name, new_name):
+    bucket_name = current_app.config['LOGO_UPLOAD_BUCKET_NAME']
+    get_s3_object(bucket_name, new_name).copy_from(
+        CopySource='{}/{}'.format(bucket_name, old_name))
+    delete_s3_object(old_name)
+
+
+def get_s3_objects_filter_by_prefix(prefix):
+    bucket_name = current_app.config['LOGO_UPLOAD_BUCKET_NAME']
+    s3 = resource('s3')
+    return s3.Bucket(bucket_name).objects.filter(Prefix=prefix)
+
+
+def get_temp_truncated_filename(filename, user_id):
+    return filename[len(TEMP_TAG.format(user_id=user_id)):]
+
+
+def s3upload(service_id, filedata, region):
+    upload_id = str(uuid.uuid4())
+    upload_file_name = FILE_LOCATION_STRUCTURE.format(service_id, upload_id)
+    utils_s3upload(filedata=filedata['data'],
+                   region=region,
+                   bucket_name=current_app.config['CSV_UPLOAD_BUCKET_NAME'],
+                   file_location=upload_file_name)
+    return upload_id
+
+
+def s3download(service_id, upload_id):
+    contents = ''
+    try:
+        bucket_name = current_app.config['CSV_UPLOAD_BUCKET_NAME']
+        upload_file_name = FILE_LOCATION_STRUCTURE.format(service_id, upload_id)
+        key = get_s3_object(bucket_name, upload_file_name)
+        contents = key.get()['Body'].read().decode('utf-8')
+    except botocore.exceptions.ClientError as e:
+        current_app.logger.error("Unable to download s3 file {}".format(
+            FILE_LOCATION_STRUCTURE.format(service_id, upload_id)))
+        raise e
+    return contents
+
+
+def upload_logo(filename, filedata, region, user_id):
+    upload_file_name = LOGO_LOCATION_STRUCTURE.format(
+        temp=TEMP_TAG.format(user_id=user_id),
+        unique_id=str(uuid.uuid4()),
+        filename=filename
+    )
+    bucket_name = current_app.config['LOGO_UPLOAD_BUCKET_NAME']
+    utils_s3upload(
+        filedata=filedata,
+        region=region,
+        bucket_name=bucket_name,
+        file_location=upload_file_name,
+        content_type='image/png'
+    )
+
+    return upload_file_name
+
+
+def persist_logo(filename, user_id):
+    if filename.startswith(TEMP_TAG.format(user_id=user_id)):
+        persisted_filename = get_temp_truncated_filename(
+            filename=filename, user_id=user_id)
+    else:
+        return filename
+
+    rename_s3_object(filename, persisted_filename)
+
+    return persisted_filename
+
+
+def delete_temp_files_created_by(user_id):
+    for obj in get_s3_objects_filter_by_prefix(TEMP_TAG.format(user_id=user_id)):
+        delete_s3_object(obj.key)
+
+
+def delete_temp_file(filename):
+    if not filename.startswith(TEMP_TAG[:5]):
+        raise ValueError('Not a temp file: {}'.format(filename))
+
+    delete_s3_object(filename)

app/main/uploader.py

@@ -1,32 +0,0 @@
-import uuid
-import botocore
-from boto3 import resource
-from flask import current_app
-from notifications_utils.s3 import s3upload as utils_s3upload
-
-FILE_LOCATION_STRUCTURE = 'service-{}-notify/{}.csv'
-
-
-def s3upload(service_id, filedata, region):
-    upload_id = str(uuid.uuid4())
-    upload_file_name = FILE_LOCATION_STRUCTURE.format(service_id, upload_id)
-    utils_s3upload(filedata=filedata['data'],
-                   region=region,
-                   bucket_name=current_app.config['CSV_UPLOAD_BUCKET_NAME'],
-                   file_location=upload_file_name)
-    return upload_id
-
-
-def s3download(service_id, upload_id):
-    contents = ''
-    try:
-        s3 = resource('s3')
-        bucket_name = current_app.config['CSV_UPLOAD_BUCKET_NAME']
-        upload_file_name = FILE_LOCATION_STRUCTURE.format(service_id, upload_id)
-        key = s3.Object(bucket_name, upload_file_name)
-        contents = key.get()['Body'].read().decode('utf-8')
-    except botocore.exceptions.ClientError as e:
-        current_app.logger.error("Unable to download s3 file {}".format(
-            FILE_LOCATION_STRUCTURE.format(service_id, upload_id)))
-        raise e
-    return contents

app/main/views/add_service.py

@@ -10,11 +10,11 @@ from flask_login import (
     current_user,
     login_required
 )
-
+from notifications_python_client.errors import HTTPError
 from werkzeug.exceptions import abort
 
 from app.main import main
-from app.main.forms import AddServiceForm
+from app.main.forms import ServiceNameForm
 from app.notify_client.models import InvitedUser
 
 from app import (
@@ -39,14 +39,32 @@ def _add_invited_user_to_service(invited_user):
     return service_id
 
 
-def _create_service(service_name, email_from):
-    service_id = service_api_client.create_service(service_name=service_name,
-                                                   message_limit=current_app.config['DEFAULT_SERVICE_LIMIT'],
-                                                   restricted=True,
-                                                   user_id=session['user_id'],
-                                                   email_from=email_from)
-    session['service_id'] = service_id
-    return service_id
+def _create_service(service_name, email_from, form):
+    try:
+        service_id = service_api_client.create_service(service_name=service_name,
+                                                       message_limit=current_app.config['DEFAULT_SERVICE_LIMIT'],
+                                                       restricted=True,
+                                                       user_id=session['user_id'],
+                                                       email_from=email_from)
+        session['service_id'] = service_id
+        return service_id, None
+    except HTTPError as e:
+        if e.status_code == 400 and e.message['name']:
+            form.name.errors.append("This service name is already in use")
+            return None, e
+        else:
+            raise e
+
+
+def _create_example_template(service_id):
+    example_sms_template = service_api_client.create_service_template(
+        'Example text message template',
+        'sms',
+        'Hey ((name)), I’m trying out Notify. Today is ((day of week)) and my favourite colour is ((colour)).',
+        service_id,
+        process_type='priority',
+    )
+    return example_sms_template
 
 
 @main.route("/add-service", methods=['GET', 'POST'])
@@ -60,24 +78,20 @@ def add_service():
     if not is_gov_user(current_user.email_address):
         abort(403)
 
-    form = AddServiceForm(service_api_client.find_all_service_email_from)
+    form = ServiceNameForm()
     heading = 'Which service do you want to set up notifications for?'
 
     if form.validate_on_submit():
         email_from = email_safe(form.name.data)
         service_name = form.name.data
-        service_id = _create_service(service_name, email_from)
 
-        if (len(service_api_client.get_active_services({'user_id': session['user_id']}).get('data', [])) > 1):
+        service_id, error = _create_service(service_name, email_from, form)
+        if error:
+            return render_template('views/add-service.html', form=form, heading=heading)
+        if len(service_api_client.get_active_services({'user_id': session['user_id']}).get('data', [])) > 1:
             return redirect(url_for('main.service_dashboard', service_id=service_id))
 
-        example_sms_template = service_api_client.create_service_template(
-            'Example text message template',
-            'sms',
-            'Hey ((name)), I’m trying out Notify. Today is ((day of week)) and my favourite colour is ((colour)).',
-            service_id,
-            process_type='priority',
-        )
+        example_sms_template = _create_example_template(service_id)
 
         return redirect(url_for(
             'main.start_tour',

app/main/views/organisations.py

@@ -0,0 +1,97 @@
+from flask import current_app, redirect, render_template, session, url_for, request
+from flask_login import login_required
+
+from app import organisations_client
+from app.main import main
+from app.main.forms import (
+    ServiceSelectOrg,
+    ServiceManageOrg)
+from app.utils import user_has_permissions, get_cdn_domain
+from app.main.s3_client import (
+    TEMP_TAG,
+    upload_logo,
+    delete_temp_file,
+    delete_temp_files_created_by,
+    persist_logo
+)
+from app.main.views.service_settings import get_branding_as_value_and_label, get_branding_as_dict
+
+
+@main.route("/organisations", methods=['GET', 'POST'])
+@main.route("/organisations/<organisation_id>", methods=['GET', 'POST'])
+@login_required
+@user_has_permissions(admin_override=True)
+def organisations(organisation_id=None):
+    orgs = organisations_client.get_organisations()
+
+    form = ServiceSelectOrg()
+    form.organisation.choices = get_branding_as_value_and_label(orgs) + [('None', 'Create a new organisation')]
+
+    if form.validate_on_submit():
+        if form.organisation.data != 'None':
+            session['organisation'] = [o for o in orgs if o['id'] == form.organisation.data][0]
+        elif session.get('organisation'):
+            del session['organisation']
+
+        return redirect(url_for('.manage_org'))
+
+    form.organisation.data = organisation_id if organisation_id in [o['id'] for o in orgs] else 'None'
+
+    return render_template(
+        'views/organisations/select-org.html',
+        form=form,
+        branding_dict=get_branding_as_dict(orgs),
+        organisation_id=organisation_id
+    )
+
+
+@main.route("/organisations/manage", methods=['GET', 'POST'])
+@main.route("/organisations/manage/<logo>", methods=['GET', 'POST'])
+@login_required
+@user_has_permissions(admin_override=True)
+def manage_org(logo=None):
+    form = ServiceManageOrg()
+
+    org = session.get("organisation")
+
+    logo = logo if logo else org.get('logo') if org else None
+
+    if form.validate_on_submit():
+        if form.file.data:
+            upload_filename = upload_logo(
+                form.file.data.filename,
+                form.file.data,
+                current_app.config['AWS_REGION'],
+                user_id=session["user_id"]
+            )
+
+            if logo and logo.startswith(TEMP_TAG.format(user_id=session['user_id'])):
+                delete_temp_file(logo)
+
+            return redirect(
+                url_for('.manage_org', logo=upload_filename))
+
+        logo = persist_logo(logo, session["user_id"])
+        delete_temp_files_created_by(session["user_id"])
+
+        if org:
+            organisations_client.update_organisation(
+                org_id=org['id'], logo=logo, name=form.name.data, colour=form.colour.data)
+            org_id = org['id']
+        else:
+            resp = organisations_client.create_organisation(
+                logo=logo, name=form.name.data, colour=form.colour.data)
+            org_id = resp['data']['id']
+
+        return redirect(url_for('.organisations', organisation_id=org_id))
+    if org:
+        form.name.data = org['name']
+        form.colour.data = org['colour']
+
+    return render_template(
+        'views/organisations/manage-org.html',
+        form=form,
+        organisation=org,
+        cdn_url=get_cdn_domain(),
+        logo=logo
+    )

app/main/views/send.py

@@ -33,7 +33,7 @@ from app.main.forms import (
     ChooseTimeForm,
     get_placeholder_form_instance
 )
-from app.main.uploader import (
+from app.main.s3_client import (
     s3upload,
     s3download
 )

app/main/views/service_settings.py

@@ -88,12 +88,16 @@ def service_settings(service_id):
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_name_change(service_id):
-    form = ServiceNameForm(service_api_client.find_all_service_email_from)
+    form = ServiceNameForm()
 
     if request.method == 'GET':
         form.name.data = current_service.get('name')
 
     if form.validate_on_submit():
+        unique_name = service_api_client.is_service_name_unique(form.name.data, email_safe(form.name.data))
+        if not unique_name:
+            form.name.errors.append("This service name is already in use")
+            return render_template('views/service-settings/name.html', form=form)
         session['service_name_change'] = form.name.data
         return redirect(url_for('.service_name_change_confirm', service_id=service_id))