Your OTP code for quIET with the username ${username} is ${otp}. It will expire in 3 minutes.`, }; transporter.sendMail(mailOptions, async (error, info) => { @@ -79,12 +92,12 @@ const sendEmailVarification = async ({ userID, email }, res) => { const signup = async (req, res) => { try { const validity = usersignUpSchema.safeParse(req.body); - if(!validity.success) + if (!validity.success) res.status(500).json({ - message:"Wrong Inputs", - error:validity.error - }) - + message: "Wrong Inputs", + error: validity.error, + }); + const { username, email, password } = req.body; if (username == "" || email == "" || password == "") { res.json({ message: "Credentials cannot be empty" }); @@ -94,49 +107,62 @@ const signup = async (req, res) => { var token = jwt.sign({ email: email }, process.env.SECRET_KEY, { expiresIn: "1d", }); - + const isuser = await prisma.user.findFirst({ where: { - OR:[ + OR: [ { - username + username, }, { - email: email - } - ] - } + email: email, + }, + ], + }, }); - if (isuser) { + let newUser; + if ((isuser && isuser.isVarified)|| (isuser && !isuser.isVarified && isuser.email!=email)) { res.status(400).json({ res: "User Already Exists" }); + return; + } else if (isuser && !isuser.isVarified && isuser.email==email) { + newUser = await prisma.user.update({ + where:{ + username: isuser.username + }, + data:{ + username, + password: hashPass, + } + }) + + } else { - const newUser = await prisma.user.create({ + newUser = await prisma.user.create({ data: { username: username, email: email, password: hashPass, }, }); - console.log(newUser); - await sendEmailVarification(newUser, res); } + console.log(newUser); + await sendEmailVarification(newUser, res); } catch (error) { console.log(error); res.json({ - msg:"Some Error Occured", - error + msg: "Some Error Occured", + error, }); } }; - - -const varifyOtp = async (req, res) => { +const varifyOtp = async (req, res) => { try { // console.log("Remaining = "+(req.rateLimit.remaining)); - if(req.rateLimit.remaining <= 1) - { - return res.status(425).send({message:"Too Many requests, please try again after some minutes"}); + if (req.rateLimit.remaining <= 1) { + return res.status(425).send({ + message: "Too Many requests, please try again after some minutes", + }); } const { userID, otp, email } = req.body; if (userID == "" || otp == "") { @@ -165,9 +191,13 @@ const varifyOtp = async (req, res) => { return res.status(401).json({ msg: "Invalid Otp" }); } - var token = jwt.sign({ userId:userID,email: email }, process.env.SECRET_KEY, { - expiresIn: 24 * 60 * 60, - }); + var token = jwt.sign( + { userId: userID, email: email }, + process.env.SECRET_KEY, + { + expiresIn: 24 * 60 * 60, + } + ); const updateUser = await prisma.user.update({ where: { userID: userID, @@ -183,12 +213,15 @@ const varifyOtp = async (req, res) => { }, }); - return res.cookie(updateUser.userID, token, { - path: "/", - expires: new Date(Date.now() + 1000 * 1 * 24 * 60 * 60), - httpOnly: true, - sameSite: "lax", - }).status(202).send(email); + return res + .cookie(updateUser.userID, token, { + path: "/", + expires: new Date(Date.now() + 1000 * 1 * 24 * 60 * 60), + httpOnly: true, + sameSite: "lax", + }) + .status(202) + .send(email); } } catch (error) { console.log(error); @@ -251,10 +284,11 @@ const updatePassword = async (req, res) => { const signin = async (req, res) => { try { - if(req.rateLimit.remaining <= 1) - { - return res.status(425).send({message:"Too Many requests, please try again after some minutes"}); - } + if (req.rateLimit.remaining <= 1) { + return res.status(425).send({ + message: "Too Many requests, please try again after some minutes", + }); + } const { username, email, password } = req.body; const user = await prisma.user.findFirst({ @@ -270,26 +304,32 @@ const signin = async (req, res) => { console.log(user); if (!user) { - return res.status(401).json({ msg: "Incorrect Credentials or User not found" }); + return res + .status(401) + .json({ msg: "Incorrect Credentials or User not found" }); } - var token = jwt.sign({ userId:user.userID,email: user.email }, process.env.SECRET_KEY, { - expiresIn: 24 * 60 * 60, - }); + var token = jwt.sign( + { userId: user.userID, email: user.email }, + process.env.SECRET_KEY, + { + expiresIn: 24 * 60 * 60, + } + ); console.log(token); const hashPass = user.password; const isVarified = user.isVarified; const validPass = bcrypt.compareSync(password, hashPass); console.log(validPass); + if (!isVarified) { + res.status(403).send({ msg: "User is not varified!" }); + } if (!validPass) { return res.status(401).json({ msg: "Incorrect Credentials" }); } - if (!isVarified) { - res.status(403).send({ msg: "User is not varified!" }); - } res .cookie(user.userID, token, { @@ -305,8 +345,6 @@ const signin = async (req, res) => { } }; - - const refreshSignIn = async (req, res) => { try { if (req.headers.cookie) { @@ -341,7 +379,7 @@ const logout = async (req, res) => { where: { email: payload.email }, }); // console.log(user?.email); - if(!user) return res.status(400).send("User not Found"); + if (!user) return res.status(400).send("User not Found"); res .clearCookie(user?.userID, "", { path: "/", @@ -354,14 +392,12 @@ const logout = async (req, res) => { // console.log(req.body.email); } catch (error) { res.status(500).json({ - msg:"Server Issue", - error - }) + msg: "Server Issue", + error, + }); } }; - - const testing = async (req, res) => { const deleteUsers = await prisma.user.deleteMany({ where: { @@ -380,18 +416,26 @@ const testing = async (req, res) => { res.json({ msg: "deleted" }); }; - -const generateUsername=async(req,res)=>{ - +const generateUsername = async (req, res) => { try { const usernames = await generateUniqueUsernames(); res.status(201).json({ usernames }); } catch (error) { - res.status(500).json({ error: 'Failed to generate username options' }); + res.status(500).json({ error: "Failed to generate username options" }); } - }; -const authController={signup, signin, logout, varifyOtp , resendOtp, resetPassword, updatePassword, refreshSignIn,generateUsername,testing} +const authController = { + signup, + signin, + logout, + varifyOtp, + resendOtp, + resetPassword, + updatePassword, + refreshSignIn, + generateUsername, + testing, +}; -export default authController \ No newline at end of file +export default authController; diff --git a/backend/src/controller/search.js b/backend/src/controller/search.js index 5a0cc89..5413a4d 100644 --- a/backend/src/controller/search.js +++ b/backend/src/controller/search.js @@ -1,7 +1,6 @@ import prisma from "../../db/db.config.js"; import CryptoJS from "crypto-js"; import axios from "axios"; -import { LeetCode } from "leetcode-query"; export const getUsers = async (req, res) => { try { @@ -215,7 +214,8 @@ export const getLCdata = async (req, res) => { const user = data.matchedUser; if (!user) { - res.status(404).send({ status: "error" }); + res.status(404).send("user not found"); + return } const solved = user.submitStats.acSubmissionNum; diff --git a/frontend/src/components/LeetCode.jsx b/frontend/src/components/LeetCode.jsx index 1c78b0f..a4ac773 100644 --- a/frontend/src/components/LeetCode.jsx +++ b/frontend/src/components/LeetCode.jsx @@ -54,23 +54,23 @@ const LeetCode = () => { const encUsername = CryptoJS.AES.encrypt(user.leetcode, import.meta.env.VITE_LC_SECRETKEY).toString(); - - let res = await axios.post(`${baseAddress}search/getLCdata/`, {username: encUsername}); if (res.status==200) { setlcdata(res.data); - } else { - console.log("Some error occured!"); - toast.error("Some error occured!") - } } catch (error) { - console.log(error); + if(error.response.status==404){ + console.log("user not found"); + toast.error("User not found!"); + + }else{ + console.log(error); + } } setisLoading(false) @@ -93,7 +93,7 @@ const LeetCode = () => { if (user?.leetcode) { getLC() } - }, [user]) + }, []) return ( diff --git a/frontend/src/pages/Signin.jsx b/frontend/src/pages/Signin.jsx index a85c1da..760558c 100644 --- a/frontend/src/pages/Signin.jsx +++ b/frontend/src/pages/Signin.jsx @@ -71,8 +71,8 @@ const Signin = () => { if(error.response.status==401){ toast.error("Invalid Credentials") }else if(error.response.status==403){ - toast.error("User is not Varified! Varify your email.") - Navigate("/varifyaccount") + toast.error("User doesn't exists. Please Sign Up") + Navigate("/signup") } else if(error.response.status == 425) { diff --git a/frontend/src/pages/Signup.jsx b/frontend/src/pages/Signup.jsx index 35f9ec4..e3c891a 100644 --- a/frontend/src/pages/Signup.jsx +++ b/frontend/src/pages/Signup.jsx @@ -17,6 +17,8 @@ import baseAddress from "../utils/localhost"; import { login } from '../redux/login'; import { getUserData } from '../App'; import { show } from '../redux/welcome'; +import { v4 as uuidv4 } from 'uuid'; + @@ -290,9 +292,9 @@ const Signup = () => {