Registration page

backend/.env

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

backend/src/app.js

@@ -36,9 +36,9 @@ app.use(compression());
 
 // Here our API Routes
 
-app.use('/api', coreAuthRouter);
-app.use('/api', adminAuth.isValidAuthToken, coreApiRouter);
-app.use('/api', adminAuth.isValidAuthToken, erpApiRouter);
+app.use('/api', coreAuthRouter); // This is for common users
+app.use('/api', adminAuth.isValidAuthToken, coreApiRouter); // This is for admins
+app.use('/api', adminAuth.isValidAuthToken, erpApiRouter); // This is for erps
 app.use('/download', coreDownloadRouter);
 app.use('/public', corePublicRouter);
 

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(password, databasePassword.password);
+  const isMatch = await bcrypt.compare(databasePassword.salt + password, databasePassword.password);
 
   if (!isMatch)
     return res.status(403).json({

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

@@ -3,16 +3,16 @@ 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 AdminPassword = require('@/models/coreModels/AdminPassword');
 
 const register = async (req, res, { userModel }) => {
-  const UserPasswordModel = mongoose.model(userModel + 'Password');
-  const UserModel = mongoose.model(userModel);
+  const UserModel = new mongoose.model(userModel);
+  const PasswordInstance = new AdminPassword();
+
   const { name, email, password, country } = req.body;
 
   // validate
@@ -44,10 +44,8 @@ const register = async (req, res, { userModel }) => {
       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 hashedPassword = await PasswordInstance.generateHash(salt, password);
   const newUser = {
     name: name,
     email: email,
@@ -56,27 +54,41 @@ const register = async (req, res, { userModel }) => {
   };
 
   const createdUser = await UserModel.create(newUser);
-  const newUserPassword = {
+  const newUserPassword = new AdminPassword({
     removed: false,
     user: createdUser,
     password: hashedPassword,
     salt: salt,
     emailVerified: false,
-    authType: "email",
-    loggedSessions: []
-  }
-  const databasePassword = await UserPasswordModel.create(newUserPassword);
-  if (!createdUser || !databasePassword) {
+    authType: 'email',
+    loggedSessions: [],
+  });
+
+  const newPassword = await newUserPassword.save();
+  const settings = useAppSettings();
+  const idurar_app_email = settings['idurar_app_email'];
+  const idurar_base_url = settings['idurar_base_url'];
+  const url = checkAndCorrectURL(idurar_base_url);
+  const link = url + '/verify/' + createdUser._id + '/' + newPassword.emailToken;
+  await sendMail({
+    email,
+    name,
+    link,
+    idurar_app_email,
+    emailToken: newPassword.emailToken,
+  });
+
+  if (!createdUser || !newUserPassword) {
     return res.status(500).json({
       success: false,
       result: null,
       message: 'Error creating your account.',
     });
   } else {
     const success = {
-      success: true
-    }
-    const newUser = {...createdUser, ...success}
+      success: true,
+    };
+    const newUser = { ...createdUser, ...success };
     return res.status(200).json(newUser);
   }
 };

frontend/src/auth/auth.service.js

@@ -28,6 +28,7 @@ export const login = async ({ loginData }) => {
 
 export const register = async ({ registerData }) => {
   try {
+
     const response = await axios.post(API_BASE_URL + `register`, registerData);
 
     const { status, data } = response;

frontend/src/pages/Register.jsx

@@ -20,11 +20,11 @@ const RegisterPage = () => {
 
   const dispatch = useDispatch();
   const onFinish = (values) => {
-    console.log("Finsihed")
+    console.log(values);
     dispatch(register({ registerData: values }));
-    navigate('/')
+    navigate('/');
   };
-  
+
   const FormContainer = () => {
     return (
       <Loading isLoading={isLoading}>