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

debug staging

Browse Source
This commit is contained in:
Kenneth Kehl
2024-03-28 11:15:10 -07:00
parent 245bcaecb3
commit b29c2a3a62
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/main/views/verify.py
View File

@@ -9,6 +9,7 @@ from app.extensions import redis_client
from app.main import main from app.main import main
from app.main.forms import TwoFactorForm from app.main.forms import TwoFactorForm
from app.models.user import InvitedOrgUser, InvitedUser, User from app.models.user import InvitedOrgUser, InvitedUser, User
from app.utils import hilite
from app.utils.login import redirect_to_sign_in from app.utils.login import redirect_to_sign_in
@@ -67,9 +68,10 @@ def activate_user(user_id):
user = User.from_id(user_id) user = User.from_id(user_id)
# This is the login.gov path # This is the login.gov path
login_gov_invite_data = redis_client.get(f"service-invite-{user.email_address}") login_gov_invite_data = redis_client.raw_get(f"service-invite-{user.email_address}")
if login_gov_invite_data: if login_gov_invite_data:
login_gov_invite_data = json.loads(login_gov_invite_data.decode("utf8")) login_gov_invite_data = json.loads(login_gov_invite_data.decode("utf8"))
current_app.logger.info(hilite(f"LOGIN_GOV_INVITE_DATA {login_gov_invite_data}"))
# This is the deprecated path for organization invites where we get id from session # This is the deprecated path for organization invites where we get id from session
session["current_session_id"] = user.current_session_id session["current_session_id"] = user.current_session_id
@@ -85,6 +87,7 @@ def activate_user(user_id):
return redirect(url_for("main.service_dashboard", service_id=service_id)) return redirect(url_for("main.service_dashboard", service_id=service_id))
elif login_gov_invite_data: elif login_gov_invite_data:
service_id = login_gov_invite_data["service_id"] service_id = login_gov_invite_data["service_id"]
current_app.logger.info(hilite(f"SERVICE_ID={service_id}"))
user.add_to_service( user.add_to_service(
service_id, service_id,
@@ -98,8 +101,11 @@ def activate_user(user_id):
invited_org_user = InvitedOrgUser.from_session() invited_org_user = InvitedOrgUser.from_session()
if invited_org_user: if invited_org_user:
user_api_client.add_user_to_organization(invited_org_user.organization, user_id) user_api_client.add_user_to_organization(invited_org_user.organization, user_id)
elif redis_client.get(f"organization-invite-{user.email_address}"): elif redis_client.raw_get(f"organization-invite-{user.email_address}"):
organization_id = redis_client.get(f"organization-invite-{user.email_address}") organization_id = redis_client.raw_get(
f"organization-invite-{user.email_address}"
)
current_app.logger.info(hilite(f"ORGANIZATION_ID FROM REDIS {organization_id}"))
user_api_client.add_user_to_organization( user_api_client.add_user_to_organization(
organization_id.decode("utf8"), user_id organization_id.decode("utf8"), user_id
) )