darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-07 16:18:25 -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.main.forms import AddServiceForm
from app.notify_client.models import InvitedUser 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']) @main.route("/add-service", methods=['GET', 'POST'])
@@ -25,7 +28,9 @@ def add_service():
# if invited user add to service and redirect to dashboard # if invited user add to service and redirect to dashboard
user = users_dao.get_user_by_id(session['user_id']) user = users_dao.get_user_by_id(session['user_id'])
service_id = invited_user['service'] 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) 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))

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

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

7
app/notify_client/invite_api_client.py
View File

@@ -31,7 +31,7 @@ class InviteApiClient(BaseAPIClient):
invited_users = self._get_invited_users(invites) invited_users = self._get_invited_users(invites)
return invited_users return invited_users
def accept_invite(self, token): def check_token(self, token):
resp = self.get(url='/invite/{}'.format(token)) resp = self.get(url='/invite/{}'.format(token))
return InvitedUser(**resp['data']) return InvitedUser(**resp['data'])
@@ -40,6 +40,11 @@ class InviteApiClient(BaseAPIClient):
self.post(url='/service/{0}/invite/{1}'.format(service_id, invited_user_id), self.post(url='/service/{0}/invite/{1}'.format(service_id, invited_user_id),
data=data) data=data)
def accept_invite(self, service_id, invited_user_id):
data = {'status': 'accepted'}
self.post(url='/service/{0}/invite/{1}'.format(service_id, invited_user_id),
data=data)
def _get_invited_users(self, invites): def _get_invited_users(self, invites):
invited_users = [] invited_users = []
for invite in invites: for invite in invites:

4
app/notify_client/user_api_client.py
View File

@@ -94,9 +94,9 @@ class UserApiClient(BaseAPIClient):
resp = self.get(endpoint) resp = self.get(endpoint)
return [User(data) for data in resp['data']] return [User(data) for data in resp['data']]
def add_user_to_service(self, service_id, user_id, invited_user): def add_user_to_service(self, service_id, user_id, permissions):
endpoint = '/service/{}/users/{}'.format(service_id, user_id) endpoint = '/service/{}/users/{}'.format(service_id, user_id)
resp = self.post(endpoint, data=invited_user.serialize(permissions_as_string=True)) resp = self.post(endpoint, data={'permissions': permissions})
return User(resp['data'], max_failed_login_count=self.max_failed_login_count) return User(resp['data'], max_failed_login_count=self.max_failed_login_count)
def set_user_permissions(self, user_id, service_id, permissions): def set_user_permissions(self, user_id, service_id, permissions):

17
app/templates/views/cancelled-invitation.html Normal file
View File

@@ -0,0 +1,17 @@
{% extends "withoutnav_template.html" %}
{% block page_title %}Invitation has been cancelled{% endblock %}
{% block maincolumn_content %}
<div class="grid-row">
<div class="column-two-thirds">
<h1 class="heading-large">
The invitation you were sent has been cancelled
</h1>
<p>
{{ from_user }} decided to cancel this invitation.
</p>
<p>
If you need access to {{ service_name }}, you’ll have to ask them to invite you again.
</p>
</div>
</div>
{% endblock %}

4
tests/__init__.py
View File

@@ -48,12 +48,12 @@ def api_key_json(id_, name, expiry_date=None):
} }
def invite_json(id, from_user, service_id, email_address, permissions, created_at): def invite_json(id, from_user, service_id, email_address, permissions, created_at, status):
return {'id': id, return {'id': id,
'from_user': from_user, 'from_user': from_user,
'service': service_id, 'service': service_id,
'email_address': email_address, 'email_address': email_address,
'status': 'pending', 'status': status,
'permissions': permissions, 'permissions': permissions,
'created_at': created_at 'created_at': created_at
} }

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

@@ -2,27 +2,33 @@ from flask import url_for
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
import app
from tests.conftest import sample_invite as create_sample_invite
from tests.conftest import mock_check_invite_token as mock_check_token_invite
def test_existing_user_accept_invite_calls_api_and_redirects_to_dashboard(app_, def test_existing_user_accept_invite_calls_api_and_redirects_to_dashboard(app_,
service_one, service_one,
api_user_active, api_user_active,
sample_invite, sample_invite,
sample_invited_user, mock_check_invite_token,
mock_accept_invite,
mock_get_user_by_email, mock_get_user_by_email,
mock_add_user_to_service): mock_add_user_to_service,
mock_accept_invite):
expected_service = service_one['id'] expected_service = service_one['id']
expected_redirect_location = 'http://localhost/services/{}/dashboard'.format(expected_service) expected_redirect_location = 'http://localhost/services/{}/dashboard'.format(expected_service)
expected_permissions = ['send_messages', 'manage_service', 'manage_api_keys']
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken')) response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'))
mock_accept_invite.assert_called_with('thisisnotarealtoken') mock_check_invite_token.assert_called_with('thisisnotarealtoken')
mock_get_user_by_email.assert_called_with('invited_user@test.gov.uk') mock_get_user_by_email.assert_called_with('invited_user@test.gov.uk')
mock_add_user_to_service.assert_called_with(expected_service, api_user_active.id, sample_invited_user) mock_add_user_to_service.assert_called_with(expected_service, api_user_active.id, expected_permissions)
mock_accept_invite.assert_called_with(expected_service, sample_invite['id'])
assert response.status_code == 302 assert response.status_code == 302
assert response.location == expected_redirect_location assert response.location == expected_redirect_location
@@ -32,21 +38,22 @@ def test_existing_signed_out_user_accept_invite_redirects_to_sign_in(app_,
service_one, service_one,
api_user_active, api_user_active,
sample_invite, sample_invite,
sample_invited_user, mock_check_invite_token,
mock_accept_invite,
mock_get_user_by_email, mock_get_user_by_email,
mock_add_user_to_service): mock_add_user_to_service,
mock_accept_invite):
expected_service = service_one['id'] expected_service = service_one['id']
expected_permissions = ['send_messages', 'manage_service', 'manage_api_keys']
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'), follow_redirects=True) response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'), follow_redirects=True)
mock_accept_invite.assert_called_with('thisisnotarealtoken') mock_check_invite_token.assert_called_with('thisisnotarealtoken')
mock_get_user_by_email.assert_called_with('invited_user@test.gov.uk') mock_get_user_by_email.assert_called_with('invited_user@test.gov.uk')
mock_add_user_to_service.assert_called_with(expected_service, api_user_active.id, sample_invited_user) mock_add_user_to_service.assert_called_with(expected_service, api_user_active.id, expected_permissions)
mock_accept_invite.assert_called_with(expected_service, sample_invite['id'])
assert response.status_code == 200 assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
@@ -55,10 +62,10 @@ def test_existing_signed_out_user_accept_invite_redirects_to_sign_in(app_,
def test_new_user_accept_invite_calls_api_and_redirects_to_registration(app_, def test_new_user_accept_invite_calls_api_and_redirects_to_registration(app_,
service_one, service_one,
sample_invite, mock_check_invite_token,
mock_accept_invite,
mock_dont_get_user_by_email, mock_dont_get_user_by_email,
mock_add_user_to_service): mock_add_user_to_service,
mock_accept_invite):
expected_redirect_location = 'http://localhost/register-from-invite' expected_redirect_location = 'http://localhost/register-from-invite'
@@ -67,21 +74,40 @@ def test_new_user_accept_invite_calls_api_and_redirects_to_registration(app_,
response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken')) response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'))
mock_accept_invite.assert_called_with('thisisnotarealtoken') mock_check_invite_token.assert_called_with('thisisnotarealtoken')
mock_dont_get_user_by_email.assert_called_with('invited_user@test.gov.uk') mock_dont_get_user_by_email.assert_called_with('invited_user@test.gov.uk')
assert response.status_code == 302 assert response.status_code == 302
assert response.location == expected_redirect_location assert response.location == expected_redirect_location
def test_cancelled_invited_user_accepts_invited_redirect_to_cancelled_invitation(app_,
service_one,
mocker,
mock_get_user,
mock_get_service
):
with app_.test_request_context():
with app_.test_client() as client:
cancelled_invitation = create_sample_invite(mocker, service_one, status='cancelled')
mock_check_token_invite(mocker, cancelled_invitation)
response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'))
app.invite_api_client.check_token.assert_called_with('thisisnotarealtoken')
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'The invitation you were sent has been cancelled'
def test_new_user_accept_invite_completes_new_registration_redirects_to_verify(app_, def test_new_user_accept_invite_completes_new_registration_redirects_to_verify(app_,
service_one, service_one,
sample_invite, sample_invite,
mock_accept_invite, mock_check_invite_token,
mock_dont_get_user_by_email, mock_dont_get_user_by_email,
mock_register_user, mock_register_user,
mock_send_verify_code, mock_send_verify_code,
mock_add_user_to_service): mock_add_user_to_service,
mock_accept_invite):
expected_service = service_one['id'] expected_service = service_one['id']
expected_email = sample_invite['email_address'] expected_email = sample_invite['email_address']
@@ -122,8 +148,7 @@ def test_new_user_accept_invite_completes_new_registration_redirects_to_verify(a
def test_new_invited_user_verifies_and_added_to_service(app_, def test_new_invited_user_verifies_and_added_to_service(app_,
service_one, service_one,
sample_invite, sample_invite,
sample_invited_user, mock_check_invite_token,
mock_accept_invite,
mock_dont_get_user_by_email, mock_dont_get_user_by_email,
mock_register_user, mock_register_user,
mock_send_verify_code, mock_send_verify_code,
@@ -131,6 +156,7 @@ def test_new_invited_user_verifies_and_added_to_service(app_,
mock_get_user, mock_get_user,
mock_update_user, mock_update_user,
mock_add_user_to_service, mock_add_user_to_service,
mock_accept_invite,
mock_get_service, mock_get_service,
mock_get_service_templates, mock_get_service_templates,
mock_get_jobs): mock_get_jobs):
@@ -156,9 +182,12 @@ def test_new_invited_user_verifies_and_added_to_service(app_,
# when they post codes back to admin user should be added to # when they post codes back to admin user should be added to
# service and sent on to dash board # service and sent on to dash board
expected_permissions = ['send_messages', 'manage_service', 'manage_api_keys']
with client.session_transaction() as session: with client.session_transaction() as session:
new_user_id = session['user_id'] new_user_id = session['user_id']
mock_add_user_to_service.assert_called_with(data['service'], new_user_id, sample_invited_user) mock_add_user_to_service.assert_called_with(data['service'], new_user_id, expected_permissions)
mock_accept_invite.assert_called_with(data['service'], sample_invite['id'])
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
element = page.find('h2', class_='navigation-service-name').find('a') element = page.find('h2', class_='navigation-service-name').find('a')

19
tests/conftest.py
View File

@@ -585,7 +585,7 @@ def mock_s3_upload(mocker):
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def sample_invite(mocker, service_one): def sample_invite(mocker, service_one, status='pending'):
import datetime import datetime
id = str(uuid.uuid4()) id = str(uuid.uuid4())
from_user = service_one['users'][0] from_user = service_one['users'][0]
@@ -593,7 +593,7 @@ def sample_invite(mocker, service_one):
service_id = service_one['id'] service_id = service_one['id']
permissions = 'send_messages,manage_service,manage_api_keys' permissions = 'send_messages,manage_service,manage_api_keys'
created_at = str(datetime.datetime.now()) created_at = str(datetime.datetime.now())
return invite_json(id, from_user, service_id, email_address, permissions, created_at) return invite_json(id, from_user, service_id, email_address, permissions, created_at, status)
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
@@ -629,15 +629,22 @@ def mock_get_invites_for_service(mocker, service_one, sample_invite):
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def mock_accept_invite(mocker, sample_invite): def mock_check_invite_token(mocker, sample_invite):
def _accept_token(token): def _check_token(token):
return InvitedUser(**sample_invite) return InvitedUser(**sample_invite)
return mocker.patch('app.invite_api_client.accept_invite', side_effect=_accept_token) return mocker.patch('app.invite_api_client.check_token', side_effect=_check_token)
@pytest.fixture(scope='function')
def mock_accept_invite(mocker, sample_invite):
def _accept(service_id, invite_id):
return InvitedUser(**sample_invite)
return mocker.patch('app.invite_api_client.accept_invite', side_effect=_accept)
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def mock_add_user_to_service(mocker, service_one, api_user_active): def mock_add_user_to_service(mocker, service_one, api_user_active):
def _add_user(service_id, user_id, invited_user): def _add_user(service_id, user_id, permissions):
return api_user_active return api_user_active
return mocker.patch('app.user_api_client.add_user_to_service', side_effect=_add_user) return mocker.patch('app.user_api_client.add_user_to_service', side_effect=_add_user)