Registration page connected

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({

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/routes/coreRoutes/coreAuth.js

@@ -6,7 +6,7 @@ const { catchErrors } = require('@/handlers/errorHandlers');
 const adminAuth = require('@/controllers/coreControllers/adminAuth');
 
 router.route('/login').post(catchErrors(adminAuth.login));
-
+router.route('/register').post(catchErrors(adminAuth.register));
 router.route('/forgetpassword').post(catchErrors(adminAuth.forgetPassword));
 router.route('/resetpassword').post(catchErrors(adminAuth.resetPassword));
 

frontend/src/pages/Login.jsx

@@ -51,6 +51,16 @@ const LoginPage = () => {
             >
               {translate('Log in')}
             </Button>
+            <Button
+              type="primary"
+              htmlType="button"
+              className="login-form-button"
+              loading={isLoading}
+              size="large"
+              onClick = {()=>{ navigate('/register')}}
+            >
+              {translate('Register')}
+            </Button>
           </Form.Item>
         </Form>
       </Loading>

frontend/src/pages/Register.jsx

@@ -0,0 +1,60 @@
+import { useEffect } from 'react';
+
+import { useDispatch, useSelector } from 'react-redux';
+import { useNavigate } from 'react-router-dom';
+
+import useLanguage from '@/locale/useLanguage';
+
+import { Form, Button } from 'antd';
+
+import { selectAuth } from '@/redux/auth/selectors';
+import RegisterForm from '@/forms/RegisterForm';
+import Loading from '@/components/Loading';
+import AuthModule from '@/modules/AuthModule';
+import { register } from '@/redux/auth/actions';
+const RegisterPage = () => {
+  const translate = useLanguage();
+  const { isLoading, isSuccess } = useSelector(selectAuth);
+  const navigate = useNavigate();
+  // const size = useSize();
+
+  const dispatch = useDispatch();
+  const onFinish = (values) => {
+    console.log("Finsihed")
+    dispatch(register({ registerData: values }));
+    navigate('/')
+  };
+
+  const FormContainer = () => {
+    return (
+      <Loading isLoading={isLoading}>
+        <Form
+          layout="vertical"
+          name="normal_login"
+          className="login-form"
+          initialValues={{
+            remember: true,
+          }}
+          onFinish={onFinish}
+        >
+          <RegisterForm />
+          <Form.Item>
+            <Button
+              type="primary"
+              htmlType="submit"
+              className="login-form-button"
+              loading={isLoading}
+              size="large"
+            >
+              {translate('Register')}
+            </Button>
+          </Form.Item>
+        </Form>
+      </Loading>
+    );
+  };
+
+  return <AuthModule authContent={<FormContainer />} AUTH_TITLE="Sign Up" />;
+};
+
+export default RegisterPage;

frontend/src/router/AuthRouter.jsx

@@ -1,6 +1,7 @@
 import { Routes, Route, Navigate } from 'react-router-dom';
 
 import Login from '@/pages/Login';
+import Register from '@/pages/Register';
 import NotFound from '@/pages/NotFound';
 
 import ForgetPassword from '@/pages/ForgetPassword';
@@ -15,6 +16,7 @@ export default function AuthRouter() {
     <Routes>
       <Route element={<Login />} path="/" />
       <Route element={<Login />} path="/login" />
+      <Route element={<Register/>} path="/register"/>
       <Route element={<Navigate to="/login" replace />} path="/logout" />
       <Route element={<ForgetPassword />} path="/forgetpassword" />
       <Route element={<ResetPassword />} path="/resetpassword/:userId/:resetToken" />

frontend/src/router/routes.jsx

@@ -4,7 +4,7 @@ import { Navigate } from 'react-router-dom';
 
 const Logout = lazy(() => import('@/pages/Logout.jsx'));
 const NotFound = lazy(() => import('@/pages/NotFound.jsx'));
-
+const Register = lazy(()=> import('@/pages/Register.jsx'));
 const Dashboard = lazy(() => import('@/pages/Dashboard'));
 const Customer = lazy(() => import('@/pages/Customer'));
 const Invoice = lazy(() => import('@/pages/Invoice'));
@@ -61,6 +61,10 @@ let routes = {
       path: '/logout',
       element: <Logout />,
     },
+    {
+      path: '/register',
+      element: <Register/>
+    },
     {
       path: '/about',
       element: <About />,