[Update] Rename app

apps/authentication/api/login_confirm.py

@@ -11,7 +11,7 @@ from ..models import LoginConfirmSetting
 from ..serializers import LoginConfirmSettingSerializer
 from .. import errors
 
-__all__ = ['LoginConfirmSettingUpdateApi', 'UserOrderAcceptAuthApi']
+__all__ = ['LoginConfirmSettingUpdateApi', 'UserTicketAcceptAuthApi']
 logger = get_logger(__name__)
 
 
@@ -30,27 +30,42 @@ class LoginConfirmSettingUpdateApi(UpdateAPIView):
         return s
 
 
-class UserOrderAcceptAuthApi(APIView):
+class UserTicketAcceptAuthApi(APIView):
     permission_classes = ()
 
     def get(self, request, *args, **kwargs):
-        from orders.models import LoginConfirmOrder
-        order_id = self.request.session.get("auth_order_id")
-        logger.debug('Login confirm order id: {}'.format(order_id))
-        if not order_id:
-            order = None
+        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:
-            order = get_object_or_none(LoginConfirmOrder, pk=order_id)
+            ticket = get_object_or_none(LoginConfirmTicket, pk=ticket_id)
         try:
-            if not order:
-                raise errors.LoginConfirmOrderNotFound(order_id)
-            if order.status == order.STATUS_ACCEPTED:
+            if not ticket:
+                raise errors.LoginConfirmTicketNotFound(ticket_id)
+            if ticket.action == LoginConfirmTicket.ACTION_APPROVE:
                 self.request.session["auth_confirm"] = "1"
                 return Response({"msg": "ok"})
-            elif order.status == order.STATUS_REJECTED:
-                raise errors.LoginConfirmRejectedError(order_id)
+            elif ticket.action == LoginConfirmTicket.ACTION_REJECT:
+                raise errors.LoginConfirmRejectedError(ticket_id)
             else:
-                raise errors.LoginConfirmWaitError(order_id)
+                raise errors.LoginConfirmWaitError(ticket_id)
         except errors.AuthFailedError as e:
             data = e.as_data()
             return Response(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"

apps/authentication/errors.py

@@ -47,9 +47,9 @@ mfa_failed_msg = _("MFA code invalid, or ntp sync server time")
 
 mfa_required_msg = _("MFA required")
 login_confirm_required_msg = _("Login confirm required")
-login_confirm_wait_msg = _("Wait login confirm order for accept")
-login_confirm_rejected_msg = _("Login confirm order was rejected")
-login_confirm_order_not_found_msg = _("Order not found")
+login_confirm_wait_msg = _("Wait login confirm ticket for accept")
+login_confirm_rejected_msg = _("Login confirm ticket was rejected")
+login_confirm_ticket_not_found_msg = _("Ticket not found")
 
 
 class AuthFailedNeedLogMixin:
@@ -155,8 +155,8 @@ class LoginConfirmError(AuthFailedError):
     msg = login_confirm_wait_msg
     error = 'login_confirm_wait'
 
-    def __init__(self, order_id, **kwargs):
-        self.order_id = order_id
+    def __init__(self, ticket_id, **kwargs):
+        self.ticket_id = ticket_id
         super().__init__(**kwargs)
 
     def as_data(self):
@@ -164,7 +164,7 @@ class LoginConfirmError(AuthFailedError):
             "error": self.error,
             "msg": self.msg,
             "data": {
-                "order_id": self.order_id
+                "ticket_id": self.ticket_id
             }
         }
 
@@ -179,6 +179,6 @@ class LoginConfirmRejectedError(LoginConfirmError):
     error = 'login_confirm_rejected'
 
 
-class LoginConfirmOrderNotFound(LoginConfirmError):
-    msg = login_confirm_order_not_found_msg
-    error = 'login_confirm_order_not_found'
+class LoginConfirmTicketNotFound(LoginConfirmError):
+    msg = login_confirm_ticket_not_found_msg
+    error = 'login_confirm_ticket_not_found'

apps/authentication/mixins.py

@@ -91,30 +91,30 @@ class AuthMixin:
         raise errors.MFAFailedError(username=user.username, request=self.request)
 
     def check_user_login_confirm_if_need(self, user):
-        from orders.models import LoginConfirmOrder
+        from tickets.models import LoginConfirmTicket
         confirm_setting = user.get_login_confirm_setting()
         if self.request.session.get('auth_confirm') or not confirm_setting:
             return
-        order = None
-        if self.request.session.get('auth_order_id'):
-            order_id = self.request.session['auth_order_id']
-            order = get_object_or_none(LoginConfirmOrder, pk=order_id)
-        if not order:
-            order = confirm_setting.create_confirm_order(self.request)
-            self.request.session['auth_order_id'] = str(order.id)
+        ticket = None
+        if self.request.session.get('auth_ticket_id'):
+            ticket_id = self.request.session['auth_ticket_id']
+            ticket = get_object_or_none(LoginConfirmTicket, pk=ticket_id)
+        if not ticket:
+            ticket = confirm_setting.create_confirm_ticket(self.request)
+            self.request.session['auth_ticket_id'] = str(ticket.id)
 
-        if order.status == "accepted":
+        if ticket.status == "accepted":
             return
-        elif order.status == "rejected":
-            raise errors.LoginConfirmRejectedError(order.id)
+        elif ticket.status == "rejected":
+            raise errors.LoginConfirmRejectedError(ticket.id)
         else:
-            raise errors.LoginConfirmWaitError(order.id)
+            raise errors.LoginConfirmWaitError(ticket.id)
 
     def clear_auth_mark(self):
         self.request.session['auth_password'] = ''
         self.request.session['auth_mfa'] = ''
         self.request.session['auth_confirm'] = ''
-        self.request.session['auth_order_id'] = ''
+        self.request.session['auth_ticket_id'] = ''
 
     def send_auth_signal(self, success=True, user=None, username='', reason=''):
         if success:

apps/authentication/models.py

@@ -48,8 +48,8 @@ class LoginConfirmSetting(CommonModelMixin):
     def get_user_confirm_setting(cls, user):
         return get_object_or_none(cls, user=user)
 
-    def create_confirm_order(self, request=None):
-        from orders.models import LoginConfirmOrder
+    def create_confirm_ticket(self, request=None):
+        from tickets.models import LoginConfirmTicket
         title = _('User login confirm: {}').format(self.user)
         if request:
             remote_addr = get_request_ip(request)
@@ -58,20 +58,20 @@ class LoginConfirmSetting(CommonModelMixin):
                 self.user, remote_addr, city, timezone.now()
             )
         else:
-            city = ''
-            remote_addr = ''
+            city = 'Localhost'
+            remote_addr = '127.0.0.1'
             body = ''
         reviewer = self.reviewers.all()
         reviewer_names = ','.join([u.name for u in reviewer])
-        order = LoginConfirmOrder.objects.create(
+        ticket = LoginConfirmTicket.objects.create(
             user=self.user, user_display=str(self.user),
             title=title, body=body,
             city=city, ip=remote_addr,
             assignees_display=reviewer_names,
-            type=LoginConfirmOrder.TYPE_LOGIN_CONFIRM,
+            type=LoginConfirmTicket.TYPE_LOGIN_CONFIRM,
         )
-        order.assignees.set(reviewer)
-        return order
+        ticket.assignees.set(reviewer)
+        return ticket
 
     def __str__(self):
         return '{} confirm'.format(self.user.username)

apps/authentication/urls/api_urls.py

@@ -18,7 +18,7 @@ urlpatterns = [
     path('connection-token/',
          api.UserConnectionTokenApi.as_view(), name='connection-token'),
     path('otp/verify/', api.UserOtpVerifyApi.as_view(), name='user-otp-verify'),
-    path('order/auth/', api.UserOrderAcceptAuthApi.as_view(), name='user-order-auth'),
+    path('order/auth/', api.UserTicketAcceptAuthApi.as_view(), name='user-order-auth'),
     path('login-confirm-settings/<uuid:user_id>/', api.LoginConfirmSettingUpdateApi.as_view(), name='login-confirm-setting-update')
 ]
 

apps/authentication/views/login.py

@@ -126,8 +126,8 @@ class UserLoginGuardView(mixins.AuthMixin, RedirectView):
             return self.format_redirect_url(self.login_otp_url)
         confirm_setting = user.get_login_confirm_setting()
         if confirm_setting and not self.request.session.get('auth_confirm'):
-            order = confirm_setting.create_confirm_order(self.request)
-            self.request.session['auth_order_id'] = str(order.id)
+            ticket = confirm_setting.create_confirm_ticket(self.request)
+            self.request.session['auth_ticket_id'] = str(ticket.id)
             url = self.format_redirect_url(self.login_confirm_url)
             return url
         self.login_success(user)
@@ -159,26 +159,26 @@ class UserLoginWaitConfirmView(TemplateView):
     template_name = 'authentication/login_wait_confirm.html'
 
     def get_context_data(self, **kwargs):
-        from orders.models import LoginConfirmOrder
-        order_id = self.request.session.get("auth_order_id")
-        if not order_id:
-            order = None
+        from tickets.models import LoginConfirmTicket
+        ticket_id = self.request.session.get("auth_ticket_id")
+        if not ticket_id:
+            ticket = None
         else:
-            order = get_object_or_none(LoginConfirmOrder, pk=order_id)
+            ticket = get_object_or_none(LoginConfirmTicket, pk=ticket_id)
         context = super().get_context_data(**kwargs)
-        if order:
-            order_detail_url = reverse('orders:login-confirm-order-detail', kwargs={'pk': order_id})
-            timestamp_created = datetime.datetime.timestamp(order.date_created)
+        if ticket:
+            ticket_detail_url = reverse('tickets:login-confirm-ticket-detail', kwargs={'pk': ticket_id})
+            timestamp_created = datetime.datetime.timestamp(ticket.date_created)
             msg = _("""Wait for <b>{}</b> confirm, You also can copy link to her/him <br/>
-                  Don't close this page""").format(order.assignees_display)
+                  Don't close this page""").format(ticket.assignees_display)
         else:
             timestamp_created = 0
-            order_detail_url = ''
-            msg = _("No order found")
+            ticket_detail_url = ''
+            msg = _("No ticket found")
         context.update({
             "msg": msg,
             "timestamp": timestamp_created,
-            "order_detail_url": order_detail_url
+            "ticket_detail_url": ticket_detail_url
         })
         return context