From 1c6475d7d13b811cb4074f80c763f9357867901c Mon Sep 17 00:00:00 2001 From: zhengxie Date: Mon, 13 Jul 2015 17:06:54 +0800 Subject: [PATCH] WIP: finish dir_shared_items --- seahub/api2/endpoints/__init__.py | 0 seahub/api2/endpoints/dir_shared_items.py | 356 ++++++++++++++++++++++ seahub/api2/urls.py | 3 +- seahub/api2/views.py | 216 ------------- tests/api/test_shares.py | 162 +++++++--- 5 files changed, 478 insertions(+), 259 deletions(-) create mode 100644 seahub/api2/endpoints/__init__.py create mode 100644 seahub/api2/endpoints/dir_shared_items.py diff --git a/seahub/api2/endpoints/__init__.py b/seahub/api2/endpoints/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/seahub/api2/endpoints/dir_shared_items.py b/seahub/api2/endpoints/dir_shared_items.py new file mode 100644 index 0000000000..6f2e5f2675 --- /dev/null +++ b/seahub/api2/endpoints/dir_shared_items.py @@ -0,0 +1,356 @@ +import logging +import json +import os + +from django.http import HttpResponse +from pysearpc import SearpcError +from rest_framework import status +from rest_framework.authentication import SessionAuthentication +from rest_framework.permissions import IsAuthenticated +from rest_framework.throttling import UserRateThrottle +from rest_framework.views import APIView +import seaserv +from seaserv import seafile_api + +from seahub.api2.authentication import TokenAuthentication +from seahub.api2.utils import api_error +from seahub.base.templatetags.seahub_tags import email2nickname +from seahub.utils import is_org_context, is_valid_username +from seahub.share.signals import share_repo_to_user_successful + +logger = logging.getLogger(__name__) +json_content_type = 'application/json; charset=utf-8' + +class DirSharedItemsEndpoint(APIView): + authentication_classes = (TokenAuthentication, SessionAuthentication) + permission_classes = (IsAuthenticated,) + throttle_classes = (UserRateThrottle, ) + + def list_user_shared_items(self, request, repo_id, path): + username = request.user.username + if path == '/': + share_items = seafile_api.list_repo_shared_to(username, repo_id) + else: + share_items = seafile_api.get_shared_users_for_subdir(repo_id, + path, username) + ret = [] + for item in share_items: + ret.append({ + "share_type": "user", + "user_info": { + "name": item.user, + "nickname": email2nickname(item.user), + }, + "permission": item.perm, + }) + return ret + + def list_group_shared_items(self, request, repo_id, path): + username = request.user.username + if path == '/': + share_items = seafile_api.list_repo_shared_group(username, repo_id) + else: + share_items = seafile_api.get_shared_groups_for_subdir(repo_id, + path, username) + ret = [] + for item in share_items: + ret.append({ + "share_type": "group", + "group_info": { + "id": item.group_id, + "name": seaserv.get_group(item.group_id).group_name, + }, + "permission": item.perm, + }) + return ret + + # def add_user_shared_item(self, request, repo_id, path): + # pass + + def handle_shared_to_args(self, request): + share_type = request.GET.get('share_type', None) + shared_to_user = False + shared_to_group = False + if share_type: + for e in share_type.split(','): + e = e.strip() + if e not in ['user', 'group']: + continue + if e == 'user': + shared_to_user = True + if e == 'group': + shared_to_group = True + else: + shared_to_user = True + shared_to_group = True + + return (shared_to_user, shared_to_group) + + def get_sub_repo_by_path(self, request, repo, path): + if path == '/': + raise Exception("Invalid path") + + # get or create sub repo + username = request.user.username + if is_org_context(request): + org_id = request.user.org.org_id + sub_repo = seaserv.seafserv_threaded_rpc.get_org_virtual_repo( + org_id, repo.id, path, username) + else: + sub_repo = seafile_api.get_virtual_repo(repo.id, path, username) + + return sub_repo + + def get_or_create_sub_repo_by_path(self, request, repo, path): + username = request.user.username + sub_repo = self.get_sub_repo_by_path(request, repo, path) + if not sub_repo: + name = os.path.basename(path) + # create a sub-lib, + # use name as 'repo_name' & 'repo_desc' for sub_repo + if is_org_context(request): + org_id = request.user.org.org_id + sub_repo_id = seaserv.seafserv_threaded_rpc.create_org_virtual_repo( + org_id, repo.id, path, name, name, username) + else: + sub_repo_id = seafile_api.create_virtual_repo(repo.id, path, + name, name, username) + sub_repo = seafile_api.get_repo(sub_repo_id) + + return sub_repo + + def get(self, request, repo_id, format=None): + repo = seafile_api.get_repo(repo_id) + if not repo: + return api_error(status.HTTP_400_BAD_REQUEST, 'Repo not found.') + + shared_to_user, shared_to_group = self.handle_shared_to_args(request) + + path = request.GET.get('p', '/') + if seafile_api.get_dir_id_by_path(repo.id, path) is None: + return api_error(status.HTTP_400_BAD_REQUEST, 'Directory not found.') + + ret = [] + if shared_to_user: + ret += self.list_user_shared_items(request, repo_id, path) + + if shared_to_group: + ret += self.list_group_shared_items(request, repo_id, path) + + return HttpResponse(json.dumps(ret), status=200, + content_type=json_content_type) + + def post(self, request, repo_id, format=None): + """Update shared item permission. + """ + username = request.user.username + repo = seafile_api.get_repo(repo_id) + if not repo: + return api_error(status.HTTP_400_BAD_REQUEST, 'Repo not found.') + + shared_to_user, shared_to_group = self.handle_shared_to_args(request) + + permission = request.DATA.get('permission', 'r') + if permission not in ['r', 'rw']: + return api_error(status.HTTP_400_BAD_REQUEST, 'Bad permission') + + path = request.GET.get('p', '/') + if seafile_api.get_dir_id_by_path(repo.id, path) is None: + return api_error(status.HTTP_400_BAD_REQUEST, 'Directory not found.') + + if path == '/': + shared_repo = repo + else: + try: + sub_repo = self.get_sub_repo_by_path(request, repo, path) + if sub_repo: + shared_repo = sub_repo + else: + return api_error(status.HTTP_400_BAD_REQUEST, 'No sub repo found') + except SearpcError as e: + logger.error(e) + return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Failed to get sub repo') + + if shared_to_user: + shared_to = request.GET.get('username') + if shared_to is None or not is_valid_username(shared_to): + return api_error(status.HTTP_400_BAD_REQUEST, 'Bad username.') + + if is_org_context(request): + org_id = request.user.org.org_id + seaserv.seafserv_threaded_rpc.org_set_share_permission( + org_id, shared_repo.id, username, shared_to, permission) + else: + seafile_api.set_share_permission(shared_repo.id, username, + shared_to, permission) + + if shared_to_group: + gid = request.GET.get('group_id') + try: + gid = int(gid) + except ValueError: + return api_error(status.HTTP_400_BAD_REQUEST, 'Bad group id: %s' % gid) + group = seaserv.get_group(gid) + if not group: + return api_error(status.HTTP_400_BAD_REQUEST, 'Group not found: %s' % gid) + + if is_org_context(request): + org_id = request.user.org.org_id + seaserv.seafserv_threaded_rpc.set_org_group_repo_permission( + org_id, gid, shared_repo.id, permission) + else: + seafile_api.set_group_repo_permission(gid, shared_repo.id, + permission) + + return HttpResponse(json.dumps({'success': True}), status=200, + content_type=json_content_type) + + def put(self, request, repo_id, format=None): + username = request.user.username + repo = seafile_api.get_repo(repo_id) + if not repo: + return api_error(status.HTTP_400_BAD_REQUEST, 'Repo not found.') + + # TODO: perm check, quota check + + path = request.GET.get('p', '/') + if seafile_api.get_dir_id_by_path(repo.id, path) is None: + return api_error(status.HTTP_400_BAD_REQUEST, 'Directory not found.') + + if path != '/': + try: + sub_repo = self.get_or_create_sub_repo_by_path(request, repo, path) + except SearpcError as e: + logger.error(e) + return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Failed to get sub repo') + else: + sub_repo = None + + share_type = request.DATA.get('share_type') + if share_type != 'user' and share_type != 'group': + return api_error(status.HTTP_400_BAD_REQUEST, 'Bad share type') + + permission = request.DATA.get('permission', 'r') + if permission not in ['r', 'rw']: + return api_error(status.HTTP_400_BAD_REQUEST, 'Bad permission') + + shared_repo = repo if path == '/' else sub_repo + success, failed = [], [] + if share_type == 'user': + share_to_users = request.DATA.getlist('username') + for to_user in share_to_users: + try: + if is_org_context(request): + org_id = request.user.org.org_id + # org_share_repo(org_id, shared_repo.id, username, to_user, permission) + else: + seafile_api.share_repo(shared_repo.repo_id, username, to_user, permission) + # send a signal when sharing repo successful + share_repo_to_user_successful.send(sender=None, + from_user=username, + to_user=to_user, + repo=shared_repo) + success.append({ + "share_type": "user", + "user_info": { + "name": to_user, + "nickname": email2nickname(to_user), + }, + "permission": permission + }) + except SearpcError as e: + logger.error(e) + failed.append(to_user) + continue + + if share_type == 'group': + group_ids = request.DATA.getlist('group_id') + for gid in group_ids: + try: + gid = int(gid) + except ValueError: + return api_error(status.HTTP_400_BAD_REQUEST, 'Bad group id: %s' % gid) + group = seaserv.get_group(gid) + if not group: + return api_error(status.HTTP_400_BAD_REQUEST, 'Group not found: %s' % gid) + + try: + if is_org_context(request): + org_id = request.user.org.org_id + seafile_api.add_org_group_repo(shared_repo.repo_id, + org_id, gid, username, + permission) + else: + seafile_api.set_group_repo(shared_repo.repo_id, gid, + username, permission) + # todo: perm audit msg + + success.append({ + "share_type": "group", + "group_info": { + "id": gid, + "name": group.group_name, + }, + "permission": permission + }) + except SearpcError as e: + logger.error(e) + failed.append(group.group_name) + continue + + return HttpResponse(json.dumps({ + "success": success, + "failed": failed + }), status=200, content_type=json_content_type) + + def delete(self, request, repo_id, format=None): + username = request.user.username + repo = seafile_api.get_repo(repo_id) + if not repo: + return api_error(status.HTTP_400_BAD_REQUEST, 'Repo not found.') + + shared_to_user, shared_to_group = self.handle_shared_to_args(request) + + path = request.GET.get('p', '/') + if seafile_api.get_dir_id_by_path(repo.id, path) is None: + return api_error(status.HTTP_400_BAD_REQUEST, 'Directory not found.') + + if path == '/': + shared_repo = repo + else: + try: + sub_repo = self.get_sub_repo_by_path(request, repo, path) + if sub_repo: + shared_repo = sub_repo + else: + return api_error(status.HTTP_400_BAD_REQUEST, 'No sub repo found') + except SearpcError as e: + logger.error(e) + return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Failed to get sub repo') + + if shared_to_user: + shared_to = request.GET.get('username') + if shared_to is None or not is_valid_username(shared_to): + return api_error(status.HTTP_400_BAD_REQUEST, 'Bad argument.') + + if is_org_context(request): + org_id = request.user.org.org_id + # org_remove_share(org_id, repo_id, from_email, shared_to) + else: + seaserv.remove_share(shared_repo.id, username, shared_to) + + if shared_to_group: + group_id = request.GET.get('group_id') + try: + group_id = int(group_id) + except ValueError: + return api_error(status.HTTP_400_BAD_REQUEST, 'Bad group id') + + if is_org_context(request): + org_id = request.user.org.org_id + seaserv.del_org_group_repo(shared_repo.id, org_id, group_id) + else: + seafile_api.unset_group_repo(shared_repo.id, group_id, username) + + return HttpResponse(json.dumps({'success': True}), status=200, + content_type=json_content_type) diff --git a/seahub/api2/urls.py b/seahub/api2/urls.py index 34fdbd45f0..2a16410225 100644 --- a/seahub/api2/urls.py +++ b/seahub/api2/urls.py @@ -3,6 +3,7 @@ from django.conf.urls.defaults import * from .views import * from .views_misc import ServerInfoView from .views_auth import LogoutDeviceView, ClientLoginTokenView +from .endpoints.dir_shared_items import DirSharedItemsEndpoint urlpatterns = patterns('', @@ -40,7 +41,7 @@ urlpatterns = patterns('', url(r'^repos/(?P[-0-9-a-f]{36})/dir/$', DirView.as_view(), name='DirView'), url(r'^repos/(?P[-0-9-a-f]{36})/dir/sub_repo/$', DirSubRepoView.as_view()), url(r'^repos/(?P[-0-9-a-f]{36})/dir/share/$', DirShareView.as_view()), - url(r'^repos/(?P[-0-9-a-f]{36})/dir/shared_items/$', DirSharedItemsView.as_view()), + url(r'^repos/(?P[-0-9-a-f]{36})/dir/shared_items/$', DirSharedItemsEndpoint.as_view()), url(r'^repos/(?P[-0-9-a-f]{36})/dir/download/$', DirDownloadView.as_view()), url(r'^repos/(?P[-0-9-a-f]{36})/thumbnail/$', ThumbnailView.as_view(), name='api2-thumbnail'), url(r'^starredfiles/', StarredFileView.as_view(), name='starredfiles'), diff --git a/seahub/api2/views.py b/seahub/api2/views.py index 2f4e8b261a..6d91c795f3 100644 --- a/seahub/api2/views.py +++ b/seahub/api2/views.py @@ -2250,222 +2250,6 @@ class DirShareView(APIView): return HttpResponse(json.dumps({}), status=200, content_type=json_content_type) -class DirSharedItemsView(APIView): - authentication_classes = (TokenAuthentication, SessionAuthentication) - permission_classes = (IsAuthenticated,) - throttle_classes = (UserRateThrottle, ) - - def list_user_shared_items(self, request, repo_id, path): - username = request.user.username - if path == '/': - share_items = seafile_api.list_repo_shared_to(username, repo_id) - else: - share_items = seafile_api.get_shared_users_for_subdir(repo_id, - path, username) - ret = [] - for item in share_items: - ret.append({ - "share_type": "user", - "user_info": { - "name": item.user, - "nickname": email2nickname(item.user), - }, - "permission": item.perm, - }) - return ret - - def list_group_shared_items(self, request, repo_id, path): - return [] - - def add_user_shared_item(self, request, repo_id, path): - pass - - def handle_shared_to_args(self, request): - share_type = request.GET.get('share_type', None) - shared_to_user = False - shared_to_group = False - if share_type: - for e in share_type.split(','): - e = e.strip() - if e not in ['user', 'group']: - continue - if e == 'user': - shared_to_user = True - if e == 'group': - shared_to_group = True - else: - shared_to_user = True - shared_to_group = True - - return (shared_to_user, shared_to_group) - - def get_sub_repo_by_path(self, request, repo, path): - if path == '/': - raise Exception("Invalid path") - - # get or create sub repo - username = request.user.username - if is_org_context(request): - org_id = request.user.org.org_id - sub_repo = seaserv.seafserv_threaded_rpc.get_org_virtual_repo( - org_id, repo.id, path, username) - else: - sub_repo = seafile_api.get_virtual_repo(repo.id, path, username) - - return sub_repo - - def get_or_create_sub_repo_by_path(self, request, repo, path): - username = request.user.username - sub_repo = self.get_sub_repo_by_path(request, repo, path) - if not sub_repo: - name = os.path.basename(path) - # create a sub-lib, - # use name as 'repo_name' & 'repo_desc' for sub_repo - if is_org_context(request): - org_id = request.user.org.org_id - sub_repo_id = seaserv.seafserv_threaded_rpc.create_org_virtual_repo( - org_id, repo.id, path, name, name, username) - else: - sub_repo_id = seafile_api.create_virtual_repo(repo.id, path, - name, name, username) - sub_repo = seafile_api.get_repo(sub_repo_id) - - return sub_repo - - def get(self, request, repo_id, format=None): - repo = get_repo(repo_id) - if not repo: - return api_error(status.HTTP_400_BAD_REQUEST, 'Repo not found.') - - shared_to_user, shared_to_group = self.handle_shared_to_args(request) - - path = request.GET.get('p', '/') - if seafile_api.get_dir_id_by_path(repo.id, path) is None: - return api_error(status.HTTP_400_BAD_REQUEST, 'Directory not found.') - - ret = [] - if shared_to_user: - ret += self.list_user_shared_items(request, repo_id, path) - - if shared_to_group: - ret += self.list_group_shared_items(request, repo_id, path) - - return HttpResponse(json.dumps(ret), status=200, - content_type=json_content_type) - - def post(self, request, repo_id, format=None): - return HttpResponse(json.dumps([{'foo': 'bar'}]), status=200, - content_type=json_content_type) - - def put(self, request, repo_id, format=None): - username = request.user.username - repo = get_repo(repo_id) - if not repo: - return api_error(status.HTTP_400_BAD_REQUEST, 'Repo not found.') - - # TODO: perm check, quota check - - path = request.GET.get('p', '/') - if seafile_api.get_dir_id_by_path(repo.id, path) is None: - return api_error(status.HTTP_400_BAD_REQUEST, 'Directory not found.') - - if path != '/': - try: - sub_repo = self.get_sub_repo_by_path(request, repo, path) - except SearpcError as e: - logger.error(e) - return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Failed to get sub repo') - else: - sub_repo = None - - share_type = request.DATA.get('share_type') - if share_type != 'user' and share_type != 'group': - return api_error(status.HTTP_400_BAD_REQUEST, 'Bad share type') - - permission = request.DATA.get('permission', 'r') - if permission not in ['r', 'rw']: - return api_error(status.HTTP_400_BAD_REQUEST, 'Bad permission') - - shared_repo = repo if path == '/' else sub_repo - success, failed = [], [] - if share_type == 'user': - share_to_users = request.DATA.getlist('username') - for to_user in share_to_users: - try: - if is_org_context(request): - org_id = request.user.org.org_id - # org_share_repo(org_id, shared_repo.id, username, to_user, permission) - else: - seafile_api.share_repo(shared_repo.repo_id, username, to_user, permission) - # send a signal when sharing repo successful - share_repo_to_user_successful.send(sender=None, - from_user=username, - to_user=to_user, - repo=shared_repo) - success.append({ - "share_type": "user", - "user_info": { - "name": to_user, - "nickname": email2nickname(to_user), - }, - "permission": permission - }) - except SearpcError as e: - logger.error(e) - failed.append(to_user) - continue - - if share_type == 'group': - pass - - return HttpResponse(json.dumps({ - "success": success, - "failed": failed - }), status=200, content_type=json_content_type) - - def delete(self, request, repo_id, format=None): - username = request.user.username - repo = get_repo(repo_id) - if not repo: - return api_error(status.HTTP_400_BAD_REQUEST, 'Repo not found.') - - shared_to_user, shared_to_group = self.handle_shared_to_args(request) - - path = request.GET.get('p', '/') - if seafile_api.get_dir_id_by_path(repo.id, path) is None: - return api_error(status.HTTP_400_BAD_REQUEST, 'Directory not found.') - - if path == '/': - shared_repo = repo - else: - try: - sub_repo = self.get_sub_repo_by_path(request, repo, path) - if sub_repo: - shared_repo = sub_repo - else: - return api_error(status.HTTP_400_BAD_REQUEST, 'No sub repo found') - except SearpcError as e: - logger.error(e) - return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Failed to get sub repo') - - if shared_to_user: - shared_to = request.GET.get('username') - if shared_to is None or not is_valid_username(shared_to): - return api_error(status.HTTP_400_BAD_REQUEST, 'Bad argument.') - - if is_org_context(request): - org_id = request.user.org.org_id - # org_remove_share(org_id, repo_id, from_email, shared_to) - else: - seaserv.remove_share(shared_repo.id, username, shared_to) - - if shared_to_group: - pass - - return HttpResponse(json.dumps({'success': True}), status=200, - content_type=json_content_type) - - class DirSubRepoView(APIView): authentication_classes = (TokenAuthentication, ) permission_classes = (IsAuthenticated,) diff --git a/tests/api/test_shares.py b/tests/api/test_shares.py index f3ad60802c..09c452b384 100644 --- a/tests/api/test_shares.py +++ b/tests/api/test_shares.py @@ -1,12 +1,9 @@ #coding: UTF-8 import json -from django.core.urlresolvers import reverse -from django.test import TestCase - from seaserv import seafile_api -from seahub.test_utils import Fixtures +from seahub.test_utils import BaseTestCase from tests.common.utils import urljoin from tests.api.apitestbase import ApiTestBase from tests.api.urls import SHARED_LINKS_URL, SHARED_LIBRARIES_URL, \ @@ -37,56 +34,52 @@ class SharesApiTest(ApiTestBase): self.assertIsNotNone(fileshare['path']) -class DirSharedItemsTest(TestCase, Fixtures): - def setUp(self): - self.folder_path = self.folder - sub_repo_id = seafile_api.create_virtual_repo(self.repo.id, - self.folder_path, - self.repo.name, '', - self.user.username) - # A user shares a folder to admin with permission 'rw. - seafile_api.share_repo(sub_repo_id, self.user.username, - self.admin.username, 'rw') - +class DirSharedItemsTest(BaseTestCase): def tearDown(self): self.remove_repo() - def _login_as(self, user): - self.client.post( - reverse('auth_login'), {'username': self.user.username, - 'password': 'secret'} - ) + def _add_shared_items(self): + sub_repo_id = seafile_api.create_virtual_repo(self.repo.id, + self.folder, + self.repo.name, '', + self.user.username) + # A user shares a folder to admin with permission 'rw'. + seafile_api.share_repo(sub_repo_id, self.user.username, + self.admin.username, 'rw') + # A user shares a folder to group with permission 'rw'. + seafile_api.set_group_repo(sub_repo_id, self.group.id, + self.user.username, 'rw') def test_can_list_all(self): - self._login_as(self.user) + self._add_shared_items() + self.login_as(self.user) resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user,group' % ( self.repo.id, - self.folder_path)) + self.folder)) self.assertEqual(200, resp.status_code) json_resp = json.loads(resp.content) - assert len(json_resp) == 1 - assert self.admin.username == json_resp[0]['user_info']['name'] + assert len(json_resp) == 2 def test_can_list_without_share_type_arg(self): - self._login_as(self.user) + self._add_shared_items() + self.login_as(self.user) resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s' % ( self.repo.id, - self.folder_path)) + self.folder)) self.assertEqual(200, resp.status_code) json_resp = json.loads(resp.content) - assert len(json_resp) == 1 - assert self.admin.username == json_resp[0]['user_info']['name'] + assert len(json_resp) == 2 - def test_can_add(self): - self._login_as(self.user) + def test_can_share_folder_to_users(self): + self.login_as(self.user) resp = self.client.put( '/api2/repos/%s/dir/shared_items/?p=%s' % (self.repo.id, - self.folder_path), + self.folder), "share_type=user&username=a@a.com&username=b@b.com", 'application/x-www-form-urlencoded', ) @@ -95,32 +88,117 @@ class DirSharedItemsTest(TestCase, Fixtures): assert len(json_resp['success']) == 2 assert json_resp['success'][0]['permission'] == 'r' - def test_can_update(self): - self._login_as(self.user) + def test_can_share_root_to_groups(self): + self.login_as(self.user) - resp = self.client.post('/api2/repos/%s/dir/shared_items/?p=%s' % ( + grp1 = self.group + grp2 = self.create_group(group_name="test-grp2", + username=self.user.username) + + resp = self.client.put( + '/api2/repos/%s/dir/shared_items/?p=/' % (self.repo.id), + "share_type=group&group_id=%d&group_id=%d&permission=rw" % (grp1.id, grp2.id), + 'application/x-www-form-urlencoded', + ) + self.assertEqual(200, resp.status_code) + json_resp = json.loads(resp.content) + assert len(json_resp['success']) == 2 + assert json_resp['success'][0]['permission'] == 'rw' + + def test_can_share_folder_to_groups(self): + self.login_as(self.user) + + grp1 = self.group + grp2 = self.create_group(group_name="test-grp2", + username=self.user.username) + + resp = self.client.put( + '/api2/repos/%s/dir/shared_items/?p=%s' % (self.repo.id, + self.folder), + "share_type=group&group_id=%d&group_id=%d&permission=rw" % (grp1.id, grp2.id), + 'application/x-www-form-urlencoded', + ) + self.assertEqual(200, resp.status_code) + json_resp = json.loads(resp.content) + assert len(json_resp['success']) == 2 + assert json_resp['success'][0]['permission'] == 'rw' + + def test_can_modify_user_shared_repo(self): + self._add_shared_items() + self.login_as(self.user) + + resp = self.client.post('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user&username=%s' % ( self.repo.id, - self.folder_path), { - + self.folder, + self.admin.username), { + 'permission': 'r' } ) - print resp + json_resp = json.loads(resp.content) + assert json_resp['success'] is True - def test_can_delete(self): - self._login_as(self.user) + resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user' % ( + self.repo.id, + self.folder)) + json_resp = json.loads(resp.content) + assert json_resp[0]['permission'] == 'r' + + def test_can_modify_group_shared_repo(self): + self._add_shared_items() + self.login_as(self.user) + + resp = self.client.post('/api2/repos/%s/dir/shared_items/?p=%s&share_type=group&group_id=%d' % ( + self.repo.id, + self.folder, + self.group.id), { + 'permission': 'r' + } + ) + json_resp = json.loads(resp.content) + assert json_resp['success'] is True + + resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=group' % ( + self.repo.id, + self.folder)) + json_resp = json.loads(resp.content) + assert json_resp[0]['permission'] == 'r' + + def test_can_unshare_repo_to_user(self): + self._add_shared_items() + self.login_as(self.user) resp = self.client.delete('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user&username=%s' % ( self.repo.id, - self.folder_path, + self.folder, self.admin.username )) self.assertEqual(200, resp.status_code) json_resp = json.loads(resp.content) assert json_resp['success'] is True - resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user,group' % ( + resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user' % ( self.repo.id, - self.folder_path)) + self.folder)) + + json_resp = json.loads(resp.content) + assert len(json_resp) == 0 + + def test_can_unshare_repo_to_group(self): + self._add_shared_items() + self.login_as(self.user) + + resp = self.client.delete('/api2/repos/%s/dir/shared_items/?p=%s&share_type=group&group_id=%d' % ( + self.repo.id, + self.folder, + self.group.id + )) + self.assertEqual(200, resp.status_code) + json_resp = json.loads(resp.content) + assert json_resp['success'] is True + + resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=group' % ( + self.repo.id, + self.folder)) json_resp = json.loads(resp.content) assert len(json_resp) == 0