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

Invites are now working.

Browse Source 
Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-11-07 08:37:45 -05:00
parent 95a39cfd31
commit 14bbabcab7
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,9 +38,9 @@ def accept_invite(token):
)
if invited_user.status == "accepted":
session.pop("invited_user_id", None)
service = Service.from_id(invited_user.service)
service = Service.from_id(invited_user.service_id)
return redirect(
url_for("main.service_dashboard", service_id=invited_user.service)
url_for("main.service_dashboard", service_id=invited_user.service_id)
)
session["invited_user_id"] = invited_user.id

15
app/main/views/register.py
View File

@@ -186,7 +186,7 @@ def set_up_your_profile():
invite_data = redis_client.get(f"invitedata-{state}")
invite_data = json.loads(invite_data)
debug_msg(f"final state {invite_data}")
invited_user_id = invite_data["id"]
invited_user_id = invite_data["invited_user_id"]
invited_user_email_address = get_invited_user_email_address(invited_user_id)
debug_msg(f"email address from the invite_date is {invited_user_email_address}")
check_invited_user_email_address_matches_expected(
@@ -195,7 +195,7 @@ def set_up_your_profile():
invited_user_accept_invite(invited_user_id)
debug_msg(
f"accepted invite user {invited_user_email_address} to service {invite_data['service']}"
f"accepted invite user {invited_user_email_address} to service {invite_data['service_id']}"
)
# We need to avoid taking a second trip through the login.gov code because we cannot pull the
# access token twice. So once we retrieve these values, let's park them in redis for 15 minutes
@@ -230,16 +230,19 @@ def set_up_your_profile():
activate_user(user["id"])
debug_msg("activated user")
usr = User.from_id(user["id"])
usr.add_to_service(
invite_data["service"],
invite_data["service_id"],
invite_data["permissions"],
invite_data["folder_permissions"],
invite_data["from_user"],
invite_data["from_user_id"],
)
debug_msg(
f"Added user {usr.email_address} to service {invite_data['service_id']}"
)
debug_msg(f"Added user {usr.email_address} to service {invite_data['service']}")
# notify-admin-1766
# redirect new users to templates area of new service instead of dashboard
service_id = invite_data["service"]
service_id = invite_data["service_id"]
url = url_for(".service_dashboard", service_id=service_id)
url = f"{url}/templates"
return redirect(url)

3
app/notify_client/invite_api_client.py
View File

@@ -62,7 +62,8 @@ class InviteApiClient(NotifyAdminAPIClient):
resp_data = resp["data"]
invite_data_key = f"invitedata-{unquote(state)}"
redis_invite_data = json.dumps(resp_data)
redis_invite_data = resp["invite"]
redis_invite_data = json.dumps(redis_invite_data)
redis_client.set(invite_data_key, redis_invite_data)
return resp_data

2
app/notify_client/user_api_client.py
View File

@@ -168,7 +168,7 @@ class UserApiClient(NotifyAdminAPIClient):
@cache.delete("user-{user_id}")
def add_user_to_service(self, service_id, user_id, permissions, folder_permissions):
# permissions passed in are the combined UI permissions, not DB permissions
endpoint = "/service/{}/users/{}".format(service_id, user_id)
endpoint = f"/service/{service_id}/users/{user_id}"
data = {
"permissions": [
{"permission": x}