feat: 병합된 계정으로 로그인을 시도하는 경우, 또는 소셜 로그인이 실패하는 경우 메시지 노출 추가

Author: MU-Software

app/core/authn/allauth_adapter.py

@@ -95,6 +95,10 @@ def get_frontend_url(self, urlname: str, **kwargs: Any) -> str | None:
         if urlname != "socialaccount_login_error":
             return super().get_frontend_url(urlname, **kwargs)
 
+        if getattr(self.request, "urlconf", None) == "core.account_urls":
+            self.request.session["login_error"] = "social_login_failed"
+            return reverse("account-login", urlconf=self.request.urlconf)
+
         allowed = _allowed_frontend_origins()
         origin: str | None = None
         for header in ("HTTP_X_FRONTEND_DOMAIN", "HTTP_ORIGIN", "HTTP_REFERER"):

app/core/const/account.py

@@ -46,6 +46,14 @@
         "ko": "병합할 계정 정보를 찾을 수 없습니다. 다시 시도해 주세요.",
         "en": "We couldn't find the account to merge. Please try again.",
     },
+    "account_merged": {
+        "ko": "해당 계정은 다른 계정으로 병합되었습니다. 남기신 계정으로 로그인해 주세요.",
+        "en": "That account was merged into another. Please sign in with the account you kept.",
+    },
+    "social_login_failed": {
+        "ko": "소셜 로그인에 실패했습니다. 다시 시도해 주세요.",
+        "en": "Social sign-in failed. Please try again.",
+    },
 }
 EMAIL_MESSAGES = {
     "verification_sent": {

app/user/account_views/account.py

@@ -27,6 +27,7 @@ def account_home(request: HttpRequest) -> HttpResponse:
 def account_login(request: HttpRequest) -> HttpResponse:
     target = login_target(request)
     redirect_if_authenticated(request, target)
+    code = request.session.pop("login_error", None)
     return render(
         request,
         "user/account_login.html",
@@ -35,6 +36,7 @@ def account_login(request: HttpRequest) -> HttpResponse:
             "redirect_url": HEADLESS_PROVIDER_REDIRECT_URL,
             "callback_url": target,
             "process": "login",
+            "error": MERGE_MESSAGES[code]["en" if is_english() else "ko"] if code in MERGE_MESSAGES else None,
         },
     )
 

app/user/account_views/utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from core.middleware.response_exception import ResponseException
-from django.contrib.auth import get_user_model
+from django.contrib.auth import SESSION_KEY, get_user_model, logout
 from django.http import HttpRequest
 from django.shortcuts import redirect
 from django.urls import reverse, reverse_lazy
@@ -16,13 +16,23 @@
 User = get_user_model()
 
 
+def _reject_merged(request: HttpRequest) -> None:
+    uid = request.session.get(SESSION_KEY)
+    if uid and not request.user.is_authenticated and User.objects.filter(pk=uid, merged_to__isnull=False).exists():
+        logout(request)
+        request.session["login_error"] = "account_merged"
+        raise ResponseException(redirect(reverse("account-login")))
+
+
 def check_login(request: HttpRequest) -> None:
+    _reject_merged(request)
     if not request.user.is_authenticated:
         login_url = f"{reverse('account-login')}?{urlencode({'next': request.get_full_path()})}"
         raise ResponseException(redirect(login_url))
 
 
 def redirect_if_authenticated(request: HttpRequest, target: str) -> None:
+    _reject_merged(request)
     if request.user.is_authenticated:
         raise ResponseException(redirect(target))
 

app/user/templates/user/account_login.html

@@ -2,6 +2,7 @@
 {% block title %}{% if en %}Sign in · PyCon Korea{% else %}로그인 · PyCon Korea{% endif %}{% endblock %}
 {% block body %}
   <h1>{% if en %}Sign in to PyCon Korea{% else %}PyCon Korea 계정 로그인{% endif %}</h1>
+  {% if error %}<p class="error">{{ error }}</p>{% endif %}
   <p>{% if en %}Sign in with a social account.{% else %}소셜 계정으로 로그인하세요.{% endif %}</p>
   {% include "user/_provider_forms.html" %}
   <p class="or">{% if en %}or{% else %}또는{% endif %}</p>

app/user/test/merge_view_test.py

@@ -1,8 +1,9 @@
 import pytest
 from allauth.account.models import EmailAddress
+from allauth.core.context import request_context
 from allauth.core.exceptions import ImmediateHttpResponse
 from allauth.socialaccount.models import SocialAccount, SocialLogin
-from core.authn.allauth_adapter import SocialAccountLoggingAdapter
+from core.authn.allauth_adapter import PyConKRHeadlessAdapter, SocialAccountLoggingAdapter
 from core.const.account import MERGE_SOURCE_SESSION_KEY
 from django.urls import reverse
 from shop.order.models import Order
@@ -107,22 +108,15 @@ def test_start_lists_provider_forms(client, target_user):
     assert b'name="process" value="connect"' in response.content
 
 
-def test_merged_account_session_is_logged_out(client, source_user, target_user):
+def test_merged_account_session_logs_out_and_shows_notice(client, source_user, target_user):
     UserMergeHistory.objects.create(source=source_user, target=target_user).merge()
     client.force_login(source_user)  # 병합된(dead) 계정으로 남은 세션
 
-    response = client.get(reverse("account-home"))
+    response = client.get(reverse("account-home"), follow=True)
 
-    assert response.status_code == 302
-    assert "merged=1" in response["Location"]
+    assert response.redirect_chain[-1][0] == reverse("account-login")
     assert "_auth_user_id" not in client.session
-
-
-def test_login_shows_merged_notice(client, db):
-    response = client.get(reverse("account-login") + "?merged=1")
-
-    assert response.status_code == 200
-    assert "병합".encode() in response.content
+    assert "병합".encode() in response.content  # login_error 플래시가 error 로 렌더
 
 
 # ---- AccountLoginView ---------------------------------------------------------
@@ -341,6 +335,18 @@ def test_pre_social_login_ignores_plain_login(rf, source_user, target_user):
     assert MERGE_SOURCE_SESSION_KEY not in request.session
 
 
+def test_social_login_error_on_accounts_host_routes_to_login(rf):
+    request = rf.get("/")
+    request.urlconf = "core.account_urls"  # accounts 호스트 = HostUrlconfMiddleware 가 세팅
+    request.session = {}
+
+    with request_context(request):
+        url = PyConKRHeadlessAdapter().get_frontend_url("socialaccount_login_error")
+
+    assert url == reverse("account-login", urlconf="core.account_urls")
+    assert request.session["login_error"] == "social_login_failed"
+
+
 # ---- 다국어 (en) --------------------------------------------------------------