From 0a0b9dbeacbfba7d21556f8bfd8860034c6392af Mon Sep 17 00:00:00 2001 From: duckduckgrayduck <102841251+duckduckgrayduck@users.noreply.github.com> Date: Wed, 20 May 2026 14:05:27 -0500 Subject: [PATCH 1/2] google_oauthflow_fix --- squarelet/users/adapters.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/squarelet/users/adapters.py b/squarelet/users/adapters.py index 703e9c9e..b5a8a3e2 100644 --- a/squarelet/users/adapters.py +++ b/squarelet/users/adapters.py @@ -232,7 +232,13 @@ def get_connect_redirect_url(self, request, socialaccount): """ Redirect to the user detail page after connecting a social account. """ - return reverse("users:detail", kwargs={"username": request.user.username}) + if request.user.is_authenticated and request.user.username: + return reverse("users:detail", kwargs={"username": request.user.username}) + messages.warning( + request, + "Your session expired. Please sign in again to connect your Google account.", + ) + return reverse("account_login") class MfaAdapter(DefaultMFAAdapter): From 9132d833af9004a8aa535dd197145bf8895c1dcb Mon Sep 17 00:00:00 2001 From: duckduckgrayduck <102841251+duckduckgrayduck@users.noreply.github.com> Date: Wed, 20 May 2026 14:12:28 -0500 Subject: [PATCH 2/2] Pylint fix --- squarelet/users/adapters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/squarelet/users/adapters.py b/squarelet/users/adapters.py index b5a8a3e2..89b8cfe5 100644 --- a/squarelet/users/adapters.py +++ b/squarelet/users/adapters.py @@ -236,7 +236,8 @@ def get_connect_redirect_url(self, request, socialaccount): return reverse("users:detail", kwargs={"username": request.user.username}) messages.warning( request, - "Your session expired. Please sign in again to connect your Google account.", + "Your session expired. Please sign in again" + "to connect your Google account.", ) return reverse("account_login")