update

haiwen · May 16, 2024 · 858e72c · 858e72c
1 parent d4835fc
commit 858e72c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 30 deletions.
diff --git a/seahub/institutions/api_urls.py b/seahub/institutions/api_urls.py
@@ -2,12 +2,15 @@
 from django.urls import path
 
 from .api_views import InstAdminUsers, InstAdminUser, \
-        InstAdminSearchUser, InstAdminLibraries, InstAdminGroups
+        InstAdminSearchUser, InstAdminUserLibraries, InstAdminUserGroups
 
 urlpatterns = [
     path('admin/users/', InstAdminUsers.as_view(), name='api-v2.1-inst-admin-users'),
+    path('admin/search-user/',
+         InstAdminSearchUser.as_view(), name='api-v2.1-inst-admin-search-user'),
     path('admin/users/<str:email>/', InstAdminUser.as_view(), name='api-v2.1-inst-admin-user'),
-    path('admin/search-user/', InstAdminSearchUser.as_view(), name='api-v2.1-inst-admin-search-user'),
-    path('admin/libraries/', InstAdminLibraries.as_view(), name='api-v2.1-inst-admin-libraries'),
-    path('admin/groups/', InstAdminGroups.as_view(), name='api-v2.1-inst-admin-groups'),
+    path('admin/users/<str:email>/libraries/',
+         InstAdminUserLibraries.as_view(), name='api-v2.1-inst-admin-user-libraries'),
+    path('admin/users/<str:email>/groups/',
+         InstAdminUserGroups.as_view(), name='api-v2.1-inst-admin-user-groups'),
 ]
diff --git a/seahub/institutions/api_views.py b/seahub/institutions/api_views.py
@@ -320,39 +320,34 @@ def get(self, request):
         return Response({'user_list': result})
 
 
-class InstAdminLibraries(APIView):
+class InstAdminUserLibraries(APIView):
 
     authentication_classes = (TokenAuthentication, SessionAuthentication)
     throttle_classes = (UserRateThrottle,)
     permission_classes = (IsProVersion, IsInstAdmin)
 
-    def get(self, request):
+    def get(self, request, email):
 
         """Get user repos.
         """
 
-        owner = request.GET.get('owner', '')
-        if not owner:
-            error_msg = 'owner invalid.'
-            return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
-
         try:
-            User.objects.get(email=owner)
+            User.objects.get(email=email)
         except User.DoesNotExist:
-            error_msg = f'User {owner} not found.'
+            error_msg = f'User {email} not found.'
             return api_error(status.HTTP_404_NOT_FOUND, error_msg)
 
         username = request.user.username
         inst_admin = InstitutionAdmin.objects.get(user=username)
         inst = inst_admin.institution
-        profile = Profile.objects.get_profile_by_user(owner)
+        profile = Profile.objects.get_profile_by_user(email)
         if not profile or \
                 profile.institution != inst.name:
-            error_msg = f'User {owner} not found in {inst.name}.'
+            error_msg = f'User {email} not found in {inst.name}.'
             return api_error(status.HTTP_404_NOT_FOUND, error_msg)
 
         repo_info_list = []
-        owned_repos = seafile_api.get_owned_repo_list(owner)
+        owned_repos = seafile_api.get_owned_repo_list(email)
 
         for repo in owned_repos:
 
@@ -370,47 +365,43 @@ def get(self, request):
         return Response({"repo_list": repo_info_list})
 
 
-class InstAdminGroups(APIView):
+class InstAdminUserGroups(APIView):
 
     authentication_classes = (TokenAuthentication, SessionAuthentication)
     throttle_classes = (UserRateThrottle,)
     permission_classes = (IsProVersion, IsInstAdmin)
 
-    def get(self, request):
+    def get(self, request, email):
 
         """Get user repos.
         """
 
-        owner = request.GET.get('owner', '')
-        if not owner:
-            error_msg = 'owner invalid.'
-            return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
-
         try:
-            User.objects.get(email=owner)
+            User.objects.get(email=email)
         except User.DoesNotExist:
-            error_msg = f'User {owner} not found.'
+            error_msg = f'User {email} not found.'
             return api_error(status.HTTP_404_NOT_FOUND, error_msg)
 
         username = request.user.username
         inst_admin = InstitutionAdmin.objects.get(user=username)
         inst = inst_admin.institution
-        profile = Profile.objects.get_profile_by_user(owner)
+
+        profile = Profile.objects.get_profile_by_user(email)
         if not profile or \
                 profile.institution != inst.name:
-            error_msg = f'User {owner} not found in {inst.name}.'
+            error_msg = f'User {email} not found in {inst.name}.'
             return api_error(status.HTTP_404_NOT_FOUND, error_msg)
 
         group_info_list = []
-        groups = ccnet_api.get_groups(owner)
+        groups = ccnet_api.get_groups(email)
 
         for group in groups:
 
             group_info = {}
             group_info['id'] = group.id
             group_info['name'] = group.group_name
-            group_info['is_owner'] = group.creator_name == owner
-            group_info['is_admin'] = ccnet_api.check_group_staff(group.id, owner)
+            group_info['is_owner'] = group.creator_name == email
+            group_info['is_admin'] = ccnet_api.check_group_staff(group.id, email)
             group_info['created_at'] = timestamp_to_isoformat_timestr(group.timestamp)
 
             group_info_list.append(group_info)