krao/fourge-portal
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: proxy file uploads server-side via action=upload, fixes CORS for all roles

Browse Source
This commit is contained in:
Krao Hasanee
2026-06-02 14:19:59 -04:00
parent e11ef45140
commit ae093a9b1c
3 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/FileBrowser.jsx
+9 -11
View File
@@ -211,13 +211,15 @@ export default function FileBrowser({ initialPath = '/', rootPath = '/' }) {
finally { setWorking(''); }
};
async function uploadOneFile(url, token, fbPath, file, retries = 3) {
async function uploadOneFile(vPath, file, retries = 3) {
for (let attempt = 1; attempt <= retries; attempt++) {
try {
const res = await fetch(`${url}/api/resources?source=srv&path=${encodeURIComponent(fbPath)}&override=true&auth=${encodeURIComponent(token)}`, {
method: 'POST', headers: { 'Content-Type': 'application/octet-stream' }, body: file,
const res = await apiFetch(`/api/filebrowser?action=upload&path=${encodeURIComponent(vPath)}`, {
method: 'POST',
headers: { 'Content-Type': 'application/octet-stream' },
body: file,
});
if (!res.ok) { const t = await res.text(); throw new Error(t || res.status); }
if (!res) return;
return;
} catch (err) {
if (attempt === retries) throw err;
@@ -231,10 +233,8 @@ export default function FileBrowser({ initialPath = '/', rootPath = '/' }) {
if (!sel.length) return;
setWorking('upload'); setUploadProgress(0); setError('');
try {
const tokenData = await apiFetch('/api/filebrowser?action=upload-token', { method: 'POST', body: JSON.stringify({ path: currentPath }) });
const { token, url, fbPath } = tokenData;
for (let i = 0; i < sel.length; i++) {
await uploadOneFile(url, token, joinVirtualPath(fbPath, sel[i].name), sel[i]);
await uploadOneFile(joinVirtualPath(currentPath, sel[i].name), sel[i]);
setUploadProgress(Math.round(((i + 1) / sel.length) * 100));
}
} catch (err) { setError(err.message); }
@@ -250,18 +250,16 @@ export default function FileBrowser({ initialPath = '/', rootPath = '/' }) {
if (!sel.length) return;
setWorking('upload'); setUploadProgress(0); setError('');
try {
const tokenData = await apiFetch('/api/filebrowser?action=upload-token', { method: 'POST', body: JSON.stringify({ path: currentPath }) });
const { token, url, fbPath } = tokenData;
const dirsNeeded = new Set();
for (const file of sel) {
const parts = file.webkitRelativePath.split('/').slice(0, -1);
for (let i = 1; i <= parts.length; i++) dirsNeeded.add(parts.slice(0, i).join('/'));
}
for (const dir of [...dirsNeeded].sort((a, b) => a.split('/').length - b.split('/').length)) {
await fetch(`${url}/api/resources?source=srv&path=${encodeURIComponent(joinVirtualPath(fbPath, dir))}&isDir=true&auth=${encodeURIComponent(token)}`, { method: 'POST' }).catch(() => {});
await apiFetch(`/api/filebrowser?action=mkdir`, { method: 'POST', body: JSON.stringify({ path: currentPath, name: dir.split('/').pop() }) }).catch(() => {});
}
for (let i = 0; i < sel.length; i++) {
await uploadOneFile(url, token, joinVirtualPath(fbPath, sel[i].webkitRelativePath), sel[i]);
await uploadOneFile(joinVirtualPath(currentPath, sel[i].webkitRelativePath), sel[i]);
setUploadProgress(Math.round(((i + 1) / sel.length) * 100));
}
} catch (err) { setError(err.message); }
src/pages/FileSharing.jsx
+2 -17
View File
@@ -207,26 +207,11 @@ async function fbqProxy(op, path, extra = {}) {
}
if (op === 'upload') {
const normalized = String(path || '/');
const parts = normalized.split('/').filter(Boolean);
const fileName = parts.pop() || '';
const parentPath = `/${parts.join('/')}` || '/';
const tokenResponse = await fetch(`/api/filebrowser?action=upload-token&sb_access_token=${encodeURIComponent(accessToken)}`, {
method: 'POST',
headers: { ...authHeaders, 'Content-Type': 'application/json' },
body: JSON.stringify({ path: parentPath }),
});
if (!tokenResponse.ok) {
const text = await tokenResponse.text();
throw new Error(text || `Error ${tokenResponse.status}`);
}
const { token, url, fbPath } = await tokenResponse.json();
if (!token || !url || !fbPath) throw new Error('Upload token unavailable.');
const file = extra.body?.get?.('file');
if (!file) throw new Error('No file provided.');
const uploadResponse = await fetch(`${url}/api/resources?source=srv&path=${encodeURIComponent(`${fbPath}/${fileName}`)}&override=true&auth=${encodeURIComponent(token)}`, {
const uploadResponse = await fetch(`/api/filebrowser?action=upload&path=${encodeURIComponent(path)}&sb_access_token=${encodeURIComponent(accessToken)}`, {
method: 'POST',
headers: { 'Content-Type': 'application/octet-stream' },
headers: { ...authHeaders, 'Content-Type': 'application/octet-stream' },
body: file,
});
if (!uploadResponse.ok) {