From ba64b02b52c01b6eb0f0acfaa2db3e8ed6739488 Mon Sep 17 00:00:00 2001
From: adefolajuwon oyebola <oadefolajuwon@gmail.com>
Date: Mon, 31 Jul 2023 12:18:35 +0100
Subject: [PATCH 1/2] I refactored the registerUser function in the service
 folder

---
 server/src/service/authentication.service.js | 249 ++++++++++---------
 1 file changed, 125 insertions(+), 124 deletions(-)

diff --git a/server/src/service/authentication.service.js b/server/src/service/authentication.service.js
index 8472655..1c7b231 100644
--- a/server/src/service/authentication.service.js
+++ b/server/src/service/authentication.service.js
@@ -1,132 +1,133 @@
-import jwt from "jsonwebtoken";
-import bcrypt from "bcryptjs";
-import config from "../config";
-import User from "../models/User";
-import randomString from "randomstring";
-import mailer from "../_helper/mailer";
+import jwt from 'jsonwebtoken';
+import bcrypt from 'bcryptjs';
+import config from '../config';
+import User from '../models/User';
+import randomString from 'randomstring';
+import mailer from '../_helper/mailer';
 
-
-export const loginUserWithFB =  async (req, res) => {
-    try{
-        const user = await User.findOne({ email: req.user.email })
-        if(!user){
-          user = await User.create(req.user)
-        }
-        var token = jwt.sign({ id: user._id }, config.secret, {
-            expiresIn: 86400, // expires in 24 hours
-        });
-        return res.send({
-            auth: true,
-            token: token,
-            userId: user._id,
-            name: user.name,
-        });
-    }catch(err){
-        return res
-        .status(500)
-        .json({ message: `Problem in creating new user. Error: ${err}` });
-    }
-}
+export const loginUserWithFB = async (req, res) => {
+	try {
+		const user = await User.findOne({ email: req.user.email });
+		if (!user) {
+			user = await User.create(req.user);
+		}
+		var token = jwt.sign({ id: user._id }, config.secret, {
+			expiresIn: 86400, // expires in 24 hours
+		});
+		return res.send({
+			auth: true,
+			token: token,
+			userId: user._id,
+			name: user.name,
+		});
+	} catch (err) {
+		return res
+			.status(500)
+			.json({ message: `Problem in creating new user. Error: ${err}` });
+	}
+};
 
 export const registerUser = async (req, res) => {
-    try {
-      let user = await User.findOne({ email: req.body.email });
-      if (user) {
-        return res
-          .status(409)
-          .json({ message: "This e-mail is already registered" });
-      }
-      let hashedPassword = bcrypt.hashSync(req.body.password, 8);
-      const secretToken = randomString.generate();
-      let newUser = await User.create({
-        name: req.body.name,
-        email: req.body.email,
-        password: hashedPassword,
-        //For email verification
-        secretToken: secretToken,
-        isActivated: false,
-      });
-      if (newUser) {
-        console.log(newUser);
-        const mailOptions = {
-          from: "support@mirrorwall.org", //sender address
-          to: newUser.email, //list of receivers
-          subject: "Please verify the email address", // Subject line
-          html: `<h4>Thank you for registering.<h4>
-          <p>Please verify this email address by clicking the following link</p>
-          <a href="https://frozen-lake-54898.herokuapp.com/api/auth/verify/${newUser.secretToken}">
-          https://frozen-lake-54898.herokuapp.com/api/auth/verify/${newUser.secretToken}</a>`,
-        };
-        let mailResponse = await mailer.sendMail(mailOptions);
-        if (mailResponse.messageId) {
-          res.status(200).send(newUser.email);
-        } else {
-          let deleted = await User.deleteOne({ email: req.body.email });
-          console.log(deleted);
-          throw new Error("Something wrong");
-        }
-      }
-    } catch (err) {
-      console.log(err);
-      let deleted = await User.deleteOne({ email: req.body.email });
-      return res.status(500).json({ message: "Error. User Not registered" });
-    }
-  }
+	try {
+		const { name, email, password } = req.body;
+		const userExists = await User.findOne({ email });
+
+		if (userExists) {
+			return res
+				.status(409)
+				.json({ message: 'This e-mail is already registered' });
+		}
+
+		const hashedPassword = bcrypt.hashSync(password, 8);
+		const secretToken = randomString({ length: 64 }); // Generate a 64-character secret token
+
+		const newUser = await User.create({
+			name,
+			email,
+			password: hashedPassword,
+			// For email verification
+			secretToken,
+			isActivated: false,
+		});
+
+		if (newUser) {
+			console.log(newUser);
+
+			const verificationLink = `https://frozen-lake-54898.herokuapp.com/api/auth/verify/${secretToken}`;
+			const mailOptions = {
+				from: 'support@mirrorwall.org',
+				to: newUser.email,
+				subject: 'Please verify the email address',
+				html: `<h4>Thank you for registering.<h4>
+        <p>Please verify this email address by clicking the following link</p>
+        <a href="${verificationLink}">${verificationLink}</a>`,
+			};
+
+			const mailResponse = await mailer.sendMail(mailOptions);
+
+			if (mailResponse.messageId) {
+				res.status(200).send(newUser.email);
+			} else {
+				await User.deleteOne({ email });
+				throw new Error('Failed to send verification email');
+			}
+		}
+	} catch (err) {
+		console.log(err);
+		await User.deleteOne({ email: req.body.email });
+		return res.status(500).json({ message: 'Error. User Not registered' });
+	}
+};
+export const loginUser = async (req, res) => {
+	try {
+		const user = await User.findOne({ email: req.body.email });
+		//console.log(config.clientID, config.clientSecret)
+		if (!user) return res.status(404).send('No user found.');
+		if (!user.isActivated) {
+			//console.log("activation", user, user.isActivated);
+			return res.status(401).send('Please verify the email address first');
+		}
+
+		var passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
+		if (!passwordIsValid) {
+			//console.log("password", req.body.password, passwordIsValid);
+			return res.status(401).send({ auth: false, token: null });
+		}
+		var token = jwt.sign({ id: user._id }, config.secret, {
+			expiresIn: 86400, // expires in 24 hours
+		});
+		res
+			.status(200)
+			.send({ auth: true, token: token, userId: user._id, name: user.name });
+	} catch (err) {
+		return res.status(500).send('Error on the server.');
+	}
+};
 
+export const verifyWithSecretToken = async (req, res) => {
+	try {
+		const user = await User.findOne({ secretToken: req.params.secretToken });
 
-  export const loginUser = async (req, res)=>{
-    try{
-        const user = await User.findOne({ email: req.body.email })
-        //console.log(config.clientID, config.clientSecret)
-        if (!user) return res.status(404).send("No user found.");
-        if (!user.isActivated) {
-          //console.log("activation", user, user.isActivated);
-          return res.status(401).send("Please verify the email address first");
-        }
-    
-        var passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
-        if (!passwordIsValid) {
-          //console.log("password", req.body.password, passwordIsValid);
-          return res.status(401).send({ auth: false, token: null });
-        }
-        var token = jwt.sign({ id: user._id }, config.secret, {
-          expiresIn: 86400, // expires in 24 hours
-        });
-        res
-          .status(200)
-          .send({ auth: true, token: token, userId: user._id, name: user.name });
-          
-    }catch(err){
-        return res.status(500).send("Error on the server.");
-    }
-        
-  }
+		if (!user) return res.status(404).send('No user found.');
 
-  export const verifyWithSecretToken = async (req, res)=>{
-    try{
-        const user = await User.findOne({ secretToken: req.params.secretToken })
-        
-        if (!user) return res.status(404).send("No user found.");
-    
-        user.isActivated = true;
-        user.secretToken = "";
-    
-        user.save(function (err, user) {
-        if (err) return res.status(500).send("Error verifying the account");
-        res.redirect("https://frozen-lake-54898.herokuapp.com/#/login/");
-        });
-    }catch(err){
-        return res.status(500).send("Error on the server.");
-    }
-  }
+		user.isActivated = true;
+		user.secretToken = '';
 
+		user.save(function (err, user) {
+			if (err) return res.status(500).send('Error verifying the account');
+			res.redirect('https://frozen-lake-54898.herokuapp.com/#/login/');
+		});
+	} catch (err) {
+		return res.status(500).send('Error on the server.');
+	}
+};
 
-export const getMe = (req, res) =>{
-    try{
-        const user = User.findById(req.userId, { password: 0 })
-        if (!user) return res.status(404).send("No user found.");
-        res.status(200).send(user);
-    }catch(err){
-            return res.status(500).send("There was a problem finding the user.");
-    }     
-}
\ No newline at end of file
+export const getMe = (req, res) => {
+	try {
+		const user = User.findById(req.userId, { password: 0 });
+		if (!user) return res.status(404).send('No user found.');
+		res.status(200).send(user);
+	} catch (err) {
+		return res.status(500).send('There was a problem finding the user.');
+	}
+};

From 3227e82a833471e5742f45e1275c9a73c3f26052 Mon Sep 17 00:00:00 2001
From: adefolajuwon oyebola <oadefolajuwon@gmail.com>
Date: Mon, 31 Jul 2023 12:24:20 +0100
Subject: [PATCH 2/2] I refactored the registerUser function in the service
 folder

---
 server/src/service/authentication.service.js | 249 +++++++++----------
 1 file changed, 124 insertions(+), 125 deletions(-)

diff --git a/server/src/service/authentication.service.js b/server/src/service/authentication.service.js
index 1c7b231..8472655 100644
--- a/server/src/service/authentication.service.js
+++ b/server/src/service/authentication.service.js
@@ -1,133 +1,132 @@
-import jwt from 'jsonwebtoken';
-import bcrypt from 'bcryptjs';
-import config from '../config';
-import User from '../models/User';
-import randomString from 'randomstring';
-import mailer from '../_helper/mailer';
+import jwt from "jsonwebtoken";
+import bcrypt from "bcryptjs";
+import config from "../config";
+import User from "../models/User";
+import randomString from "randomstring";
+import mailer from "../_helper/mailer";
 
-export const loginUserWithFB = async (req, res) => {
-	try {
-		const user = await User.findOne({ email: req.user.email });
-		if (!user) {
-			user = await User.create(req.user);
-		}
-		var token = jwt.sign({ id: user._id }, config.secret, {
-			expiresIn: 86400, // expires in 24 hours
-		});
-		return res.send({
-			auth: true,
-			token: token,
-			userId: user._id,
-			name: user.name,
-		});
-	} catch (err) {
-		return res
-			.status(500)
-			.json({ message: `Problem in creating new user. Error: ${err}` });
-	}
-};
 
-export const registerUser = async (req, res) => {
-	try {
-		const { name, email, password } = req.body;
-		const userExists = await User.findOne({ email });
-
-		if (userExists) {
-			return res
-				.status(409)
-				.json({ message: 'This e-mail is already registered' });
-		}
-
-		const hashedPassword = bcrypt.hashSync(password, 8);
-		const secretToken = randomString({ length: 64 }); // Generate a 64-character secret token
-
-		const newUser = await User.create({
-			name,
-			email,
-			password: hashedPassword,
-			// For email verification
-			secretToken,
-			isActivated: false,
-		});
-
-		if (newUser) {
-			console.log(newUser);
+export const loginUserWithFB =  async (req, res) => {
+    try{
+        const user = await User.findOne({ email: req.user.email })
+        if(!user){
+          user = await User.create(req.user)
+        }
+        var token = jwt.sign({ id: user._id }, config.secret, {
+            expiresIn: 86400, // expires in 24 hours
+        });
+        return res.send({
+            auth: true,
+            token: token,
+            userId: user._id,
+            name: user.name,
+        });
+    }catch(err){
+        return res
+        .status(500)
+        .json({ message: `Problem in creating new user. Error: ${err}` });
+    }
+}
 
-			const verificationLink = `https://frozen-lake-54898.herokuapp.com/api/auth/verify/${secretToken}`;
-			const mailOptions = {
-				from: 'support@mirrorwall.org',
-				to: newUser.email,
-				subject: 'Please verify the email address',
-				html: `<h4>Thank you for registering.<h4>
-        <p>Please verify this email address by clicking the following link</p>
-        <a href="${verificationLink}">${verificationLink}</a>`,
-			};
-
-			const mailResponse = await mailer.sendMail(mailOptions);
-
-			if (mailResponse.messageId) {
-				res.status(200).send(newUser.email);
-			} else {
-				await User.deleteOne({ email });
-				throw new Error('Failed to send verification email');
-			}
-		}
-	} catch (err) {
-		console.log(err);
-		await User.deleteOne({ email: req.body.email });
-		return res.status(500).json({ message: 'Error. User Not registered' });
-	}
-};
-export const loginUser = async (req, res) => {
-	try {
-		const user = await User.findOne({ email: req.body.email });
-		//console.log(config.clientID, config.clientSecret)
-		if (!user) return res.status(404).send('No user found.');
-		if (!user.isActivated) {
-			//console.log("activation", user, user.isActivated);
-			return res.status(401).send('Please verify the email address first');
-		}
-
-		var passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
-		if (!passwordIsValid) {
-			//console.log("password", req.body.password, passwordIsValid);
-			return res.status(401).send({ auth: false, token: null });
-		}
-		var token = jwt.sign({ id: user._id }, config.secret, {
-			expiresIn: 86400, // expires in 24 hours
-		});
-		res
-			.status(200)
-			.send({ auth: true, token: token, userId: user._id, name: user.name });
-	} catch (err) {
-		return res.status(500).send('Error on the server.');
-	}
-};
+export const registerUser = async (req, res) => {
+    try {
+      let user = await User.findOne({ email: req.body.email });
+      if (user) {
+        return res
+          .status(409)
+          .json({ message: "This e-mail is already registered" });
+      }
+      let hashedPassword = bcrypt.hashSync(req.body.password, 8);
+      const secretToken = randomString.generate();
+      let newUser = await User.create({
+        name: req.body.name,
+        email: req.body.email,
+        password: hashedPassword,
+        //For email verification
+        secretToken: secretToken,
+        isActivated: false,
+      });
+      if (newUser) {
+        console.log(newUser);
+        const mailOptions = {
+          from: "support@mirrorwall.org", //sender address
+          to: newUser.email, //list of receivers
+          subject: "Please verify the email address", // Subject line
+          html: `<h4>Thank you for registering.<h4>
+          <p>Please verify this email address by clicking the following link</p>
+          <a href="https://frozen-lake-54898.herokuapp.com/api/auth/verify/${newUser.secretToken}">
+          https://frozen-lake-54898.herokuapp.com/api/auth/verify/${newUser.secretToken}</a>`,
+        };
+        let mailResponse = await mailer.sendMail(mailOptions);
+        if (mailResponse.messageId) {
+          res.status(200).send(newUser.email);
+        } else {
+          let deleted = await User.deleteOne({ email: req.body.email });
+          console.log(deleted);
+          throw new Error("Something wrong");
+        }
+      }
+    } catch (err) {
+      console.log(err);
+      let deleted = await User.deleteOne({ email: req.body.email });
+      return res.status(500).json({ message: "Error. User Not registered" });
+    }
+  }
 
-export const verifyWithSecretToken = async (req, res) => {
-	try {
-		const user = await User.findOne({ secretToken: req.params.secretToken });
 
-		if (!user) return res.status(404).send('No user found.');
+  export const loginUser = async (req, res)=>{
+    try{
+        const user = await User.findOne({ email: req.body.email })
+        //console.log(config.clientID, config.clientSecret)
+        if (!user) return res.status(404).send("No user found.");
+        if (!user.isActivated) {
+          //console.log("activation", user, user.isActivated);
+          return res.status(401).send("Please verify the email address first");
+        }
+    
+        var passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
+        if (!passwordIsValid) {
+          //console.log("password", req.body.password, passwordIsValid);
+          return res.status(401).send({ auth: false, token: null });
+        }
+        var token = jwt.sign({ id: user._id }, config.secret, {
+          expiresIn: 86400, // expires in 24 hours
+        });
+        res
+          .status(200)
+          .send({ auth: true, token: token, userId: user._id, name: user.name });
+          
+    }catch(err){
+        return res.status(500).send("Error on the server.");
+    }
+        
+  }
 
-		user.isActivated = true;
-		user.secretToken = '';
+  export const verifyWithSecretToken = async (req, res)=>{
+    try{
+        const user = await User.findOne({ secretToken: req.params.secretToken })
+        
+        if (!user) return res.status(404).send("No user found.");
+    
+        user.isActivated = true;
+        user.secretToken = "";
+    
+        user.save(function (err, user) {
+        if (err) return res.status(500).send("Error verifying the account");
+        res.redirect("https://frozen-lake-54898.herokuapp.com/#/login/");
+        });
+    }catch(err){
+        return res.status(500).send("Error on the server.");
+    }
+  }
 
-		user.save(function (err, user) {
-			if (err) return res.status(500).send('Error verifying the account');
-			res.redirect('https://frozen-lake-54898.herokuapp.com/#/login/');
-		});
-	} catch (err) {
-		return res.status(500).send('Error on the server.');
-	}
-};
 
-export const getMe = (req, res) => {
-	try {
-		const user = User.findById(req.userId, { password: 0 });
-		if (!user) return res.status(404).send('No user found.');
-		res.status(200).send(user);
-	} catch (err) {
-		return res.status(500).send('There was a problem finding the user.');
-	}
-};
+export const getMe = (req, res) =>{
+    try{
+        const user = User.findById(req.userId, { password: 0 })
+        if (!user) return res.status(404).send("No user found.");
+        res.status(200).send(user);
+    }catch(err){
+            return res.status(500).send("There was a problem finding the user.");
+    }     
+}
\ No newline at end of file