From 5559f112db9de452ddbedd87756fe2e890113ca1 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Mon, 15 Aug 2022 16:21:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=A4=8D=E5=90=88500=20(#8743)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: feng626 <1304903146@qq.com>
---
 apps/authentication/api/login_confirm.py | 5 ++++-
 apps/authentication/errors/redirect.py   | 8 +++++++-
 apps/authentication/mixins.py            | 5 ++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/apps/authentication/api/login_confirm.py b/apps/authentication/api/login_confirm.py
index 5bddda4e3..866964677 100644
--- a/apps/authentication/api/login_confirm.py
+++ b/apps/authentication/api/login_confirm.py
@@ -22,7 +22,10 @@ class TicketStatusApi(mixins.AuthMixin, APIView):
             self.request.session['auth_third_party_done'] = 1
             return Response({"msg": "ok"})
         except errors.LoginConfirmOtherError as e:
-            self.send_auth_signal(success=False, user=request.user, username=request.user.name, reason=e.as_data().get('msg'))
+            reason = e.msg
+            username = e.username
+            self.send_auth_signal(success=False, username=username, reason=reason)
+            # 若为三方登录，此时应退出登录
             auth_logout(request)
             return Response(e.as_data(), status=200)
         except errors.NeedMoreInfoError as e:
diff --git a/apps/authentication/errors/redirect.py b/apps/authentication/errors/redirect.py
index bf334133d..466ec708d 100644
--- a/apps/authentication/errors/redirect.py
+++ b/apps/authentication/errors/redirect.py
@@ -69,10 +69,16 @@ class LoginConfirmWaitError(LoginConfirmBaseError):
 class LoginConfirmOtherError(LoginConfirmBaseError):
     error = 'login_confirm_error'
 
-    def __init__(self, ticket_id, status):
+    def __init__(self, ticket_id, status, username):
+        self.username = username
         msg = const.login_confirm_error_msg.format(status)
         super().__init__(ticket_id=ticket_id, msg=msg)
 
+    def as_data(self):
+        ret = super().as_data()
+        ret['data']['username'] = self.username
+        return ret
+
 
 class PasswordTooSimple(NeedRedirectError):
     default_code = 'passwd_too_simple'
diff --git a/apps/authentication/mixins.py b/apps/authentication/mixins.py
index 739048d75..7341b4bd1 100644
--- a/apps/authentication/mixins.py
+++ b/apps/authentication/mixins.py
@@ -377,7 +377,10 @@ class AuthACLMixin:
             raise errors.LoginConfirmWaitError(ticket.id)
         else:
             # rejected, closed
-            raise errors.LoginConfirmOtherError(ticket.id, ticket.get_state_display())
+            ticket_id = ticket.id
+            status = ticket.get_state_display()
+            username = ticket.applicant.username
+            raise errors.LoginConfirmOtherError(ticket_id, status, username)
 
     def get_ticket(self):
         from tickets.models import ApplyLoginTicket