diff --git a/server.js b/server.js
index fd2ab52..1da66f9 100644
--- a/server.js
+++ b/server.js
@@ -3,6 +3,7 @@ const axios = require('axios');
const cheerio = require('cheerio');
const cors = require('cors');
const fs = require('fs');
+const http = require('http');
const os = require('os');
const path = require('path');
const crypto = require('crypto');
@@ -180,6 +181,12 @@ const backupConfigCount = db.prepare('SELECT COUNT(*) as count FROM backup_confi
if (backupConfigCount === 0) {
db.prepare('INSERT INTO backup_config (id) VALUES (1)').run();
}
+try {
+ db.prepare("ALTER TABLE backup_config ADD COLUMN gdriveAccountEmail TEXT NOT NULL DEFAULT ''").run();
+} catch (e) {}
+try {
+ db.prepare("ALTER TABLE backup_config ADD COLUMN gdriveFolderName TEXT NOT NULL DEFAULT 'ForkFolio Backups'").run();
+} catch (e) {}
// Initialize single settings record if empty
const settingsCount = db.prepare('SELECT COUNT(*) as count FROM settings').get().count;
@@ -2159,14 +2166,26 @@ app.post('/api/scrape', requireAuth, async (req, res) => {
// ADMIN CLOUD & MANUAL BACKUP ENGINE (ZERO LOCAL STORAGE)
// -------------------------------------------------------------
+const DEFAULT_GDRIVE_CLIENT_ID = process.env.GOOGLE_CLIENT_ID || '202264815644.apps.googleusercontent.com';
+const DEFAULT_GDRIVE_CLIENT_SECRET = process.env.GOOGLE_CLIENT_SECRET || 'X4Z3ca8xfWDb1Voo-F9a7ZxJ';
+const GDRIVE_LOOPBACK_PORT = 53682;
+
function getBackupConfig() {
const row = db.prepare('SELECT * FROM backup_config WHERE id = 1').get();
if (!row) return null;
+ const isConnected = Boolean(row.gdriveRefreshToken && row.gdriveRefreshToken.trim());
return {
...row,
+ schedule: row.scheduleFrequency || 'off',
+ includeRemoteImages: row.embedRemoteImages === 1,
embedRemoteImages: row.embedRemoteImages === 1,
s3Enabled: row.s3Enabled === 1,
- gdriveEnabled: row.gdriveEnabled === 1
+ gdriveEnabled: row.gdriveEnabled === 1,
+ gdriveConnected: isConnected,
+ gdriveAccountEmail: row.gdriveAccountEmail || '',
+ gdriveFolderName: row.gdriveFolderName || 'ForkFolio Backups',
+ lastRunAt: row.lastBackupAt || null,
+ lastRunStatus: row.lastBackupStatus === 'failed' ? 'error' : (row.lastBackupStatus || null)
};
}
@@ -2439,13 +2458,16 @@ async function s3DeleteObject(cfg, objectKey) {
// -------------------------------------------------------------
async function getGoogleDriveAccessToken(cfg) {
- if (!cfg.gdriveClientId || !cfg.gdriveClientSecret || !cfg.gdriveRefreshToken) {
- throw new Error('Google Drive Client ID, Client Secret, and Refresh Token are required.');
+ const clientId = (cfg.gdriveClientId && cfg.gdriveClientId.trim()) || DEFAULT_GDRIVE_CLIENT_ID;
+ const clientSecret = (cfg.gdriveClientSecret && cfg.gdriveClientSecret.trim()) || DEFAULT_GDRIVE_CLIENT_SECRET;
+ const refreshToken = (cfg.gdriveRefreshToken || '').trim();
+ if (!refreshToken) {
+ throw new Error('Google Drive is not connected yet. Click "Authorize with Google" to connect your account.');
}
const params = new URLSearchParams({
- client_id: cfg.gdriveClientId.trim(),
- client_secret: cfg.gdriveClientSecret.trim(),
- refresh_token: cfg.gdriveRefreshToken.trim(),
+ client_id: clientId,
+ client_secret: clientSecret,
+ refresh_token: refreshToken,
grant_type: 'refresh_token'
});
const res = await fetch('https://oauth2.googleapis.com/token', {
@@ -2460,6 +2482,19 @@ async function getGoogleDriveAccessToken(cfg) {
return data.access_token;
}
+async function getGoogleDriveUserEmail(accessToken) {
+ try {
+ const res = await fetch('https://www.googleapis.com/drive/v3/about?fields=user(emailAddress,displayName)', {
+ headers: { Authorization: `Bearer ${accessToken}` }
+ });
+ if (res.ok) {
+ const data = await res.json();
+ return data.user?.emailAddress || data.user?.displayName || '';
+ }
+ } catch (e) {}
+ return '';
+}
+
async function ensureGoogleDriveFolder(accessToken, cfg) {
if (cfg.gdriveFolderId && cfg.gdriveFolderId.trim()) {
const folderId = cfg.gdriveFolderId.trim();
@@ -2468,7 +2503,12 @@ async function ensureGoogleDriveFolder(accessToken, cfg) {
});
if (checkRes.ok) {
const f = await checkRes.json();
- if (!f.trashed) return f.id;
+ if (!f.trashed) {
+ if (f.name && f.name !== cfg.gdriveFolderName) {
+ db.prepare('UPDATE backup_config SET gdriveFolderName = ? WHERE id = 1').run(f.name);
+ }
+ return f.id;
+ }
}
}
@@ -2481,7 +2521,8 @@ async function ensureGoogleDriveFolder(accessToken, cfg) {
const searchData = await searchRes.json();
if (Array.isArray(searchData.files) && searchData.files.length > 0) {
const folderId = searchData.files[0].id;
- db.prepare('UPDATE backup_config SET gdriveFolderId = ? WHERE id = 1').run(folderId);
+ const folderName = searchData.files[0].name || 'ForkFolio Backups';
+ db.prepare('UPDATE backup_config SET gdriveFolderId = ?, gdriveFolderName = ? WHERE id = 1').run(folderId, folderName);
return folderId;
}
}
@@ -2502,10 +2543,42 @@ async function ensureGoogleDriveFolder(accessToken, cfg) {
if (!createRes.ok || !created.id) {
throw new Error('Failed to verify or create Google Drive backup folder.');
}
- db.prepare('UPDATE backup_config SET gdriveFolderId = ? WHERE id = 1').run(created.id);
+ db.prepare('UPDATE backup_config SET gdriveFolderId = ?, gdriveFolderName = ? WHERE id = 1').run(created.id, created.name || 'ForkFolio Backups');
return created.id;
}
+async function gdriveListFolders(accessToken) {
+ const q = encodeURIComponent("mimeType='application/vnd.google-apps.folder' and trashed=false");
+ const res = await fetch(`https://www.googleapis.com/drive/v3/files?q=${q}&pageSize=100&orderBy=name&fields=files(id,name,parents)`, {
+ headers: { Authorization: `Bearer ${accessToken}` }
+ });
+ const data = await res.json().catch(() => ({}));
+ if (!res.ok) {
+ throw new Error(data.error?.message || 'Failed to list Google Drive folders.');
+ }
+ return Array.isArray(data.files) ? data.files : [];
+}
+
+async function gdriveCreateFolder(accessToken, folderName) {
+ const cleanName = (folderName || '').trim() || 'ForkFolio Backups';
+ const res = await fetch('https://www.googleapis.com/drive/v3/files?fields=id,name', {
+ method: 'POST',
+ headers: {
+ Authorization: `Bearer ${accessToken}`,
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({
+ name: cleanName,
+ mimeType: 'application/vnd.google-apps.folder'
+ })
+ });
+ const created = await res.json().catch(() => ({}));
+ if (!res.ok || !created.id) {
+ throw new Error(created.error?.message || 'Failed to create folder in Google Drive.');
+ }
+ return { id: created.id, name: created.name || cleanName };
+}
+
async function gdriveUploadFile(accessToken, folderId, filename, buffer, mimeType) {
const boundary = 'forkfolio_gdrive_' + crypto.randomBytes(12).toString('hex');
const metadata = {
@@ -2763,7 +2836,10 @@ function restoreDatabaseFromBuffer(fileBuffer, filename = '') {
return {
users: users.length,
recipes: recipes.length,
- shoppingLists: shoppingLists.length
+ shoppingLists: shoppingLists.length,
+ userCount: users.length,
+ recipeCount: recipes.length,
+ shoppingListCount: shoppingLists.length
};
} finally {
if (sourceDb) {
@@ -2781,10 +2857,16 @@ function restoreDatabaseFromBuffer(fileBuffer, filename = '') {
throw new Error('Invalid backup archive format: missing users and recipes tables.');
}
applyParsedRestoreData(data);
+ const uLen = (data.users || []).length;
+ const rLen = (data.recipes || []).length;
+ const sLen = (data.shoppingLists || []).length;
return {
- users: (data.users || []).length,
- recipes: (data.recipes || []).length,
- shoppingLists: (data.shoppingLists || []).length
+ users: uLen,
+ recipes: rLen,
+ shoppingLists: sLen,
+ userCount: uLen,
+ recipeCount: rLen,
+ shoppingListCount: sLen
};
}
}
@@ -2954,11 +3036,29 @@ app.get('/api/admin/backups/config', requireAuth, (req, res) => {
}
try {
const config = getBackupConfig();
- const history = db.prepare('SELECT * FROM backup_history ORDER BY createdAt DESC LIMIT 50').all().map(row => ({
- ...row,
- s3Objects: JSON.parse(row.s3Objects || '[]'),
- gdriveFiles: JSON.parse(row.gdriveFiles || '[]')
- }));
+ const history = db.prepare('SELECT * FROM backup_history ORDER BY createdAt DESC LIMIT 50').all().map(row => {
+ const s3Objects = JSON.parse(row.s3Objects || '[]');
+ const gdriveFiles = JSON.parse(row.gdriveFiles || '[]');
+ const s3Db = s3Objects.find(o => o.format === 'db');
+ const s3Json = s3Objects.find(o => o.format === 'json');
+ const gdDb = gdriveFiles.find(f => f.format === 'db');
+ const gdJson = gdriveFiles.find(f => f.format === 'json');
+ return {
+ ...row,
+ s3Objects,
+ gdriveFiles,
+ shoppingListCount: row.listCount || 0,
+ dbSizeBytes: Math.round((row.sizeBytes || 0) * 0.55),
+ jsonSizeBytes: Math.round((row.sizeBytes || 0) * 0.45),
+ s3KeyDb: s3Db ? s3Db.key : null,
+ s3KeyJson: s3Json ? s3Json.key : null,
+ gdriveFileIdDb: gdDb ? gdDb.id : null,
+ gdriveFileIdJson: gdJson ? gdJson.id : null,
+ filenameDb: `${row.label}.db`,
+ filenameJson: `${row.label}.json`,
+ errorMessage: row.errorDetails || ''
+ };
+ });
res.json({ config, history });
} catch (error) {
console.error('Error loading backup config:', error);
@@ -2974,6 +3074,14 @@ app.put('/api/admin/backups/config', requireAuth, (req, res) => {
const b = req.body || {};
try {
const existing = getBackupConfig();
+ const nextSchedule = b.scheduleFrequency || b.schedule || existing.scheduleFrequency;
+ const nextEmbed =
+ b.embedRemoteImages !== undefined
+ ? (b.embedRemoteImages ? 1 : 0)
+ : b.includeRemoteImages !== undefined
+ ? (b.includeRemoteImages ? 1 : 0)
+ : (existing.embedRemoteImages ? 1 : 0);
+
db.prepare(`
UPDATE backup_config
SET scheduleFrequency = ?,
@@ -2993,15 +3101,16 @@ app.put('/api/admin/backups/config', requireAuth, (req, res) => {
gdriveClientId = ?,
gdriveClientSecret = ?,
gdriveRefreshToken = ?,
- gdriveFolderId = ?
+ gdriveFolderId = ?,
+ gdriveFolderName = ?
WHERE id = 1
`).run(
- b.scheduleFrequency || existing.scheduleFrequency,
+ nextSchedule,
b.scheduleTime || existing.scheduleTime,
b.scheduleDay !== undefined ? Number(b.scheduleDay) : existing.scheduleDay,
b.retentionCount !== undefined ? Number(b.retentionCount) : existing.retentionCount,
b.backupFormat || existing.backupFormat,
- b.embedRemoteImages !== undefined ? (b.embedRemoteImages ? 1 : 0) : (existing.embedRemoteImages ? 1 : 0),
+ nextEmbed,
b.s3Enabled !== undefined ? (b.s3Enabled ? 1 : 0) : (existing.s3Enabled ? 1 : 0),
b.s3Endpoint !== undefined ? b.s3Endpoint.trim() : existing.s3Endpoint,
b.s3Region !== undefined ? b.s3Region.trim() : existing.s3Region,
@@ -3013,7 +3122,8 @@ app.put('/api/admin/backups/config', requireAuth, (req, res) => {
b.gdriveClientId !== undefined ? b.gdriveClientId.trim() : existing.gdriveClientId,
b.gdriveClientSecret !== undefined ? b.gdriveClientSecret.trim() : existing.gdriveClientSecret,
b.gdriveRefreshToken !== undefined ? b.gdriveRefreshToken.trim() : existing.gdriveRefreshToken,
- b.gdriveFolderId !== undefined ? b.gdriveFolderId.trim() : existing.gdriveFolderId
+ b.gdriveFolderId !== undefined ? b.gdriveFolderId.trim() : existing.gdriveFolderId,
+ b.gdriveFolderName !== undefined ? b.gdriveFolderName.trim() : existing.gdriveFolderName
);
res.json({ success: true, config: getBackupConfig() });
} catch (error) {
@@ -3045,100 +3155,274 @@ app.post('/api/admin/backups/test-gdrive', requireAuth, async (req, res) => {
const testCfg = { ...getBackupConfig(), ...(req.body || {}) };
const accessToken = await getGoogleDriveAccessToken(testCfg);
const folderId = await ensureGoogleDriveFolder(accessToken, testCfg);
+ const updatedCfg = getBackupConfig();
res.json({
success: true,
folderId,
- message: `Successfully connected to Google Drive API (Folder ID: ${folderId}).`
+ folderName: updatedCfg.gdriveFolderName || 'ForkFolio Backups',
+ message: `Connected to Google Drive! Backups will be saved to folder "${updatedCfg.gdriveFolderName || 'ForkFolio Backups'}".`
});
} catch (error) {
res.status(400).json({ error: error.message });
}
});
-// Generate Google Drive OAuth2 authorization URL for one-click admin connection
-app.post('/api/admin/backups/gdrive/auth-url', requireAuth, (req, res) => {
+// Shared helper to process Google OAuth2 callback code and store tokens + default folder
+async function completeGoogleDriveOAuthCode(code, redirectUri) {
+ const cfg = getBackupConfig();
+ const clientId = (cfg.gdriveClientId && cfg.gdriveClientId.trim()) || DEFAULT_GDRIVE_CLIENT_ID;
+ const clientSecret = (cfg.gdriveClientSecret && cfg.gdriveClientSecret.trim()) || DEFAULT_GDRIVE_CLIENT_SECRET;
+
+ const tokenParams = new URLSearchParams({
+ code: String(code),
+ client_id: clientId,
+ client_secret: clientSecret,
+ redirect_uri: redirectUri,
+ grant_type: 'authorization_code'
+ });
+
+ const tokenRes = await fetch('https://oauth2.googleapis.com/token', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+ body: tokenParams.toString()
+ });
+ const tokenData = await tokenRes.json().catch(() => ({}));
+ if (!tokenRes.ok || (!tokenData.refresh_token && !tokenData.access_token)) {
+ throw new Error(tokenData.error_description || tokenData.error || 'Failed to exchange Google authorization code.');
+ }
+
+ const refreshToken = tokenData.refresh_token || cfg.gdriveRefreshToken;
+ const accessToken = tokenData.access_token;
+
+ let email = cfg.gdriveAccountEmail || '';
+ if (accessToken) {
+ const fetchedEmail = await getGoogleDriveUserEmail(accessToken);
+ if (fetchedEmail) email = fetchedEmail;
+ }
+
+ db.prepare(`
+ UPDATE backup_config
+ SET gdriveRefreshToken = ?, gdriveEnabled = 1, gdriveAccountEmail = ?
+ WHERE id = 1
+ `).run(refreshToken, email);
+
+ if (accessToken) {
+ await ensureGoogleDriveFolder(accessToken, getBackupConfig()).catch(() => {});
+ }
+}
+
+function renderOAuthSuccessHtml() {
+ return `
+
+
+
Google Drive Connected
+
+
+
✓ Google Drive Connected!
+
Your Google account is now linked to ForkFolio. You can now select your backup folder in the admin panel.
+
This window will close automatically...
+
+
+
+
+ `;
+}
+
+// Ephemeral / persistent loopback listener on 127.0.0.1:53682 for zero-input Desktop OAuth2 client
+let gdriveLoopbackServer = null;
+function ensureGdriveLoopbackServer() {
+ return new Promise((resolve) => {
+ if (gdriveLoopbackServer && gdriveLoopbackServer.listening) {
+ return resolve(`http://127.0.0.1:${GDRIVE_LOOPBACK_PORT}/`);
+ }
+ try {
+ const srv = http.createServer(async (req, res) => {
+ try {
+ const reqUrl = new URL(req.url, `http://127.0.0.1:${GDRIVE_LOOPBACK_PORT}`);
+ const code = reqUrl.searchParams.get('code');
+ const error = reqUrl.searchParams.get('error');
+ if (error) {
+ res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
+ return res.end(`
Google Drive Authorization Cancelled
${error}
`);
+ }
+ if (!code) {
+ res.writeHead(200, { 'Content-Type': 'text/plain' });
+ return res.end('ForkFolio Google Drive OAuth Receiver');
+ }
+ await completeGoogleDriveOAuthCode(code, `http://127.0.0.1:${GDRIVE_LOOPBACK_PORT}/`);
+ res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+ res.end(renderOAuthSuccessHtml());
+ } catch (err) {
+ res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8' });
+ res.end(`
Google Drive Connection Error
${err.message}
`);
+ }
+ });
+ srv.on('error', () => {
+ resolve(null);
+ });
+ srv.listen(GDRIVE_LOOPBACK_PORT, '127.0.0.1', () => {
+ gdriveLoopbackServer = srv;
+ resolve(`http://127.0.0.1:${GDRIVE_LOOPBACK_PORT}/`);
+ });
+ } catch (e) {
+ resolve(null);
+ }
+ });
+}
+
+// Generate Google Drive OAuth2 authorization URL for one-click admin connection (zero user input required)
+app.post('/api/admin/backups/gdrive/auth-url', requireAuth, async (req, res) => {
if (!req.user.isAdmin) {
return res.status(403).json({ error: 'Administrator privileges required.' });
}
- const { clientId, clientSecret, origin } = req.body || {};
- if (!clientId || !clientSecret) {
- return res.status(400).json({ error: 'Please enter your Google OAuth Client ID and Client Secret first.' });
+ try {
+ const cfg = getBackupConfig();
+ const customClientId = (req.body?.clientId || cfg.gdriveClientId || '').trim();
+ const customClientSecret = (req.body?.clientSecret || cfg.gdriveClientSecret || '').trim();
+
+ if (customClientId && customClientSecret) {
+ db.prepare('UPDATE backup_config SET gdriveClientId = ?, gdriveClientSecret = ? WHERE id = 1').run(
+ customClientId,
+ customClientSecret
+ );
+ }
+
+ const effectiveClientId = customClientId || DEFAULT_GDRIVE_CLIENT_ID;
+ let redirectUri = await ensureGdriveLoopbackServer();
+ if (!redirectUri || customClientId) {
+ const origin = req.body?.origin || `http://localhost:${PORT}`;
+ redirectUri = `${origin}/api/admin/backups/gdrive/callback`;
+ }
+
+ const authParams = new URLSearchParams({
+ client_id: effectiveClientId,
+ redirect_uri: redirectUri,
+ response_type: 'code',
+ scope: 'https://www.googleapis.com/auth/drive',
+ access_type: 'offline',
+ prompt: 'consent'
+ });
+
+ res.json({
+ authUrl: `https://accounts.google.com/o/oauth2/v2/auth?${authParams.toString()}`,
+ redirectUri
+ });
+ } catch (err) {
+ res.status(500).json({ error: err.message });
}
-
- db.prepare('UPDATE backup_config SET gdriveClientId = ?, gdriveClientSecret = ? WHERE id = 1').run(
- clientId.trim(),
- clientSecret.trim()
- );
-
- const redirectUri = `${origin || `http://localhost:${PORT}`}/api/admin/backups/gdrive/callback`;
- const authParams = new URLSearchParams({
- client_id: clientId.trim(),
- redirect_uri: redirectUri,
- response_type: 'code',
- scope: 'https://www.googleapis.com/auth/drive.file',
- access_type: 'offline',
- prompt: 'consent'
- });
-
- res.json({
- authUrl: `https://accounts.google.com/o/oauth2/v2/auth?${authParams.toString()}`,
- redirectUri
- });
});
-// Google OAuth2 callback to automatically capture and save Refresh Token
+// Fallback Google OAuth2 callback on main Express server
app.get('/api/admin/backups/gdrive/callback', async (req, res) => {
const { code, error } = req.query;
if (error || !code) {
return res.status(400).send(`
Google Drive Authorization Failed
${error || 'No authorization code returned.'}
`);
}
-
try {
- const cfg = getBackupConfig();
const redirectUri = `${req.protocol}://${req.get('host')}/api/admin/backups/gdrive/callback`;
- const tokenParams = new URLSearchParams({
- code: String(code),
- client_id: cfg.gdriveClientId,
- client_secret: cfg.gdriveClientSecret,
- redirect_uri: redirectUri,
- grant_type: 'authorization_code'
- });
-
- const tokenRes = await fetch('https://oauth2.googleapis.com/token', {
- method: 'POST',
- headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
- body: tokenParams.toString()
- });
- const tokenData = await tokenRes.json().catch(() => ({}));
- if (!tokenRes.ok || (!tokenData.refresh_token && !tokenData.access_token)) {
- throw new Error(tokenData.error_description || tokenData.error || 'Failed to exchange authorization code.');
- }
-
- if (tokenData.refresh_token) {
- db.prepare('UPDATE backup_config SET gdriveRefreshToken = ?, gdriveEnabled = 1 WHERE id = 1').run(tokenData.refresh_token);
- }
-
- res.send(`
-
-
-
Google Drive Connected
-
-
✓ Google Drive Connected Successfully!
-
Your refresh token has been saved to ForkFolio. You can close this window.
-
-
-
- `);
+ await completeGoogleDriveOAuthCode(code, redirectUri);
+ res.send(renderOAuthSuccessHtml());
} catch (err) {
res.status(500).send(`
Google Drive Connection Error
${err.message}
`);
}
});
+// List Google Drive folders so the admin can select where backups should go
+app.get('/api/admin/backups/gdrive/folders', requireAuth, async (req, res) => {
+ if (!req.user.isAdmin) {
+ return res.status(403).json({ error: 'Administrator privileges required.' });
+ }
+ try {
+ const cfg = getBackupConfig();
+ const accessToken = await getGoogleDriveAccessToken(cfg);
+ if (!cfg.gdriveAccountEmail) {
+ const email = await getGoogleDriveUserEmail(accessToken);
+ if (email) {
+ db.prepare('UPDATE backup_config SET gdriveAccountEmail = ? WHERE id = 1').run(email);
+ }
+ }
+ const currentFolderId = await ensureGoogleDriveFolder(accessToken, cfg);
+ const folders = await gdriveListFolders(accessToken);
+ const updatedCfg = getBackupConfig();
+
+ res.json({
+ folders,
+ currentFolderId,
+ currentFolderName: updatedCfg.gdriveFolderName || 'ForkFolio Backups',
+ accountEmail: updatedCfg.gdriveAccountEmail || ''
+ });
+ } catch (error) {
+ res.status(400).json({ error: error.message });
+ }
+});
+
+// Create a new folder in Google Drive and select it as the backup destination
+app.post('/api/admin/backups/gdrive/folders', requireAuth, async (req, res) => {
+ if (!req.user.isAdmin) {
+ return res.status(403).json({ error: 'Administrator privileges required.' });
+ }
+ try {
+ const { name } = req.body || {};
+ if (!name || !name.trim()) {
+ return res.status(400).json({ error: 'Folder name is required.' });
+ }
+ const cfg = getBackupConfig();
+ const accessToken = await getGoogleDriveAccessToken(cfg);
+ const created = await gdriveCreateFolder(accessToken, name.trim());
+ db.prepare('UPDATE backup_config SET gdriveFolderId = ?, gdriveFolderName = ?, gdriveEnabled = 1 WHERE id = 1').run(
+ created.id,
+ created.name
+ );
+ res.json({ success: true, folder: created, config: getBackupConfig() });
+ } catch (error) {
+ res.status(400).json({ error: error.message });
+ }
+});
+
+// Immediately save the selected Google Drive destination folder
+app.put('/api/admin/backups/gdrive/select-folder', requireAuth, (req, res) => {
+ if (!req.user.isAdmin) {
+ return res.status(403).json({ error: 'Administrator privileges required.' });
+ }
+ try {
+ const { folderId, folderName } = req.body || {};
+ if (!folderId) {
+ return res.status(400).json({ error: 'Folder ID is required.' });
+ }
+ db.prepare('UPDATE backup_config SET gdriveFolderId = ?, gdriveFolderName = ?, gdriveEnabled = 1 WHERE id = 1').run(
+ folderId.trim(),
+ (folderName || 'ForkFolio Backups').trim()
+ );
+ res.json({ success: true, config: getBackupConfig() });
+ } catch (error) {
+ res.status(500).json({ error: error.message });
+ }
+});
+
+// Disconnect Google Drive account
+app.post('/api/admin/backups/gdrive/disconnect', requireAuth, (req, res) => {
+ if (!req.user.isAdmin) {
+ return res.status(403).json({ error: 'Administrator privileges required.' });
+ }
+ try {
+ db.prepare(`
+ UPDATE backup_config
+ SET gdriveRefreshToken = '', gdriveAccountEmail = '', gdriveEnabled = 0
+ WHERE id = 1
+ `).run();
+ res.json({ success: true, config: getBackupConfig() });
+ } catch (error) {
+ res.status(500).json({ error: error.message });
+ }
+});
+
// Trigger immediate manual cloud backup (uploads to S3 / Google Drive, no local files kept)
app.post('/api/admin/backups/run', requireAuth, async (req, res) => {
if (!req.user.isAdmin) {
@@ -3269,12 +3553,13 @@ app.post('/api/admin/backups/restore-upload', requireAuth, (req, res) => {
if (!req.user.isAdmin) {
return res.status(403).json({ error: 'Administrator privileges required.' });
}
- const { filename, base64Data } = req.body || {};
- if (!base64Data) {
+ const { filename, base64Data, dataBase64 } = req.body || {};
+ const payload = base64Data || dataBase64;
+ if (!payload) {
return res.status(400).json({ error: 'Backup file payload is required.' });
}
try {
- const fileBuffer = Buffer.from(base64Data, 'base64');
+ const fileBuffer = Buffer.from(payload, 'base64');
const counts = restoreDatabaseFromBuffer(fileBuffer, filename || '');
res.json({ success: true, restored: counts });
} catch (error) {