refactor: streamline application authorization logic and remove unused classes

Author: wxg0103

apps/chat/serializers/portal.py

@@ -30,7 +30,7 @@ class PortalApplicationAuthMixin:
     def get_authorized_application_queryset(user_id):
         public_apps = ApplicationAccessToken.objects.filter(application_id=OuterRef("id"), authentication=False)
         if not ChatUser.objects.filter(id=user_id).exists():
-            return Application.objects.filter(Exists(public_apps))
+            return Application.objects.filter(is_publish=True).filter(Exists(public_apps))
         authed_token_exists = ApplicationAccessToken.objects.filter(application_id=OuterRef("id"), authentication=True)
         direct_auth = ResourceChatUserAuthorize.objects.filter(
             resource_id=OuterRef("id"), resource_type=ResourceType.APPLICATION.value, is_auth=True, user_id=user_id
@@ -42,7 +42,7 @@ def get_authorized_application_queryset(user_id):
             is_auth=True,
             user_group_id__in=user_groups,
         )
-        return Application.objects.filter(
+        return Application.objects.filter(is_publish=True).filter(
             Exists(public_apps) | (Exists(authed_token_exists) & (Exists(direct_auth) | Exists(group_auth)))
         )
 

apps/portal/serializers/portal.py

@@ -11,16 +11,12 @@
 import uuid_utils.compat as uuid
 from django.core import signing
 from django.core.cache import cache
-from django.db.models import Exists, OuterRef
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
-from application.models import Application, Chat
-from application.models.application_access_token import ApplicationAccessToken
 from common.auth.common import FileToken
 from common.constants.cache_version import Cache_Version
 from common.database_model_manage.database_model_manage import DatabaseModelManage
-from common.db.search import page_search
 from common.exception.app_exception import AppApiException
 from common.log.log import record_log
 from common.utils.common import password_verify, needs_password_upgrade, password_encrypt
@@ -30,10 +26,6 @@
 from portal.models import Portal
 from system_manage.models.chat_user import (
     ChatUser,
-    ResourceChatUserAuthorize,
-    ResourceChatUserGroupAuthorize,
-    ResourceType,
-    UserGroupRelation,
 )
 from users.serializers.login import LoginRequest
 
@@ -116,110 +108,6 @@ def edit(self, instance, with_valid=True):
         return PortalSerializer.Model(portal).data
 
 
-class PortalApplicationAuthMixin:
-    """门户应用授权过滤公共逻辑"""
-
-    @staticmethod
-    def get_authorized_application_queryset(user_id):
-        public_apps = ApplicationAccessToken.objects.filter(application_id=OuterRef("id"), authentication=False)
-        if not ChatUser.objects.filter(id=user_id).exists():
-            return Application.objects.filter(Exists(public_apps))
-        authed_token_exists = ApplicationAccessToken.objects.filter(application_id=OuterRef("id"), authentication=True)
-        direct_auth = ResourceChatUserAuthorize.objects.filter(
-            resource_id=OuterRef("id"), resource_type=ResourceType.APPLICATION.value, is_auth=True, user_id=user_id
-        )
-        user_groups = UserGroupRelation.objects.filter(user_id=user_id).values_list("group_id", flat=True)
-        group_auth = ResourceChatUserGroupAuthorize.objects.filter(
-            resource_id=OuterRef("id"),
-            resource_type=ResourceType.APPLICATION.value,
-            is_auth=True,
-            user_group_id__in=user_groups,
-        )
-        return Application.objects.filter(
-            Exists(public_apps) | (Exists(authed_token_exists) & (Exists(direct_auth) | Exists(group_auth)))
-        )
-
-
-class ApplicationResponseSerializer(serializers.Serializer):
-    id = serializers.CharField(required=True)
-    name = serializers.CharField(required=True)
-    desc = serializers.CharField(required=True)
-    icon = serializers.CharField(required=True)
-    type = serializers.CharField(required=True)
-    dialogue_number = serializers.IntegerField(required=True)
-    prologue = serializers.CharField(required=True)
-    is_publish = serializers.BooleanField(required=True)
-
-
-class PortalApplicationSerializer(serializers.Serializer):
-    class Query(PortalApplicationAuthMixin, serializers.Serializer):
-        name = serializers.CharField(
-            required=False, allow_blank=True, label=_("Application Name"), help_text=_("Application name")
-        )
-
-        def get_query_set(self):
-            queryset = Application.objects.filter(is_publish=True)
-            name = self.data.get("name")
-            if name:
-                queryset = queryset.filter(name__icontains=name)
-            return queryset.order_by("-create_time")
-
-        def page(self, current_page, page_size, user_id, with_valid=True):
-            if with_valid:
-                self.is_valid(raise_exception=True)
-            queryset = self.get_query_set()
-            queryset = queryset.filter(id__in=self.get_authorized_application_queryset(user_id).values("id"))
-            return page_search(
-                current_page,
-                page_size,
-                queryset,
-                post_records_handler=lambda app: ApplicationResponseSerializer(app).data,
-            )
-
-
-class PortalHistoricalConversationResponseSerializer(serializers.Serializer):
-    id = serializers.CharField(required=True)
-    abstract = serializers.CharField(required=True)
-    create_time = serializers.CharField(required=True)
-    update_time = serializers.CharField(required=True)
-    application = serializers.SerializerMethodField()
-
-    def get_application(self, chat):
-        return {
-            "id": str(chat.application_id),
-            "name": chat.application.name,
-            "icon": chat.application.icon,
-        }
-
-
-class PortalHistoricalConversationSerializer(serializers.Serializer):
-    class Query(PortalApplicationAuthMixin, serializers.Serializer):
-        name = serializers.CharField(
-            required=False, allow_blank=True, label=_("Application Name"), help_text=_("Application name")
-        )
-
-        def get_query_set(self, user_id):
-            queryset = Chat.objects.filter(
-                chat_user_id=user_id,
-                is_deleted=False,
-                application_id__in=self.get_authorized_application_queryset(user_id).values("id"),
-            )
-            name = self.data.get("name")
-            if name:
-                queryset = queryset.filter(application__name__icontains=name)
-            return queryset.select_related("application").order_by("-update_time", "id")
-
-        def page(self, current_page, page_size, user_id, with_valid=True):
-            if with_valid:
-                self.is_valid(raise_exception=True)
-            return page_search(
-                current_page,
-                page_size,
-                self.get_query_set(user_id),
-                post_records_handler=lambda chat: PortalHistoricalConversationResponseSerializer(chat).data,
-            )
-
-
 class PortalLoginSerializer(serializers.Serializer):
     @staticmethod
     def login(instance):

apps/portal/urls.py

@@ -9,9 +9,4 @@
     path("portal/info", views.PortalInfoView.as_view()),
     path("portal/login", views.PortalLoginView.as_view()),
     path("portal/logout", views.PortalLogoutView.as_view()),
-    path("portal/application/<int:current_page>/<int:page_size>", views.PortalApplicationView.as_view()),
-    path(
-        "portal/historical_conversation/<int:current_page>/<int:page_size>",
-        views.PortalHistoricalConversationView.as_view(),
-    ),
 ]

apps/portal/views/portal.py

@@ -20,14 +20,11 @@
 from common.auth.constants.role_constants import RoleConstants
 from common.constants.cache_version import Cache_Version
 from common.log.log import log
-from common.utils.common import query_params_to_single_dict
 from django.core.cache import cache
 from portal.api.portal import PortalAPI
 from portal.serializers.portal import (
     PortalSerializer,
-    PortalApplicationSerializer,
     PortalLoginSerializer,
-    PortalHistoricalConversationSerializer,
 )
 
 
@@ -62,47 +59,6 @@ def put(self, request: Request):
         return result.success(PortalSerializer().edit(request.data))
 
 
-class PortalApplicationView(APIView):
-    authentication_classes = [TokenAuth]
-
-    @extend_schema(
-        methods=["GET"],
-        description=_("Get published application list by page"),
-        summary=_("Get published application list by page"),
-        operation_id=_("Get published application list by page"),
-        parameters=PortalAPI.Application.get_parameters(),
-        responses=PortalAPI.Application.get_response(),
-        tags=[_("Portal")],
-    )
-    @has_permissions(PermissionConstants.PORTAL_READ, RoleConstants.ADMIN)
-    def get(self, request: Request, current_page: int, page_size: int):
-        return result.success(
-            PortalApplicationSerializer.Query(data={**query_params_to_single_dict(request.query_params)}).page(
-                current_page, page_size, str(request.user.id)
-            )
-        )
-
-
-class PortalHistoricalConversationView(APIView):
-    authentication_classes = [TokenAuth]
-
-    @extend_schema(
-        methods=["GET"],
-        description=_("Get portal historical conversation by page"),
-        summary=_("Get portal historical conversation by page"),
-        operation_id=_("Get portal historical conversation by page"),
-        parameters=PortalAPI.Conversation.get_parameters(),
-        responses=PortalAPI.Conversation.get_response(),
-        tags=[_("Portal")],
-    )
-    def get(self, request: Request, current_page: int, page_size: int):
-        return result.success(
-            PortalHistoricalConversationSerializer.Query(
-                data={**query_params_to_single_dict(request.query_params)}
-            ).page(current_page, page_size, str(request.user.id))
-        )
-
-
 class PortalLoginView(APIView):
     @extend_schema(
         methods=["POST"],