[Update] 修改登录工单

apps/authentication/api/login_confirm.py

@@ -4,6 +4,7 @@ from rest_framework.generics import UpdateAPIView
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from django.shortcuts import get_object_or_404
+from django.utils.translation import ugettext as _
 
 from common.utils import get_logger, get_object_or_none
 from common.permissions import IsOrgAdmin
@@ -11,7 +12,7 @@ from ..models import LoginConfirmSetting
 from ..serializers import LoginConfirmSettingSerializer
 from .. import errors
 
-__all__ = ['LoginConfirmSettingUpdateApi', 'UserTicketAcceptAuthApi']
+__all__ = ['LoginConfirmSettingUpdateApi', 'LoginConfirmTicketStatusApi']
 logger = get_logger(__name__)
 
 
@@ -30,10 +31,10 @@ class LoginConfirmSettingUpdateApi(UpdateAPIView):
         return s
 
 
-class UserTicketAcceptAuthApi(APIView):
+class LoginConfirmTicketStatusApi(APIView):
     permission_classes = ()
 
-    def get(self, request, *args, **kwargs):
+    def get_ticket(self):
         from tickets.models import LoginConfirmTicket
         ticket_id = self.request.session.get("auth_ticket_id")
         logger.debug('Login confirm ticket id: {}'.format(ticket_id))
@@ -41,31 +42,32 @@ class UserTicketAcceptAuthApi(APIView):
             ticket = None
         else:
             ticket = get_object_or_none(LoginConfirmTicket, pk=ticket_id)
+        return ticket
+
+    def get(self, request, *args, **kwargs):
+        ticket_id = self.request.session.get("auth_ticket_id")
+        ticket = self.get_ticket()
         try:
             if not ticket:
-                raise errors.LoginConfirmTicketNotFound(ticket_id)
-            if ticket.action == LoginConfirmTicket.ACTION_APPROVE:
+                raise errors.LoginConfirmOtherError(ticket_id, _("not found"))
+            if ticket.status == 'open':
+                raise errors.LoginConfirmWaitError(ticket_id)
+            elif ticket.action == ticket.ACTION_APPROVE:
                 self.request.session["auth_confirm"] = "1"
                 return Response({"msg": "ok"})
-            elif ticket.action == LoginConfirmTicket.ACTION_REJECT:
-                raise errors.LoginConfirmRejectedError(ticket_id)
+            elif ticket.action == ticket.ACTION_REJECT:
+                raise errors.LoginConfirmOtherError(
+                    ticket_id, ticket.get_action_display()
+                )
             else:
-                raise errors.LoginConfirmWaitError(ticket_id)
+                raise errors.LoginConfirmOtherError(
+                    ticket_id, ticket.get_status_display()
+                )
         except errors.AuthFailedError as e:
-            data = e.as_data()
-            return Response(data, status=400)
+            return Response(e.as_data(), status=400)
 
-
-class UserTicketCancelAuthApi(APIView):
-    permission_classes = ()
-
-    def get(self, request, *args, **kwargs):
-        from tickets.models import LoginConfirmTicket
-        ticket_id = self.request.session.get("auth_ticket_id")
-        logger.debug('Login confirm ticket id: {}'.format(ticket_id))
-        if not ticket_id:
-            ticket = None
-        else:
-            ticket = get_object_or_none(LoginConfirmTicket, pk=ticket_id)
-        if not ticket:
-            ticket.status = "close"
+    def delete(self, request, *args, **kwargs):
+        ticket = self.get_ticket()
+        if ticket:
+            ticket.perform_status('closed', request.user)
+        return Response('', status=200)