Merge pull request #172 from alphagov/upgrade_notifications_python_client

notifications-python_client upgraded to 0.2.5

app/main/views/dashboard.py

@@ -3,7 +3,7 @@ from flask_login import login_required
 from app.main import main
 from app.main.dao.services_dao import get_service_by_id
 from app.main.dao import templates_dao
-from client.errors import HTTPError
+from notifications_python_client.errors import HTTPError
 from app import job_api_client
 
 

app/main/views/jobs.py

@@ -7,7 +7,7 @@ from flask import (
     abort
 )
 from flask_login import login_required
-from client.errors import HTTPError
+from notifications_python_client.errors import HTTPError
 
 from app import job_api_client
 from app.main import main

app/main/views/new_password.py

@@ -1,4 +1,4 @@
-from flask import (render_template, url_for, redirect, flash)
+from flask import (render_template, url_for, redirect, flash, session)
 
 from app.main import main
 from app.main.dao import users_dao
@@ -26,6 +26,7 @@ def new_password(token):
             'id': user.id,
             'email': user.email_address,
             'password': form.new_password.data}
+        users_dao.activate_user(user)
         return redirect(url_for('main.two_factor'))
     else:
         return render_template('views/new-password.html', token=token, form=form, user=user)

app/main/views/register.py

@@ -11,7 +11,7 @@ from flask import (
 
 from flask.ext.login import current_user
 
-from client.errors import HTTPError
+from notifications_python_client.errors import HTTPError
 
 from app.main import main
 from app.main.dao import users_dao

app/main/views/service_settings.py

@@ -7,7 +7,7 @@ from app.main.dao.services_dao import (
     get_service_by_id, delete_service, update_service)
 from app.main.dao.users_dao import verify_password
 from app.main.forms import ConfirmPasswordForm, ServiceNameForm
-from client.errors import HTTPError
+from notifications_python_client.errors import HTTPError
 
 
 @main.route("/services/<service_id>/service-settings")

app/main/views/sms.py

@@ -17,7 +17,7 @@ from flask import (
 
 from flask_login import login_required
 from werkzeug import secure_filename
-from client.errors import HTTPError
+from notifications_python_client.errors import HTTPError
 
 from app.main import main
 from app.main.forms import CsvUploadForm

app/main/views/templates.py

@@ -7,7 +7,7 @@ from app import job_api_client
 from app.main.dao.services_dao import get_service_by_id
 from app.main.dao import templates_dao as tdao
 from app.main.dao import services_dao as sdao
-from client.errors import HTTPError
+from notifications_python_client.errors import HTTPError
 
 
 @main.route("/services/<service_id>/templates")

app/main/views/verify.py

@@ -6,7 +6,7 @@ from flask import (
     abort
 )
 
-from client.errors import HTTPError
+from notifications_python_client.errors import HTTPError
 
 from flask_login import login_user
 

app/notify_client/api_client.py

@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
-from client.notifications import NotificationsAPIClient
+from notifications_python_client.notifications import NotificationsAPIClient
 
 
 class NotificationsAdminAPIClient(NotificationsAPIClient):

app/notify_client/api_key_api_client.py

@@ -1,4 +1,4 @@
-from client.base import BaseAPIClient
+from notifications_python_client.base import BaseAPIClient
 
 
 class ApiKeyApiClient(BaseAPIClient):

app/notify_client/job_api_client.py

@@ -1,6 +1,6 @@
 import uuid
 
-from client.base import BaseAPIClient
+from notifications_python_client.base import BaseAPIClient
 
 
 class JobApiClient(BaseAPIClient):

app/notify_client/status_api_client.py

@@ -1,4 +1,4 @@
-from client.base import BaseAPIClient
+from notifications_python_client.base import BaseAPIClient
 
 
 class StatusApiClient(BaseAPIClient):

app/notify_client/user_api_client.py

@@ -1,5 +1,5 @@
-from client.notifications import BaseAPIClient
-from client.errors import (
+from notifications_python_client.notifications import BaseAPIClient
+from notifications_python_client.errors import (
     HTTPError,
     InvalidResponse
 )

requirements.txt

@@ -12,6 +12,6 @@ credstash==1.8.0
 boto3==1.2.3
 Pygments==2.0.2
 
-git+https://github.com/alphagov/notifications-python-client.git@0.2.2#egg=notifications-python-client==0.2.2
+git+https://github.com/alphagov/notifications-python-client.git@0.2.5#egg=notifications-python-client==0.2.5
 
 git+https://github.com/alphagov/notifications-utils.git@0.0.3#egg=notifications-utils==0.0.3