From 0f6dd5826e6381b8f4c1f7d0357646b1da1033cf Mon Sep 17 00:00:00 2001
From: mahyargdz <mahyar.goudarzi@outlook.com>
Date: Tue, 19 Nov 2024 22:07:46 +0330
Subject: [PATCH] fix: the trust proxy setting

---
 server/controllers/categoryController.js | 17 +++++++----------
 server/controllers/userController.js     |  1 +
 server/index.js                          |  7 ++++++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/server/controllers/categoryController.js b/server/controllers/categoryController.js
index efb0f3f..c934ec8 100644
--- a/server/controllers/categoryController.js
+++ b/server/controllers/categoryController.js
@@ -458,14 +458,13 @@ module.exports.addCategory = [
             },
           });
         }
-        const ext = extname(image.name)
-        const imageName = `shafafiat_icon_${Date.now()}_${targetCategory._id}.${ext}`;
+        const ext = extname(image.name);
+        const imageName = `shafafiat_icon_${Date.now()}${ext}`;
         try {
           await image.mv(
             `${process.cwd()}/static/uploads/images/category/shafafiat/${imageName}`
           );
 
-
           /**
            * if exist old pic delete it from file
            */
@@ -691,11 +690,9 @@ module.exports.updateCategory = [
         });
 
         if (checkDuppTitle) {
-          return res
-            .status(422)
-            .json({
-              validation: { title: { msg: _sr["fa"].duplicated.title } },
-            });
+          return res.status(422).json({
+            validation: { title: { msg: _sr["fa"].duplicated.title } },
+          });
         }
       }
 
@@ -852,8 +849,8 @@ module.exports.updateCategory = [
             },
           });
         }
-        const ext = extname(image.name)
-        const imageName = `shafafiat_icon_${Date.now()}_${targetCategory._id}.${ext}`;
+        const ext = extname(image.name);
+        const imageName = `shafafiat_icon_${Date.now()}${ext}`;
         try {
           await image.mv(
             `${process.cwd()}/static/uploads/images/category/shafafiat/${imageName}`
diff --git a/server/controllers/userController.js b/server/controllers/userController.js
index d167dff..68d21cd 100644
--- a/server/controllers/userController.js
+++ b/server/controllers/userController.js
@@ -262,6 +262,7 @@ module.exports.verifyOtp = [
 
       // Create or update login logger
       const logger = await Logger.findOne({ user: user._id });
+      console.log("admin logged in", req.ip);
       if (logger) {
         await Logger.findOneAndUpdate(
           { user: user._id },
diff --git a/server/index.js b/server/index.js
index 649b1b1..7caeb29 100644
--- a/server/index.js
+++ b/server/index.js
@@ -26,7 +26,12 @@ for (const item of portals) {
 // Create express instance
 const app = express();
 
-app.set("trust proxy", 1);
+app.set("trust proxy", true);
+app.use((req, res, next) => {
+  console.log(req.ip);
+  console.log(req.ips);
+  next();
+});
 app.disable("x-powered-by");
 
 app.use(morgan("combined"));