diff --git a/app/assets/stylesheets/_grids.scss b/app/assets/stylesheets/_grids.scss index e349e22bb..7f8eb724f 100644 --- a/app/assets/stylesheets/_grids.scss +++ b/app/assets/stylesheets/_grids.scss @@ -1,11 +1,17 @@ -.column-one-quarter { - @include grid-column(1/4); -} - .column-three-quarters { @include grid-column(3/4); } + +.column-one-eighth { + @include grid-column(1/8); +} + +.column-seven-eighths { + @include grid-column(7/8); +} + .bottom-gutter { margin-bottom: $gutter; + clear: both; } diff --git a/app/assets/stylesheets/components/email-message.scss b/app/assets/stylesheets/components/email-message.scss index 2eec50050..b4771841a 100644 --- a/app/assets/stylesheets/components/email-message.scss +++ b/app/assets/stylesheets/components/email-message.scss @@ -1,24 +1,30 @@ .email-message { margin-bottom: $gutter; - border: 1px solid $border-colour; - - &-subject { - @include bold-19; - border-bottom: 1px solid $border-colour; - padding: 10px; - } - - &-body { - border-bottom: 1px solid $white; - padding: 10px; - overflow: hidden; - max-height: 103px; - } &-name { @include bold-19; - margin: 50px 0 10px 0; + margin: 20px 0 10px 0; + } + + &-subject, + &-from { + margin: 10px 0; + } + + &-from { + padding-top: 15px; + border-top: 1px solid $border-colour; + } + + &-body { + width: 100%; + box-sizing: border-box; + padding: $gutter-half 0 0 0; + margin: 0 0 $gutter 0; + clear: both; + border-top: 1px solid $border-colour; + border-bottom: 1px solid $border-colour; } } diff --git a/app/assets/stylesheets/components/sms-message.scss b/app/assets/stylesheets/components/sms-message.scss index 9fbe0b1af..898d04c24 100644 --- a/app/assets/stylesheets/components/sms-message.scss +++ b/app/assets/stylesheets/components/sms-message.scss @@ -8,6 +8,7 @@ border-radius: 5px; white-space: normal; margin: 0 0 $gutter 0; + clear: both; } .sms-message-wrapper-with-radio { @@ -53,3 +54,8 @@ } } + +.sms-message-from { + @include bold-19; + display: block; +} diff --git a/app/assets/stylesheets/components/textbox.scss b/app/assets/stylesheets/components/textbox.scss index d340dc494..efb692c27 100644 --- a/app/assets/stylesheets/components/textbox.scss +++ b/app/assets/stylesheets/components/textbox.scss @@ -85,3 +85,7 @@ .textbox-help-link { margin: 5px 0 0 0; } + +.textbox-right-aligned { + text-align: right; +} diff --git a/app/main/dao/services_dao.py b/app/main/dao/services_dao.py index 52c217679..604b2e27d 100644 --- a/app/main/dao/services_dao.py +++ b/app/main/dao/services_dao.py @@ -1,5 +1,6 @@ from flask import url_for from app import notifications_api_client +from notifications_python_client.errors import HTTPError from app.utils import BrowsableItem @@ -26,6 +27,16 @@ def get_service_by_id(id_): return notifications_api_client.get_service(id_) +def get_service_by_id_or_404(id_): + try: + return get_service_by_id(id_) + except HTTPError as e: + if e.status_code == 404: + abort(404) + else: + raise e + + def get_services(user_id=None): if user_id: return notifications_api_client.get_services({'user_id': str(user_id)}) diff --git a/app/main/dao/users_dao.py b/app/main/dao/users_dao.py index 0b9432943..c0da683cf 100644 --- a/app/main/dao/users_dao.py +++ b/app/main/dao/users_dao.py @@ -1,4 +1,5 @@ from datetime import datetime +from notifications_python_client import HTTPError from sqlalchemy.orm import load_only @@ -47,9 +48,15 @@ def activate_user(user): def is_email_unique(email_address): - if user_api_client.get_user_by_email(email_address): - return False - return True + try: + if user_api_client.get_user_by_email(email_address): + return False + return True + except HTTPError as ex: + if ex.status_code == 404: + return True + else: + raise ex def request_password_reset(user): diff --git a/app/main/views/add_service.py b/app/main/views/add_service.py index dc7a3a7d4..ad5d8f715 100644 --- a/app/main/views/add_service.py +++ b/app/main/views/add_service.py @@ -1,4 +1,6 @@ -from flask import render_template, redirect, session, url_for +import re + +from flask import render_template, request, redirect, session, url_for from flask_login import login_required, current_user from app.main import main from app.main.dao import services_dao, users_dao @@ -15,13 +17,33 @@ def add_service(): else: heading = 'Add a new service' if form.validate_on_submit(): - user = users_dao.get_user_by_id(session['user_id']) - service_id = services_dao.insert_new_service(form.name.data, user.id) session['service_name'] = form.name.data - return redirect(url_for('main.service_dashboard', service_id=service_id)) + return redirect(url_for('main.add_from_address')) else: return render_template( 'views/add-service.html', form=form, heading=heading ) + + +@main.route("/confirm-add-service", methods=['GET', 'POST']) +@login_required +def add_from_address(): + if request.method == 'POST': + user = users_dao.get_user_by_id(session['user_id']) + service_id = services_dao.insert_new_service(session['service_name'], user.id) + return redirect(url_for('main.service_dashboard', service_id=service_id)) + else: + return render_template( + 'views/add-from-address.html', + service_name=session['service_name'], + from_address="{}@notifications.service.gov.uk".format(_email_safe(session['service_name'])) + ) + + +def _email_safe(string): + return "".join([ + character.lower() if character.isalnum() or character == "." else "" + for character in re.sub("\s+", ".", string.strip()) + ]) diff --git a/app/main/views/register.py b/app/main/views/register.py index 25c1e0e78..b364630d6 100644 --- a/app/main/views/register.py +++ b/app/main/views/register.py @@ -26,7 +26,6 @@ def register(): return redirect(url_for('main.choose_service')) form = RegisterUserForm() - if form.validate_on_submit(): if users_dao.is_email_unique(form.email_address.data): try: diff --git a/app/main/views/sms.py b/app/main/views/sms.py index 0b4815d26..a135643f7 100644 --- a/app/main/views/sms.py +++ b/app/main/views/sms.py @@ -127,6 +127,7 @@ def check_sms(service_id, upload_id): template_id = upload_data.get('template_id') raw_template = templates_dao.get_service_template_or_404(service_id, template_id)['data'] upload_result = _get_rows(contents, raw_template) + print(upload_result) template = Template( raw_template, values=upload_result['rows'][0] if upload_result['valid'] else {}, diff --git a/app/notify_client/api_client.py b/app/notify_client/api_client.py index 7f9f34b52..f5f72298a 100644 --- a/app/notify_client/api_client.py +++ b/app/notify_client/api_client.py @@ -24,7 +24,7 @@ class NotificationsAdminAPIClient(NotificationsAPIClient): "name": service_name, "active": active, "limit": limit, - "users": [user_id], + "user_id": user_id, "restricted": restricted } return self.post("/service", data) diff --git a/app/templates/components/email-message.html b/app/templates/components/email-message.html index 6d9920121..b619b16fa 100644 --- a/app/templates/components/email-message.html +++ b/app/templates/components/email-message.html @@ -1,4 +1,4 @@ -{% macro email_message(subject, body, name=None, edit_link=None) %} +{% macro email_message(subject, body, name=None, edit_link=None, from_name=None, from_address=None) %} {% if name %}

{% if edit_link %} @@ -9,9 +9,30 @@

{% endif %}
-
- {{ subject }} -
+ {% if from_name and from_address %} +
+
+
+ From +
+
+ {{ from_name }} <{{ from_address }}> +
+
+
+ {% endif %} + {% if subject %} +
+
+
+ Subject +
+
+ {{ subject }} +
+
+
+ {% endif %}
{{ body|nl2br }}
diff --git a/app/templates/components/sms-message.html b/app/templates/components/sms-message.html index 490254485..edd64887f 100644 --- a/app/templates/components/sms-message.html +++ b/app/templates/components/sms-message.html @@ -1,5 +1,5 @@ {% macro sms_message( - body, recipient=None, name=None, id=None, edit_link=None + body, recipient=None, name=None, id=None, edit_link=None, from=None ) %} {% if name %}

@@ -11,6 +11,11 @@

{% endif %}
+ {% if from %} + + {{ from }} + + {% endif %} {{ body }}
{% if recipient %} diff --git a/app/templates/components/textbox.html b/app/templates/components/textbox.html index cffcd48c9..b50fb9ee4 100644 --- a/app/templates/components/textbox.html +++ b/app/templates/components/textbox.html @@ -5,7 +5,8 @@ autofocus=False, help_link=None, help_link_text=None, - width='2-3' + width='2-3', + suffix=None ) %}
{{ field(**{ - 'class': 'form-control form-control-{} textbox-highlight-textbox'.format(width) if highlight_tags else 'form-control form-control-{}'.format(width), + '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 suffix %} + {{ suffix }} + {% endif %} {% if help_link and help_link_text %}

{{ help_link_text }} diff --git a/app/templates/email/email_template_1.html b/app/templates/email/email_template_1.html new file mode 100644 index 000000000..39f42bd1e --- /dev/null +++ b/app/templates/email/email_template_1.html @@ -0,0 +1,85 @@ + + + + + + + Page title + + + + + + + +
+ + + + +
+ + GOV.UK +
+
+ + + + + +
+ + + + + +
+ +

+ This is the page title +

+ +

+ Dear A Name, +

+ +

+ This is the first paragraph. +

+ +

+ This is the second paragraph. It is longer than the first and wraps on to two lines. +

+ +

+ This paragraph includes a line-break:
+ This is the line after the line-break. +

+ +

+ This is an inset paragraph used for data or callouts
+ Application reference: 123456789
+ Date received: 15 March 2015
+

+ +

+ Second level heading

+

+ Third level heading +

+

+ Intro before a url: + + www.gov.uk/service-start-page +

+ +

+ Department or agency name +

+ + 		 
+
+ + + + \ No newline at end of file diff --git a/app/templates/email/email_template_2.html b/app/templates/email/email_template_2.html new file mode 100644 index 000000000..731959d11 --- /dev/null +++ b/app/templates/email/email_template_2.html @@ -0,0 +1,95 @@ + + + + + + Page title + + + + + + + + + + + +
+ + + + +
+ + GOV.UK +
+
+ + + + + + +
+

+ This is the page title +

+ +

+ Dear A Name, +

+ +

+ This is the first paragraph. +

+ +

+ This is the second paragraph. It is longer than the first and wraps on to two lines. +

+ +

+ This paragraph includes a line-break:
+ This is the line after the line-break. +

+ +

+ This is an inset paragraph used for data or callouts
+ Application reference: 123456789
+ Date received: 15 March 2015
+

+ +

+ Second level heading

+

+ Third level heading +

+

+ Intro before a url: + + www.gov.uk/service-start-page +

+ +

+ Department or agency name +

+
+ + + + + \ No newline at end of file diff --git a/app/templates/views/add-from-address.html b/app/templates/views/add-from-address.html new file mode 100644 index 000000000..a67f3c6d3 --- /dev/null +++ b/app/templates/views/add-from-address.html @@ -0,0 +1,42 @@ +{% extends "withoutnav_template.html" %} +{% from "components/textbox.html" import textbox %} +{% from "components/page-footer.html" import page_footer %} +{% from "components/sms-message.html" import sms_message %} +{% from "components/email-message.html" import email_message %} + +{% block page_title %} + Preview your service name – GOV.UK Notify +{% endblock %} + +{% block maincolumn_content %} + +

+ Preview your service name +

+ +
+
+ {{ sms_message( + "{}: we received your payment, thank you".format(service_name), + name="Text message", + recipient='Sent from 40604' + ) }} +
+
+
+
+ {{ email_message( + subject="We received your payment, thank you", + body="Dear Alice Smith,\n\nThank you for…", + from_name=service_name, + from_address=from_address, + name="Email", + ) }} +
+
+ +
+ {{page_footer('Looks good', back_link=url_for(".add_service"))}} +
+ +{% endblock %} diff --git a/app/templates/views/add-service.html b/app/templates/views/add-service.html index 9502ae7d1..f0b4a5ff7 100644 --- a/app/templates/views/add-service.html +++ b/app/templates/views/add-service.html @@ -12,27 +12,21 @@

- {{ heading }} + When people receive notifications, who should they be from?

- Users will see your service name when they receive messages through GOV.UK - Notify: + Be specific. Remember that there might be other people in your + organisation using GOV.UK Notify.

-
    -
  • - at the start of every text message, eg ‘Vehicle tax: we received your - payment, thank you’ -
    • -
  • - as your email sender name -
    • -
-
+ {{ textbox(form.name, hint="You can change this later") }} + + {{ page_footer('Continue') }} +
diff --git a/tests/app/main/views/test_add_service.py b/tests/app/main/views/test_add_service.py index b326bebaa..d8b344ea5 100644 --- a/tests/app/main/views/test_add_service.py +++ b/tests/app/main/views/test_add_service.py @@ -31,6 +31,45 @@ def test_should_add_service_and_redirect_to_next_page(app_, url_for('main.add_service'), data={'name': 'testing the post'}) assert response.status_code == 302 + assert response.location == url_for('main.add_from_address', _external=True) + + +def test_should_confirm_add_service( + app_, + mock_login, + mock_get_services, + api_user_active, + mock_get_user, + mock_get_user_by_email +): + with app_.test_request_context(): + with app_.test_client() as client: + client.login(api_user_active) + with client.session_transaction() as session: + session['service_name'] = 'Renew Your Pet Passport' + response = client.get(url_for('main.add_from_address')) + assert response.status_code == 200 + assert 'Preview your service name' in response.get_data(as_text=True) + assert 'Renew Your Pet Passport' in response.get_data(as_text=True) + assert 'renew.your.pet.passport@notifications.service.gov.uk' in response.get_data(as_text=True) + + +def test_should_add_service_after_confirmation( + app_, + mock_login, + mock_create_service, + mock_get_services, + api_user_active, + mock_get_user, + mock_get_user_by_email +): + with app_.test_request_context(): + with app_.test_client() as client: + client.login(api_user_active) + with client.session_transaction() as session: + session['service_name'] = 'Renew Your Pet Passport' + response = client.post(url_for('main.add_from_address')) + assert response.status_code == 302 assert response.location == url_for('main.service_dashboard', service_id=101, _external=True) assert mock_create_service.called assert mock_get_services.called