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

Refactor model to put add_to… methods on user

Browse Source 
An invited user can’t be added to an organisation or service, only a
real user can. So the methods to do this should be on the user model,
and take the details of the invite as arguments.
This commit is contained in:
Chris Hill-Scott
2019-06-27 15:48:29 +01:00
parent d344bc7006
commit 6026ce3f8d
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,11 @@ def accept_invite(token):
invited_user.auth_type == 'email_auth'
):
existing_user.update(auth_type=invited_user.auth_type)
invited_user.add_to_service(existing_user_id=existing_user.id)
existing_user.add_to_service(
service_id=invited_user.service,
permissions=invited_user.permissions,
folder_permissions=invited_user.folder_permissions,
)
return redirect(url_for('main.service_dashboard', service_id=service.id))
else:
return redirect(url_for('main.register_from_invite'))
@@ -105,7 +109,7 @@ def accept_org_invite(token):
if existing_user:
invited_org_user.accept_invite()
if existing_user not in organisation_users:
invited_org_user.add_to_organisation(existing_user.id)
existing_user.add_to_organisation(organisation_id=invited_org_user.organisation)
return redirect(url_for('main.organisation_dashboard', org_id=invited_org_user.organisation))
else:
return redirect(url_for('main.register_from_org_invite'))