pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/jwtHistoryFiles

Browse Source
This commit is contained in:
Andrey
2021-12-22 17:13:10 +03:00
committed by GitHub
parent 16a0846248 8d194b78a1
commit 096102fa59
81 changed files with 469 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/documentserver-example/python/src/utils/docManager.py
View File

@ -164,7 +164,7 @@ def getRootFolder(req):
else:
curAdr = req.META['REMOTE_ADDR']
directory = os.path.join(config.STORAGE_PATH, curAdr)
directory = config.STORAGE_PATH if os.path.isabs(config.STORAGE_PATH) else os.path.join(config.STORAGE_PATH, curAdr)
if not os.path.exists(directory): # if such a directory does not exist, make it
os.makedirs(directory)

4
web/documentserver-example/python/src/utils/users.py
View File

@ -79,7 +79,7 @@ descr_user_0 = [
USERS = [
User('uid-1', 'John Smith', 'smith@example.com',
None, None, {},
'', None, {},
None, [], descr_user_1, True),
User('uid-2', 'Mark Pottato', 'pottato@example.com',
'group-2', ['group-2', ''], {
@ -96,7 +96,7 @@ USERS = [
},
False, ["copy", "download", "print"], descr_user_3, False),
User('uid-0', None, None,
None, None, {},
'', None, {},
None, [], descr_user_0, False)
]

5
web/documentserver-example/python/src/views/actions.py
View File

@ -154,7 +154,7 @@ def edit(request):
ext = fileUtils.getFileExt(filename)
fileUri = docManager.getFileUri(filename, True, request)
fileUriUser = docManager.getFileUri(filename, False, request)
fileUriUser = docManager.getDownloadUrl(filename, request) + "&dmode=emb" if os.path.isabs(config.STORAGE_PATH) else docManager.getFileUri(filename, False, request)
docKey = docManager.generateFileKey(filename, request)
fileType = fileUtils.getFileType(filename)
user = users.getUserFromReq(request) # get user
@ -361,8 +361,9 @@ def download(request):
try:
fileName = fileUtils.getFileName(request.GET['fileName']) # get the file name
userAddress = request.GET.get('userAddress') if request.GET.get('userAddress') else request
isEmbedded = request.GET.get('dmode')
if (jwtManager.isEnabled()):
if (jwtManager.isEnabled() and isEmbedded == None):
jwtHeader = 'Authorization' if config.DOC_SERV_JWT_HEADER is None or config.DOC_SERV_JWT_HEADER == '' else config.DOC_SERV_JWT_HEADER
token = request.headers.get(jwtHeader)
if token: