From b51d22f1a1eed4828727b0eb1eb11abb04b21e09 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Thu, 29 Jul 2021 00:36:20 +1000
Subject: [PATCH] SQUASH: I think I got it working

---
 server/auth/password-recover.js  |  6 +--
 server/auth/password-redirect.js |  8 ++--
 server/auth/password-reset.js    | 15 +++++---
 server/server.js                 | 64 ++++++++++++++++----------------
 4 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/server/auth/password-recover.js b/server/auth/password-recover.js
index a5c4bb6..d4055b7 100644
--- a/server/auth/password-recover.js
+++ b/server/auth/password-recover.js
@@ -25,13 +25,13 @@ const route = async (req, res) => {
 	}
 
 	//save the token
-	recovery.upsert({
+	await recovery.upsert({
 		email: req.body.email,
 		token: token
 	});
 
 	//finally
-	res.status(200).send("Validation email sent!");
+	res.status(200).send("Recovery email sent!");
 	return null;
 };
 
@@ -57,7 +57,7 @@ const validateDetails = async (body) => {
 };
 
 const sendRecoveryEmail = async (email, token) => {
-	const addr = `${process.env.WEB_PROTOCOL}://${process.env.WEB_ADDRESS}/auth/validation?token=${token}`;
+	const addr = `${process.env.WEB_PROTOCOL}://${process.env.WEB_ADDRESS}/auth/reset?token=${token}`;
 	const msg = `Hello,
 
 Please visit the following link to reset your password: ${addr}
diff --git a/server/auth/password-redirect.js b/server/auth/password-redirect.js
index e8b8fe4..7f0f3fe 100644
--- a/server/auth/password-redirect.js
+++ b/server/auth/password-redirect.js
@@ -3,8 +3,10 @@ const { accounts, recovery } = require('../database/models');
 //auth/reset
 const route = async (req, res) => {
 	//verify the recovery record exists
-	const record = recovery.findOne({
-		token: req.query.token
+	const record = await recovery.findOne({
+		where: {
+			token: req.query.token
+		}
 	});
 
 	if (!record) {
@@ -12,7 +14,7 @@ const route = async (req, res) => {
 	}
 
 	//redirect to the front-end
-	res.redirect(`${process.env.WEB_PROTOCOL}${process.env.WEB_RESET_ADDRESS}?email=${record.email}&token=${record.token}`);
+	res.redirect(`${process.env.WEB_PROTOCOL}://${process.env.WEB_RESET_ADDRESS}?email=${record.email}&token=${record.token}`);
 	return null;
 };
 
diff --git a/server/auth/password-reset.js b/server/auth/password-reset.js
index 16d24d1..8732c9a 100644
--- a/server/auth/password-reset.js
+++ b/server/auth/password-reset.js
@@ -15,7 +15,7 @@ const route = async (req, res) => {
 	const hash = await bcrypt.hash(req.body.password, await bcrypt.genSalt(11));
 
 	//update the account data
-	accounts.update({
+	await accounts.update({
 		hash: hash
 	}, {
 		where: {
@@ -24,20 +24,23 @@ const route = async (req, res) => {
 	})
 
 	//delete from the recovery table
-	recovery.destroy({
+	await recovery.destroy({
 		where: {
 			email: req.query.email
 		}
 	});
 
+	res.status(200).end();
 	return null;
 };
 
 const validateDetails = async (query, body) => {
 	//verify the recovery record exists
-	const record = recovery.findOne({
-		email: query.email,
-		token: query.token
+	const record = await recovery.findOne({
+		where: {
+			email: query.email,
+			token: query.token
+		}
 	});
 
 	if (!record) {
@@ -56,4 +59,4 @@ const validateDetails = async (query, body) => {
 	return null;
 };
 
-module.exports = route;
\ No newline at end of file
+module.exports = route;
diff --git a/server/server.js b/server/server.js
index 254b9f7..109ebcf 100644
--- a/server/server.js
+++ b/server/server.js
@@ -1,32 +1,32 @@
-//environment variables
-require('dotenv').config();
-
-//create the server
-const express = require('express');
-const app = express();
-const server = require('http').Server(app);
-const cors = require('cors');
-
-//config
-app.use(express.json());
-app.use(cors());
-
-//database connection
-const database = require('./database');
-
-//access the admin
-app.use('/admin', require('./admin'));
-
-//access the auth
-app.use('/auth', require('./auth'));
-
-//error on access
-app.get('*', (req, res) => {
-	res.redirect('https://github.com/krgamestudios/auth-server');
-});
-
-//startup
-server.listen(process.env.WEB_PORT || 3200, async (err) => {
-	await database.sync();
-	console.log(`listening to localhost:${process.env.WEB_PORT || 3200}`);
-});
+//environment variables
+require('dotenv').config();
+
+//create the server
+const express = require('express');
+const app = express();
+const server = require('http').Server(app);
+const cors = require('cors');
+
+//config
+app.use(express.json());
+app.use(cors());
+
+//database connection
+const database = require('./database');
+
+//access the admin
+app.use('/admin', require('./admin'));
+
+//access the auth
+app.use('/auth', require('./auth'));
+
+//error on access
+app.get('*', (req, res) => {
+	res.redirect('https://github.com/krgamestudios/auth-server');
+});
+
+//startup
+server.listen(process.env.WEB_PORT || 3200, async (err) => {
+	await database.sync();
+	console.log(`listening to localhost:${process.env.WEB_PORT || 3200}`);
+});