use inner file upload url when send post request inside seahub code. (#2055)

seahub/api2/endpoints/file.py

@@ -18,7 +18,7 @@ from seahub.api2.utils import api_error
 from seahub.signals import rename_dirent_successful
 
 from seahub.utils import check_filename_with_rename, is_pro_version, \
-    gen_file_upload_url, is_valid_dirent_name, normalize_file_path, \
+    gen_inner_file_upload_url, is_valid_dirent_name, normalize_file_path, \
     normalize_dir_path
 from seahub.utils.timeutils import timestamp_to_isoformat_timestr
 from seahub.views import check_folder_permission
@@ -196,8 +196,7 @@ class FileView(APIView):
                     error_msg = 'Internal Server Error'
                     return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
 
-                update_url = gen_file_upload_url(update_token, 'update-api')
-
+                update_url = gen_inner_file_upload_url('update-api', update_token)
                 # update file
                 new_file_path = posixpath.join(parent_dir, new_file_name)
                 try:

seahub/api2/views.py

@@ -68,7 +68,7 @@ from seahub.utils import gen_file_get_url, gen_token, gen_file_upload_url, \
     gen_file_share_link, gen_dir_share_link, is_org_context, gen_shared_link, \
     get_org_user_events, calculate_repos_last_modify, send_perm_audit_msg, \
     gen_shared_upload_link, convert_cmmt_desc_link, is_valid_dirent_name, \
-    is_org_repo_creation_allowed, is_windows_operating_system, \
+    is_org_repo_creation_allowed, \
     get_no_duplicate_obj_name, normalize_dir_path
 
 from seahub.utils.file_revisions import get_file_revisions_after_renamed

seahub/onlyoffice/views.py

@@ -11,7 +11,7 @@ from django.views.decorators.csrf import csrf_exempt
 from seaserv import seafile_api
 
 from .settings import VERIFY_ONLYOFFICE_CERTIFICATE
-from seahub.utils import gen_file_upload_url
+from seahub.utils import gen_inner_file_upload_url
 
 # Get an instance of a logger
 logger = logging.getLogger(__name__)
@@ -59,7 +59,7 @@ def onlyoffice_editor_callback(request):
             if not update_token:
                 return HttpResponse('{"error": 0}')
 
-            update_url = gen_file_upload_url(update_token, 'update-api')
+            update_url = gen_inner_file_upload_url(update_token, 'update-api')
 
             files = {
                 'file': file_content,

seahub/views/file.py

@@ -474,8 +474,8 @@ def _file_view(request, repo_id, path):
         wopi_dict = get_wopi_dict(username, repo_id, path,
                 action_name, request.LANGUAGE_CODE)
 
-        wopi_dict['doc_title'] = doc_title
         if wopi_dict:
+            wopi_dict['doc_title'] = doc_title
             send_file_access_msg(request, repo, path, 'web')
             return render_to_response('view_wopi_file.html', wopi_dict,
                       context_instance=RequestContext(request))

seahub/views/repo.py

@@ -23,7 +23,7 @@ from seahub.share.models import FileShare, UploadLinkShare, \
 from seahub.views import gen_path_link, get_repo_dirents, \
     check_folder_permission
 
-from seahub.utils import gen_file_upload_url, gen_dir_share_link, \
+from seahub.utils import  gen_dir_share_link, \
     gen_shared_upload_link, user_traffic_over_limit, render_error, \
     get_file_type_and_ext
 from seahub.settings import ENABLE_UPLOAD_FOLDER, \
@@ -63,19 +63,6 @@ def get_nav_path(path, repo_name):
 def is_no_quota(repo_id):
     return True if seaserv.check_quota(repo_id) < 0 else False
 
-def get_upload_url(request, repo_id):
-    username = request.user.username
-    if check_folder_permission(request, repo_id, '/') == 'rw':
-        token = seafile_api.get_fileserver_access_token(repo_id,
-                'dummy', 'upload', username)
-
-        if not token:
-            return ''
-
-        return gen_file_upload_url(token, 'upload')
-    else:
-        return ''
-
 def get_fileshare(repo_id, username, path):
     if path == '/':    # no shared link for root dir
         return None

tests/seahub/views/repo/test_get_upload_url.py

@@ -1,7 +0,0 @@
-from seahub.views.repo import get_upload_url
-from seahub.test_utils import BaseTestCase
-
-class GetUploadUrlTest(BaseTestCase):
-    def test_can_get(self):
-        rst = get_upload_url(self.fake_request, self.repo.id)
-        assert '8082' in rst