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

Merge pull request #234 from alphagov/invite-permissions-status

Browse Source 
[WIP] Add call to api to update invitation to accepted.
This commit is contained in:
minglis
2016-03-04 16:18:20 +00:00
parent 8a46031203 41b08b7ca1
commit 48a8be9ea4
8 changed files with 128 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,10 @@ from app.main.dao import services_dao, users_dao
from app.main.forms import AddServiceForm
from app.notify_client.models import InvitedUser
from app import user_api_client
from app import (
invite_api_client,
user_api_client
)
@main.route("/add-service", methods=['GET', 'POST'])
@@ -25,7 +28,9 @@ def add_service():
# if invited user add to service and redirect to dashboard
user = users_dao.get_user_by_id(session['user_id'])
service_id = invited_user['service']
user_api_client.add_user_to_service(service_id, user.id, invitation)
user_api_client.add_user_to_service(service_id, user.id, invitation.permissions)
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))

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

@@ -1,10 +1,15 @@
from flask import (
redirect,
url_for,
session
session,
abort,
render_template
)
from notifications_python_client.errors import HTTPError
from app.main import main
from app.main.dao.services_dao import get_service_by_id_or_404
from app import (
invite_api_client,
user_api_client
@@ -14,14 +19,30 @@ from app import (
@main.route("/invitation/<token>")
def accept_invite(token):
invited_user = invite_api_client.accept_invite(token)
existing_user = user_api_client.get_user_by_email(invited_user.email_address)
try:
if existing_user:
user_api_client.add_user_to_service(invited_user.service,
existing_user.id,
invited_user)
return redirect(url_for('main.service_dashboard', service_id=invited_user.service))
else:
session['invited_user'] = invited_user.serialize()
return redirect(url_for('main.register_from_invite'))
invited_user = invite_api_client.check_token(token)
if invited_user.status == 'cancelled':
from_user = user_api_client.get_user(invited_user.from_user)
service = get_service_by_id_or_404(invited_user.service)
return render_template('views/cancelled-invitation.html',
from_user=from_user.name,
service_name=service['name'])
existing_user = user_api_client.get_user_by_email(invited_user.email_address)
if existing_user:
user_api_client.add_user_to_service(invited_user.service,
existing_user.id,
invited_user.permissions)
invite_api_client.accept_invite(invited_user.service, invited_user.id)
return redirect(url_for('main.service_dashboard', service_id=invited_user.service))
else:
session['invited_user'] = invited_user.serialize()
return redirect(url_for('main.register_from_invite'))
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e