Add DAO function to archive a user

For a user to be able to be archived, each service that they are a
member of must have at least one other user who is active and who has
the 'manage-settings' permission.

To archive a user we remove them from all their services and
organisations, remove all permissions that they have and change some of
their details:
- email_address will start with '_archived_<date>'
- the current_session_id is changed (to sign them out of their current
session)
- mobile_number is removed (so we also need to switch their auth type to
email_auth)
- password is changed to a random password
- state is changed to 'inactive'

If any of the steps fail, we rollback all changes.
This commit is contained in:
Katie Smith
2019-05-21 15:53:48 +01:00
parent 844f22bcd0
commit bef24408d0
5 changed files with 182 additions and 6 deletions

View File

@@ -38,6 +38,10 @@ class PermissionDAO(DAOClass):
query = self.Meta.model.query.filter_by(user=user, service=service)
query.delete()
def remove_user_service_permissions_for_all_services(self, user):
query = self.Meta.model.query.filter_by(user=user)
query.delete()
def set_user_service_permission(self, user, service, permissions, _commit=False, replace=False):
try:
if replace:
@@ -59,5 +63,9 @@ class PermissionDAO(DAOClass):
return self.Meta.model.query.filter_by(user_id=user_id)\
.join(Permission.service).filter_by(active=True).all()
def get_permissions_by_user_id_and_service_id(self, user_id, service_id):
return self.Meta.model.query.filter_by(user_id=user_id)\
.join(Permission.service).filter_by(active=True, id=service_id).all()
permission_dao = PermissionDAO()

View File

@@ -17,6 +17,10 @@ def dao_get_active_service_users(service_id):
return query.all()
def dao_get_service_users_by_user_id(user_id):
return ServiceUser.query.filter_by(user_id=user_id).all()
@transactional
def dao_update_service_user(service_user):
db.session.add(service_user)

View File

@@ -1,11 +1,16 @@
from random import (SystemRandom)
from datetime import (datetime, timedelta)
import uuid
from sqlalchemy import func
from sqlalchemy.orm import joinedload
from app import db
from app.models import (User, VerifyCode)
from app.dao.permissions_dao import permission_dao
from app.dao.service_user_dao import dao_get_service_users_by_user_id
from app.dao.dao_utils import transactional
from app.errors import InvalidRequest
from app.models import (EMAIL_AUTH_TYPE, User, VerifyCode)
from app.utils import escape_special_characters
@@ -135,3 +140,49 @@ def get_user_and_accounts(user_id):
joinedload('organisations.services'),
joinedload('services.organisation'),
).one()
@transactional
def dao_archive_user(user):
if not user_can_be_archived(user):
msg = "User cant be removed from a service - check all services have another team member with manage_settings"
raise InvalidRequest(msg, 400)
permission_dao.remove_user_service_permissions_for_all_services(user)
service_users = dao_get_service_users_by_user_id(user.id)
for service_user in service_users:
db.session.delete(service_user)
user.organisations = []
user.auth_type = EMAIL_AUTH_TYPE
user.email_address = get_archived_email_address(user.email_address)
user.mobile_number = None
user.password = str(uuid.uuid4())
# Changing the current_session_id signs the user out
user.current_session_id = '00000000-0000-0000-0000-000000000000'
user.state = 'inactive'
db.session.add(user)
def user_can_be_archived(user):
active_services = [x for x in user.services if x.active]
for service in active_services:
other_active_users = [x for x in service.users if x.state == 'active' and x != user]
if not other_active_users:
return False
if not any('manage_settings' in user.get_permissions(service.id) for user in other_active_users):
# no-one else has manage settings
return False
return True
def get_archived_email_address(email_address):
date = datetime.utcnow().strftime("%Y-%m-%d")
return '_archived_{}_{}'.format(date, email_address)

View File

@@ -137,8 +137,14 @@ class User(db.Model):
def check_password(self, password):
return check_hash(password, self._password)
def get_permissions(self):
def get_permissions(self, service_id=None):
from app.dao.permissions_dao import permission_dao
if service_id:
return [
x.permission for x in permission_dao.get_permissions_by_user_id_and_service_id(self.id, service_id)
]
retval = {}
for x in permission_dao.get_permissions_by_user_id(self.id):
service_id = str(x.service_id)

View File

@@ -1,4 +1,5 @@
from datetime import datetime, timedelta
import uuid
from freezegun import freeze_time
from sqlalchemy.exc import DataError
@@ -6,6 +7,7 @@ from sqlalchemy.orm.exc import NoResultFound
import pytest
from app import db
from app.dao.service_user_dao import dao_get_service_user, dao_update_service_user
from app.dao.users_dao import (
save_model_user,
save_user_attribute,
@@ -17,11 +19,14 @@ from app.dao.users_dao import (
delete_codes_older_created_more_than_a_day_ago,
update_user_password,
count_user_verify_codes,
create_secret_code)
create_secret_code,
user_can_be_archived,
dao_archive_user,
)
from app.errors import InvalidRequest
from app.models import EMAIL_AUTH_TYPE, User, VerifyCode
from app.models import User, VerifyCode
from tests.app.db import create_user
from tests.app.db import create_permissions, create_service, create_template_folder, create_user
@pytest.mark.parametrize('phone_number', [
@@ -168,3 +173,105 @@ def test_create_secret_code_different_subsequent_codes():
def test_create_secret_code_returns_5_digits():
code = create_secret_code()
assert len(str(code)) == 5
@freeze_time('2018-07-07 12:00:00')
def test_dao_archive_user(sample_user, sample_organisation, fake_uuid):
sample_user.current_session_id = fake_uuid
# create 2 services for sample_user to be a member of (each with another active user)
service_1 = create_service(service_name='Service 1')
service_1_user = create_user(email='1@test.com')
service_1.users = [sample_user, service_1_user]
create_permissions(sample_user, service_1, 'manage_settings')
create_permissions(service_1_user, service_1, 'manage_settings', 'view_activity')
service_2 = create_service(service_name='Service 2')
service_2_user = create_user(email='2@test.com')
service_2.users = [sample_user, service_2_user]
create_permissions(sample_user, service_2, 'view_activity')
create_permissions(service_2_user, service_2, 'manage_settings')
# make sample_user an org member
sample_organisation.users = [sample_user]
# give sample_user folder permissions for a service_1 folder
folder = create_template_folder(service_1)
service_user = dao_get_service_user(sample_user.id, service_1.id)
service_user.folders = [folder]
dao_update_service_user(service_user)
dao_archive_user(sample_user)
assert sample_user.get_permissions() == {}
assert sample_user.services == []
assert sample_user.organisations == []
assert sample_user.auth_type == EMAIL_AUTH_TYPE
assert sample_user.email_address == '_archived_2018-07-07_notify@digital.cabinet-office.gov.uk'
assert sample_user.mobile_number is None
assert sample_user.current_session_id == uuid.UUID('00000000-0000-0000-0000-000000000000')
assert sample_user.state == 'inactive'
assert not sample_user.check_password('password')
def test_user_can_be_archived_if_they_do_not_belong_to_any_services(sample_user):
assert sample_user.services == []
assert user_can_be_archived(sample_user)
def test_user_can_be_archived_if_they_do_not_belong_to_any_active_services(sample_user, sample_service):
sample_user.services = [sample_service]
sample_service.active = False
assert len(sample_user.services) == 1
assert user_can_be_archived(sample_user)
def test_user_can_be_archived_if_the_other_service_members_have_the_manage_settings_permission(sample_service):
user_1 = create_user(email='1@test.com')
user_2 = create_user(email='2@test.com')
user_3 = create_user(email='3@test.com')
sample_service.users = [user_1, user_2, user_3]
create_permissions(user_1, sample_service, 'manage_settings')
create_permissions(user_2, sample_service, 'manage_settings', 'view_activity')
create_permissions(user_3, sample_service, 'manage_settings', 'send_emails', 'send_letters', 'send_texts')
assert len(sample_service.users) == 3
assert user_can_be_archived(user_1)
def test_dao_archive_user_raises_error_if_user_cannot_be_archived(sample_user, mocker):
mocker.patch('app.dao.users_dao.user_can_be_archived', return_value=False)
with pytest.raises(InvalidRequest):
dao_archive_user(sample_user.id)
def test_user_cannot_be_archived_if_they_belong_to_a_service_with_no_other_active_users(sample_service):
active_user = create_user(email='1@test.com')
pending_user = create_user(email='2@test.com', state='pending')
inactive_user = create_user(email='3@test.com', state='inactive')
sample_service.users = [active_user, pending_user, inactive_user]
assert len(sample_service.users) == 3
assert not user_can_be_archived(active_user)
def test_user_cannot_be_archived_if_the_other_service_members_do_not_have_the_manage_setting_permission(
sample_service,
):
active_user = create_user(email='1@test.com')
pending_user = create_user(email='2@test.com')
inactive_user = create_user(email='3@test.com')
sample_service.users = [active_user, pending_user, inactive_user]
create_permissions(active_user, sample_service, 'manage_settings')
create_permissions(pending_user, sample_service, 'view_activity')
create_permissions(inactive_user, sample_service, 'send_emails', 'send_letters', 'send_texts')
assert len(sample_service.users) == 3
assert not user_can_be_archived(active_user)