Merge pull request #446 from alphagov/fix_link_bug

Updated notifications_utils version and associated code. Added email …

app/main/views/jobs.py

@@ -12,7 +12,7 @@ from flask import (
 )
 from flask_login import login_required
 from werkzeug.datastructures import MultiDict
-from utils.template import Template
+from notifications_utils.template import Template
 
 from app import (
     job_api_client,

app/main/views/new_password.py

@@ -11,7 +11,7 @@ from app import user_api_client
 
 @main.route('/new-password/<path:token>', methods=['GET', 'POST'])
 def new_password(token):
-    from utils.url_safe_token import check_token
+    from notifications_utils.url_safe_token import check_token
     try:
         token_data = check_token(token, current_app.config['SECRET_KEY'], current_app.config['DANGEROUS_SALT'],
                                  current_app.config['TOKEN_MAX_AGE_SECONDS'])

app/main/views/send.py

@@ -17,8 +17,8 @@ from flask import (
 )
 
 from flask_login import login_required, current_user
-from utils.template import Template
-from utils.recipients import RecipientCSV, first_column_heading, validate_and_format_phone_number
+from notifications_utils.template import Template
+from notifications_utils.recipients import RecipientCSV, first_column_heading, validate_and_format_phone_number
 
 from app.main import main
 from app.main.forms import CsvUploadForm

app/main/views/styleguide.py

@@ -1,7 +1,7 @@
 from flask import render_template, current_app, abort
 from flask_wtf import Form
 from wtforms import StringField, PasswordField, TextAreaField, FileField, validators
-from utils.template import Template
+from notifications_utils.template import Template
 from app.main import main
 
 

app/main/views/templates.py

@@ -1,7 +1,7 @@
 from flask import request, render_template, redirect, url_for, flash, abort
 from flask_login import login_required
 
-from utils.template import Template
+from notifications_utils.template import Template
 
 from app.main import main
 from app.utils import user_has_permissions

app/main/views/verify.py

@@ -15,6 +15,7 @@ from itsdangerous import SignatureExpired
 from flask_login import login_user
 
 from notifications_python_client.errors import HTTPError
+from notifications_utils.url_safe_token import check_token
 
 from app.main import main
 from app.main.forms import TwoFactorForm
@@ -47,7 +48,6 @@ def verify():
 
 @main.route('/verify-email/<token>')
 def verify_email(token):
-    from utils.url_safe_token import check_token
     try:
         token_data = check_token(token,
                                  current_app.config['SECRET_KEY'],