From 96466073a558388e925b822d1f0e45d72d324cfe Mon Sep 17 00:00:00 2001
From: Dinawo <dinawo@30rdr.fr>
Date: Wed, 27 Mar 2024 18:49:08 +0100
Subject: [PATCH] Update Dockerfile and server.js to handle setup and user
 configurations

---
 Dockerfile |  4 ++--
 server.js  | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 82bf785..e3408a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,9 +12,9 @@ RUN [ ! -f cdn-files ] && touch cdn-files || true
 
 RUN [ ! -f report ] && touch report || true
 
-RUN [ ! -f user.json ] && touch user.json || true
+RUN [ ! -f setup.json ] && echo '{}' > setup.json || true
 
-RUN [ ! -f file_info.json ] && touch file_info.json || true
+RUN [ ! -f user.json ] && echo '{}' > user.json || true
 
 EXPOSE 5053
 
diff --git a/server.js b/server.js
index 045d841..c3f1658 100644
--- a/server.js
+++ b/server.js
@@ -13,6 +13,13 @@ const fs = require('fs');
 const SystemReport = require('./models/reportManager.js');
 
 let setup = {};
+try {
+  if (fs.existsSync('setup.json')) {
+    setup = JSON.parse(fs.readFileSync('setup.json', 'utf8'));
+  }
+} catch (err) {
+  console.error('Error reading setup.json:', err);
+}
 try {
   setup = JSON.parse(fs.readFileSync('setup.json', 'utf8'));
 } catch (err) {
@@ -27,6 +34,16 @@ if (setup.ldap !== undefined) {
   require('./models/Passport-ActiveDirectory.js');
 }
 
+let user = {};
+try {
+  if (fs.existsSync('user.json')) {
+    const data = fs.readFileSync('user.json', 'utf8');
+    user = data ? JSON.parse(data) : {};
+  }
+} catch (err) {
+  console.error('Error reading user.json:', err);
+}
+
 app.use(express.static(path.join(__dirname, 'public')));
 
 app.get(['/user.json', '/file_info.json', '/setup.json'], (req, res) => {