Feature/bugfix branches

backend/.env

@@ -1,4 +1,5 @@
-#DATABASE = "mongodb://localhost:27017"
+# DATABASE = "mongodb://localhost:27017"
+DATABASE=mongodb+srv://penteAi:[email protected]/?retryWrites=true&w=majority&appName=Cluster0
 #RESEND_API = "your resend_api"
 #OPENAI_API_KEY = "your open_ai api key"
 JWT_SECRET= "your_private_jwt_secret_key"

backend/package.json

@@ -31,6 +31,7 @@
     "lodash": "^4.17.21",
     "module-alias": "^2.2.3",
     "moment": "^2.30.1",
+    "mongodb": "^6.15.0",
     "mongoose": "^8.1.1",
     "mongoose-autopopulate": "^1.1.0",
     "multer": "^1.4.4",

backend/src/app.js

@@ -1,21 +1,21 @@
 const express = require('express');
-
 const cors = require('cors');
 const compression = require('compression');
-
 const cookieParser = require('cookie-parser');
+const fileUpload = require('express-fileupload');
+
+// Load models first
+require('./models/coreModels/Admin');
+require('./models/coreModels/AdminPassword');
 
 const coreAuthRouter = require('./routes/coreRoutes/coreAuth');
 const coreApiRouter = require('./routes/coreRoutes/coreApi');
 const coreDownloadRouter = require('./routes/coreRoutes/coreDownloadRouter');
 const corePublicRouter = require('./routes/coreRoutes/corePublicRouter');
 const adminAuth = require('./controllers/coreControllers/adminAuth');
-
 const errorHandlers = require('./handlers/errorHandlers');
 const erpApiRouter = require('./routes/appRoutes/appApi');
 
-const fileUpload = require('express-fileupload');
-// create our Express app
 const app = express();
 
 app.use(
@@ -28,7 +28,6 @@ app.use(
 app.use(cookieParser());
 app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
-
 app.use(compression());
 
 // // default options

backend/src/controllers/middlewaresControllers/createAuthMiddleware/authUser.js

@@ -2,16 +2,60 @@ const bcrypt = require('bcryptjs');
 const jwt = require('jsonwebtoken');
 
 const authUser = async (req, res, { user, databasePassword, password, UserPasswordModel }) => {
-  const isMatch = await bcrypt.compare(databasePassword.salt + password, databasePassword.password);
+  try {
+    console.log('authUser received data:', {
+      userId: user?._id,
+      hasDatabasePassword: !!databasePassword,
+      passwordLength: password?.length,
+      hasSalt: !!databasePassword?.salt,
+      hasPassword: !!databasePassword?.password
+    });
 
-  if (!isMatch)
-    return res.status(403).json({
+    if (!databasePassword) {
+      console.error('databasePassword is null or undefined');
+      return res.status(500).json({
       success: false,
-      result: null,
-      message: 'Invalid credentials.',
+        result: null,
+        message: 'Password record not found.',
+      });
+    }
+
+    if (!databasePassword.salt || !databasePassword.password) {
+      console.error('Invalid database password structure:', {
+        hasSalt: !!databasePassword.salt,
+        hasPassword: !!databasePassword.password
+      });
+      return res.status(500).json({
+        success: false,
+        result: null,
+        message: 'Invalid password record structure.',
+      });
+    }
+
+    // Log the values being compared
+    console.log('Comparing password with:', {
+      salt: databasePassword.salt,
+      passwordLength: password.length,
+      storedPasswordLength: databasePassword.password.length
     });
 
-  if (isMatch === true) {
+    // Use bcrypt.compare to properly compare the passwords
+    const isMatch = await bcrypt.compare(databasePassword.salt + password, databasePassword.password);
+    console.log('Password comparison result:', isMatch);
+
+    if (!isMatch) {
+      console.log('Password mismatch. Details:', {
+        salt: databasePassword.salt,
+        passwordLength: password.length,
+        storedPasswordLength: databasePassword.password.length
+      });
+      return res.status(403).json({
+        success: false,
+        result: null,
+        message: 'Invalid credentials.',
+      });
+    }
+
     const token = jwt.sign(
       {
         id: user._id,
@@ -51,11 +95,12 @@ const authUser = async (req, res, { user, databasePassword, password, UserPasswo
       },
       message: 'Successfully login user',
     });
-  } else {
-    return res.status(403).json({
+  } catch (error) {
+    console.error('Error in authUser:', error);
+    return res.status(500).json({
       success: false,
       result: null,
-      message: 'Invalid credentials.',
+      message: 'An error occurred while processing the request.',
     });
   }
 };