Merge pull request #3 from C4theBomb/revert-1-bugfix-login-screen

Revert "Bugfix login screen"

client/src/App.jsx

@@ -24,10 +24,7 @@ function App() {
             <BrowserRouter>
                 <Routes>
                     <Route path='' element={<Navbar token={token} />}>
-                        <Route
-                            index
-                            element={<MainPage setToken={setToken} />}
-                        />
+                        <Route index element={<MainPage />} />
 
                         <Route
                             path='login'

client/src/components/MainPage.jsx

@@ -17,7 +17,7 @@ import {
 import OrgUnit from './utils/OrgUnit';
 import StackItem from './utils/StackItem';
 
-function MainPage({ setToken }) {
+function MainPage() {
     const navigate = useNavigate();
 
     const [ownedOrgs, setOwnedOrgs] = useState([]);
@@ -33,7 +33,9 @@ function MainPage({ setToken }) {
         if (!Cookies.get('token')) {
             navigate('/login');
         }
-    }, [navigate, setToken]);
+    });
+
+    useEffect(() => {}, []);
 
     useEffect(() => {
         getMemberOrgs();
@@ -69,13 +71,7 @@ function MainPage({ setToken }) {
                 );
             })
             .catch((e) => {
-                if (e.response.status === 511) {
-                    console.log(e.response);
-                    Cookies.remove('token');
-                    Cookies.remove('userID');
-
-                    setToken(() => false);
-                }
+                console.log(e);
             });
     }
 
@@ -97,15 +93,6 @@ function MainPage({ setToken }) {
                         };
                     })
                 );
-            })
-            .catch((e) => {
-                if (e.response.status === 511) {
-                    console.log(e.response);
-                    Cookies.remove('token');
-                    Cookies.remove('userID');
-
-                    setToken(() => false);
-                }
             });
     }
 

client/src/components/forms/Login.jsx

@@ -67,10 +67,10 @@ function Login({ setToken }) {
             .post(`${process.env.REACT_APP_API_ROOT}/auth/login`, form)
             .then((response) => {
                 Cookies.set('token', response.data.token, {
-                    expires: form.remember ? 3650 : null,
+                    expires: form.remember ? 3650 : 1,
                 });
                 Cookies.set('userID', response.data.userID, {
-                    expires: form.remember ? 3650 : null,
+                    expires: form.remember ? 3650 : 1,
                 });
                 setToken(true);
                 navigate('/');

client/src/components/forms/Recover.jsx

@@ -22,11 +22,9 @@ function Recover() {
     async function handleSubmit(e) {
         e.preventDefault();
         await axios
-            .get(`${process.env.REACT_APP_API_ROOT}/auth/reset-password`, {
-                params: {
-                    email: form.email,
-                },
-            })
+            .get(
+                `${process.env.REACT_APP_API_ROOT}/auth/reset-password?${form.email}`
+            )
             .then((response) => {
                 setSuccess(() => response.data);
             })

package.json

@@ -4,11 +4,11 @@
     "description": "",
     "main": "index.js",
     "scripts": {
-        "install-all": "npm ci && npm ci --prefix client && npm ci --prefix server",
         "client": "npm start --prefix client",
         "server": "npm start --prefix server",
-        "dev": "npm run build && npm run server",
         "build": "npm run env && npm run build --prefix client",
+        "test": "npm run build && npm run server",
+        "install-all": "npm ci && npm ci --prefix client && npm ci --prefix server",
         "env": "cp .env ./server/.env && cp .env ./client/.env",
         "package": "tar -czf ./dist.tar.gz ./.github ./.vscode ./client ./node_modules ./server .env .gitignore LICENSE package-lock.json package.json README.md",
         "dist": "npm run install-all && npm run build && npm run package"

server/models/index.js

@@ -1,4 +1,4 @@
-require('dotenv').config();
+require('dotenv').config({ path: `../.env.${process.env.NODE_ENV}` });
 const fs = require('fs');
 const path = require('path');
 const Sequelize = require('sequelize');

server/routes/auth/RequestReset.js

@@ -30,7 +30,6 @@ async function RequestReset(req, res, next) {
                 data: {
                     email: result.email,
                     resetRequest: resetRequest.reqID,
-                    apiDomainRoot: process.env.REACT_APP_DOMAIN_ROOT,
                 },
             },
         });

server/routes/auth/ResetPassword.js

@@ -9,7 +9,7 @@ async function ResetPassword(req, res, next) {
         return res.status(400).send('Form missing required information.');
     }
 
-    const result = await ResetRequest.findByPk(reqID);
+    const result = await ResetRequest.findOne({ where: { reqID: reqID } });
 
     if (!result) {
         return res