From b29c2a3a623827355ad1533f1d30fd299f4c5da0 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Thu, 28 Mar 2024 11:15:10 -0700 Subject: [PATCH 1/2] debug staging --- app/main/views/verify.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/main/views/verify.py b/app/main/views/verify.py index f6bb47ab7..85c138ea9 100644 --- a/app/main/views/verify.py +++ b/app/main/views/verify.py @@ -9,6 +9,7 @@ from app.extensions import redis_client from app.main import main from app.main.forms import TwoFactorForm from app.models.user import InvitedOrgUser, InvitedUser, User +from app.utils import hilite from app.utils.login import redirect_to_sign_in @@ -67,9 +68,10 @@ def activate_user(user_id): user = User.from_id(user_id) # 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: 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 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)) elif login_gov_invite_data: service_id = login_gov_invite_data["service_id"] + current_app.logger.info(hilite(f"SERVICE_ID={service_id}")) user.add_to_service( service_id, @@ -98,8 +101,11 @@ def activate_user(user_id): invited_org_user = InvitedOrgUser.from_session() if invited_org_user: user_api_client.add_user_to_organization(invited_org_user.organization, user_id) - elif redis_client.get(f"organization-invite-{user.email_address}"): - organization_id = redis_client.get(f"organization-invite-{user.email_address}") + elif redis_client.raw_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( organization_id.decode("utf8"), user_id ) From 9b1c9b8ccf0b30655a1ede7fb15fd2cf0e7b9830 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Thu, 28 Mar 2024 11:35:25 -0700 Subject: [PATCH 2/2] ugh --- app/main/views/verify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/main/views/verify.py b/app/main/views/verify.py index 85c138ea9..1250db150 100644 --- a/app/main/views/verify.py +++ b/app/main/views/verify.py @@ -68,7 +68,7 @@ def activate_user(user_id): user = User.from_id(user_id) # This is the login.gov path - login_gov_invite_data = redis_client.raw_get(f"service-invite-{user.email_address}") + login_gov_invite_data = redis_client.get(f"service-invite-{user.email_address}") if login_gov_invite_data: 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}")) @@ -101,7 +101,7 @@ def activate_user(user_id): invited_org_user = InvitedOrgUser.from_session() if invited_org_user: user_api_client.add_user_to_organization(invited_org_user.organization, user_id) - elif redis_client.raw_get(f"organization-invite-{user.email_address}"): + elif redis_client.get(f"organization-invite-{user.email_address}"): organization_id = redis_client.raw_get( f"organization-invite-{user.email_address}" )