Refactor Dockerfile and docker-compose.yml to use new directory structure and update volume paths

routes/Dpanel/API/GetMetaDataFile.js

@@ -0,0 +1,53 @@
+const express = require('express');
+const fs = require('fs');
+const path = require('path');
+const router = express.Router();
+const fileUpload = require('express-fileupload');
+const authMiddleware = require('../../../Middlewares/authMiddleware');
+const { loggers } = require('winston');
+const ncp = require('ncp').ncp;
+const configFile = fs.readFileSync(path.join(__dirname, '../../../data', 'setup.json'), 'utf-8')
+const config = JSON.parse(configFile);
+const bodyParser = require('body-parser');
+const crypto = require('crypto');
+const os = require('os');
+const { getUserData, getSetupData } = require('../../../Middlewares/watcherMiddleware');
+const { logger, logRequestInfo, ErrorLogger, authLogger } = require('../../../config/logs');
+
+let setupData = getSetupData();
+let userData = getUserData();
+router.use(bodyParser.json());
+
+router.get('/', (req, res) => {
+    res.status(400).json({ error: 'Bad Request. The request cannot be fulfilled due to bad syntax or missing parameters.' });
+});
+
+router.post('/file_info', authMiddleware, (req, res) => {
+    const filePath = path.join(__dirname, '../../../data', 'file_info.json');
+
+    if (!fs.existsSync(filePath)) {
+        return res.status(404).json({ error: 'The specified file does not exist.' });
+    }
+
+    fs.readFile(filePath, 'utf-8', (err, data) => {
+        if (err) {
+            console.error(err);
+            return res.status(500).json({ error: 'Error reading the file.' });
+        }
+
+        const fileInfos = JSON.parse(data);
+        const fileLink = req.body.fileLink;
+        const fileName = fileLink.split('/').pop();
+
+        const fileInfo = fileInfos.find(file => file.fileName === fileName && file.Id);
+        console.log(fileInfos);
+
+        if (!fileInfo) {
+            return res.status(404).json({ error: `No information found for the file ${fileName}.` });
+        }
+
+        res.json(fileInfo);
+    });
+});
+
+module.exports = router;

routes/Dpanel/API/MoveFile.js

@@ -28,20 +28,24 @@ router.post('/', authMiddleware, async (req, res) => {
     const fileName = req.body.fileName;
     const folderName = req.body.folderName;
 
+    if (!fileName || fileName.trim() === '') {
+        return res.status(400).send('No file selected for moving.');
+    }
+
     const data = await fs.readFileSync(path.join(__dirname, '../../../data', 'user.json'), 'utf-8')
     const users = JSON.parse(data);
     const user = users.find(user => user.id === req.user.id);
 
     if (!user) {
         console.error('User not found in user.json');
-        return res.status(500).send('Erreur lors du déplacement du fichier.');
+        return res.status(500).send('Error moving the file.');
     }
 
     const userId = user.name;
 
     if (!fileName || !userId) {
         console.error('fileName or userId is undefined');
-        return res.status(500).send('Erreur lors du déplacement du fichier.');
+        return res.status(500).send('Error moving the file.');
     }
 
     const sourcePath = path.join('cdn-files', userId, fileName);
@@ -72,7 +76,7 @@ router.post('/', authMiddleware, async (req, res) => {
         res.redirect('/dpanel/dashboard');
     } catch (err) {
         console.error(err);
-        return res.status(500).send('Erreur lors du déplacement du fichier.');
+        return res.status(500).send('Error moving the file.');
     }
 });
 
@@ -84,7 +88,7 @@ router.post('/:folderName', authMiddleware, async (req, res) => {
 
     if (!fileName || !userId || !oldFolderName || !newFolderName) {
         console.error('fileName, userId, oldFolderName, or newFolderName is undefined');
-        return res.status(500).send('Erreur lors du déplacement du fichier.');
+        return res.status(500).send('Error moving the file.');
     }
 
     const userDir = path.join(process.cwd(), 'cdn-files', userId);
@@ -112,7 +116,7 @@ router.post('/:folderName', authMiddleware, async (req, res) => {
         res.redirect('/dpanel/dashboard');
     } catch (err) {
         console.error(err);
-        return res.status(500).send('Erreur lors du déplacement du fichier.');
+        return res.status(500).send('Error moving the file.');
     }
 });
 

routes/Dpanel/API/Update-Setup-Admin.js

@@ -31,28 +31,31 @@ router.get('/', (req, res) => {
 });
 
 
+function clean(obj) {
+    for (var propName in obj) {
+        if (obj[propName] === null || obj[propName] === undefined || obj[propName] === '') {
+            delete obj[propName];
+        } else if (typeof obj[propName] === 'object') {
+            clean(obj[propName]);
+            if (Object.keys(obj[propName]).length === 0) {
+                delete obj[propName];
+            }
+        }
+    }
+}
+
 router.post('/', authMiddleware, async (req, res) => {
     try {
-        let setup = JSON.parse(fs.readFileSync(path.join(__dirname, '../data', 'setup.json'), 'utf-8'));
 
-        if (!req.body.ldap || !req.body.ldap.enabled) {
-            delete setup.ldap;
-        } else {
-            setup.ldap = req.body.ldap;
-        }
+        let setup = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../data', 'setup.json'), 'utf-8'));
 
-        if (!req.body.discord || !req.body.discord.enabled) {
-            delete setup.discord;
-        } else {
-            setup.discord = req.body.discord;
-        }
+        clean(req.body);
+        setup[0] = req.body;
 
-        setup.domain = req.body.domain;
-        setup.uptime = req.body.uptime;
 
-        fs.writeFileSync(path.join(__dirname, '../../../data', 'setup.json'), 'utf-8'), JSON.stringify(setup, null, 2);
+        fs.writeFileSync(path.join(__dirname, '../../../data', 'setup.json'), JSON.stringify(setup, null, 2), 'utf-8');
 
-        res.redirect('/dpanel/dashboard/admin');
+        res.redirect('/dpanel/dashboard/admin/settingsetup');
     } catch (err) {
         console.error(err);
         res.status(500).send('Server Error');