Newfeature

backend/.env

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

backend/package.json

@@ -23,7 +23,7 @@
     "dotenv": "16.3.1",
     "express": "^4.18.2",
     "express-fileupload": "^1.4.3",
-    "express-rate-limit": "^7.1.5",
+    "express-rate-limit": "^7.4.1",
     "glob": "10.3.10",
     "html-pdf": "^3.0.1",
     "joi": "^17.11.0",
@@ -37,6 +37,9 @@
     "node-cache": "^5.1.2",
     "openai": "^4.27.0",
     "pug": "^3.0.2",
+    "rate-limit-redis": "^4.2.0",
+    "redis": "^4.7.0",
+    "request-ip": "^3.3.0",
     "resend": "^2.0.0",
     "shortid": "^2.2.16",
     "transliteration": "^2.3.5"

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

@@ -2,7 +2,7 @@ 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);
+  const isMatch = await bcrypt.compare(password, databasePassword.password);
 
   if (!isMatch)
     return res.status(403).json({
@@ -60,4 +60,4 @@ const authUser = async (req, res, { user, databasePassword, password, UserPasswo
   }
 };
 
-module.exports = authUser;
+module.exports = authUser;

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

@@ -1,6 +1,7 @@
 const isValidAuthToken = require('./isValidAuthToken');
 const login = require('./login');
 const logout = require('./logout');
+const register = require('./register');
 const forgetPassword = require('./forgetPassword');
 const resetPassword = require('./resetPassword');
 
@@ -17,6 +18,11 @@ const createAuthMiddleware = (userModel) => {
       userModel,
     });
 
+    authMethods.register = (req, res) =>
+      register(req, res, {
+        userModel,
+      });
+
   authMethods.forgetPassword = (req, res) =>
     forgetPassword(req, res, {
       userModel,

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

@@ -0,0 +1,84 @@
+const bcrypt = require('bcryptjs');
+const jwt = require('jsonwebtoken');
+const Joi = require('joi');
+
+const mongoose = require('mongoose');
+
+const checkAndCorrectURL = require('./checkAndCorrectURL');
+const sendMail = require('./sendMail');
+
+const { loadSettings } = require('@/middlewares/settings');
+const { useAppSettings } = require('@/settings');
+
+const register = async (req, res, { userModel }) => {
+  const UserPasswordModel = mongoose.model(userModel + 'Password');
+  const UserModel = mongoose.model(userModel);
+  const { name, email, password, country } = req.body;
+
+  // validate
+  const objectSchema = Joi.object({
+    email: Joi.string()
+      .email({ tlds: { allow: true } })
+      .required(),
+    name: Joi.string().required(),
+    country: Joi.string().required(),
+    password: Joi.string().required(),
+  });
+
+  const { error, value } = objectSchema.validate({ name, email, password, country });
+  if (error) {
+    return res.status(409).json({
+      success: false,
+      result: null,
+      error: error,
+      message: 'Invalid/Missing credentials.',
+      errorMessage: error.message,
+    });
+  }
+
+  const user = await UserModel.findOne({ email: email, removed: false });
+  if (user)
+    return res.status(409).json({
+      success: false,
+      result: null,
+      message: 'An account with this email already exists.',
+    });
+
+  //  authUser if your has correct password
+  const salt = await bcrypt.genSalt(10);
+  console.log(salt)
+  const hashedPassword = await bcrypt.hash(password, salt);
+  const newUser = {
+    name: name,
+    email: email,
+    country: country,
+    enabled: true,
+  };
+
+  const createdUser = await UserModel.create(newUser);
+  const newUserPassword = {
+    removed: false,
+    user: createdUser,
+    password: hashedPassword,
+    salt: salt,
+    emailVerified: false,
+    authType: "email",
+    loggedSessions: []
+  }
+  const databasePassword = await UserPasswordModel.create(newUserPassword);
+  if (!createdUser || !databasePassword) {
+    return res.status(500).json({
+      success: false,
+      result: null,
+      message: 'Error creating your account.',
+    });
+  } else {
+    const success = {
+      success: true
+    }
+    const newUser = {...createdUser, ...success}
+    return res.status(200).json(newUser);
+  }
+};
+
+module.exports = register;

backend/src/middlewares/rateLimiter.js

@@ -0,0 +1,53 @@
+
+// const rateLimit = require('express-rate-limit');
+// const { RedisStore } = require('rate-limit-redis');
+// const { createClient } = require('redis');
+// const requestIp = require('request-ip'); 
+
+// const redisClient = createClient({
+//   url: 'redis://127.0.0.1:6379',
+// });
+
+// //docker run -d --name redis-container -p 6379:6379 redis
+
+// redisClient.on('error', (err) => {
+//   console.error('Redis Client Error', err);
+// });
+
+// const connectRedis = async () => {
+//   try {
+//     await redisClient.connect();
+//     console.log('Redis connected');
+//   } catch (err) {
+//     console.error('Redis connection error:', err);
+//     process.exit(1);
+//   }
+// };
+
+// connectRedis();
+
+// const loginLimiter = rateLimit({
+//   windowMs: 15 * 60 * 1000, 
+//   max: 5, 
+//   standardHeaders: true, 
+//   legacyHeaders: false, 
+//   store: new RedisStore({
+//     sendCommand: (...args) => redisClient.sendCommand(args), 
+//   }),
+//   handler: (req, res) => {
+//     console.log(`Rate limit exceeded for IP: ${req.ip}`);
+//     res.status(429).json({
+//       success: false,
+//       message: 'Too many login attempts. Please try again after 15 minutes.',
+//     });
+//   },
+// });
+
+// const logRequest = (req, res, next) => {
+//   const clientIp = requestIp.getClientIp(req); 
+//   console.log(`[${new Date().toISOString()}] ${req.method} ${req.originalUrl} - IP: ${clientIp}`);
+//   next();
+// };
+
+// // Step 3: Export the rate limiter and logRequest middleware
+// module.exports = { loginLimiter, logRequest };