darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 07:46:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Flash message to confirm invitation accepted and user has been

Browse Source 
added to service.
This commit is contained in:
Adam Shimali
2016-03-08 08:18:41 +00:00
parent 614e454186
commit 9bc5d08d52
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/add_service.py
View File

@@ -30,8 +30,6 @@ def add_service():
service_id = invited_user['service'] service_id = invited_user['service']
user_api_client.add_user_to_service(service_id, user.id, invitation.permissions) user_api_client.add_user_to_service(service_id, user.id, invitation.permissions)
invite_api_client.accept_invite(service_id, invitation.id) invite_api_client.accept_invite(service_id, invitation.id)
session.pop('invited_user', None)
return redirect(url_for('main.service_dashboard', service_id=service_id)) return redirect(url_for('main.service_dashboard', service_id=service_id))
form = AddServiceForm(services_dao.find_all_service_names) form = AddServiceForm(services_dao.find_all_service_names)

16
app/main/views/dashboard.py
View File

@@ -1,4 +1,10 @@
from flask import (abort, render_template, session) from flask import (
abort,
render_template,
session,
flash
)
from flask_login import login_required from flask_login import login_required
from app.main import main from app.main import main
from app.main.dao.services_dao import get_service_by_id from app.main.dao.services_dao import get_service_by_id
@@ -6,8 +12,6 @@ from app.main.dao import templates_dao
from notifications_python_client.errors import HTTPError from notifications_python_client.errors import HTTPError
from app import job_api_client from app import job_api_client
from app.utils import user_has_permissions
@main.route("/services/<service_id>/dashboard") @main.route("/services/<service_id>/dashboard")
@login_required @login_required
@@ -24,6 +28,12 @@ def service_dashboard(service_id):
service = get_service_by_id(service_id) service = get_service_by_id(service_id)
session['service_name'] = service['data']['name'] session['service_name'] = service['data']['name']
session['service_id'] = service['data']['id'] session['service_id'] = service['data']['id']
if session.get('invited_user'):
session.pop('invited_user', None)
service_name = service['data']['name']
message = 'You have sucessfully accepted your invitation and been added to {}'.format(service_name)
flash(message, 'default_with_tick')
except HTTPError as e: except HTTPError as e:
if e.status_code == 404: if e.status_code == 404:
abort(404) abort(404)

2
app/main/views/invites.py
View File

@@ -30,6 +30,7 @@ def accept_invite(token):
service_name=service['name']) service_name=service['name'])
existing_user = user_api_client.get_user_by_email(invited_user.email_address) existing_user = user_api_client.get_user_by_email(invited_user.email_address)
session['invited_user'] = invited_user.serialize()
if existing_user: if existing_user:
user_api_client.add_user_to_service(invited_user.service, user_api_client.add_user_to_service(invited_user.service,
@@ -38,7 +39,6 @@ def accept_invite(token):
invite_api_client.accept_invite(invited_user.service, invited_user.id) invite_api_client.accept_invite(invited_user.service, invited_user.id)
return redirect(url_for('main.service_dashboard', service_id=invited_user.service)) return redirect(url_for('main.service_dashboard', service_id=invited_user.service))
else: else:
session['invited_user'] = invited_user.serialize()
return redirect(url_for('main.register_from_invite')) return redirect(url_for('main.register_from_invite'))
except HTTPError as e: except HTTPError as e:

3
tests/app/main/views/test_accept_invite.py
View File

@@ -194,3 +194,6 @@ def test_new_invited_user_verifies_and_added_to_service(app_,
assert element.text == 'Test Service' assert element.text == 'Test Service'
service_link = element.attrs['href'] service_link = element.attrs['href']
assert service_link == '/services/{}/dashboard'.format(service_one['id']) assert service_link == '/services/{}/dashboard'.format(service_one['id'])
flash_banner = page.find('div', class_='banner-default-with-tick').string.strip()
assert flash_banner == 'You have sucessfully accepted your invitation and been added to Test Service'