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

Merge pull request 'fix/storage-test3' (#40) from fix/storage-test3 into develop

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/server/pulls/40
This commit is contained in:
Sergey Konovalov
2025-06-19 14:55:46 +00:00
parent f760a9a41f f123c1d897
commit 9e101b7e43
7 changed files with 313 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Common/sources/storage/storage-base.js
View File

@ -141,12 +141,13 @@ async function deletePath(ctx, strPath, opt_specialDir) {
let storageCfg = getStorageCfg(ctx, opt_specialDir);
return await storage.deletePath(storageCfg, getStoragePath(ctx, strPath, opt_specialDir));
}
async function getSignedUrl(ctx, baseUrl, strPath, urlType, optFilename, opt_creationDate, opt_specialDir) {
async function getSignedUrl(ctx, baseUrl, strPath, urlType, optFilename, opt_creationDate, opt_specialDir, useDirectStorageUrls) {
let storage = getStorage(opt_specialDir);
let storageCfg = getStorageCfg(ctx, opt_specialDir);
let storagePath = getStoragePath(ctx, strPath, opt_specialDir);
const directUrlsEnabled = useDirectStorageUrls ?? storageCfg.useDirectStorageUrls;
if (storageCfg.useDirectStorageUrls && storage.getDirectSignedUrl) {
if (directUrlsEnabled && storage.getDirectSignedUrl) {
return await storage.getDirectSignedUrl(ctx, storageCfg, baseUrl, storagePath, urlType, optFilename, opt_creationDate);
} else {
const storageSecretString = storageCfg.fs.secretString;