Merge pull request #481 from JaviFdez7/develop

Cambios del feedback de Antonio
JaviFdez7 · May 17, 2024 · 7f5e64a · 7f5e64a
2 parents 64bd967 + 5a3fa19
commit 7f5e64a
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 38 deletions.
diff --git a/api/v1/modules/user/middlewares/UserMiddleware.ts b/api/v1/modules/user/middlewares/UserMiddleware.ts
@@ -185,11 +185,11 @@ export const checkRealUser: any = async (req: Request, res: Response, next: Next
 		const data = req.body
 		// Comprobar si el usuario existe
 		const userByEmail = await User.findOne({ email: data.usernameOrEmail })
-		const userByUsername=await User.findOne({ username: data.usernameOrEmail })
+		const userByUsername = await User.findOne({ username: data.usernameOrEmail })
 		if (!userByEmail && !userByUsername) {
 			const message = 'User not found'
 			ApiResponse.sendError(res, [{ title: 'Not Found', detail: message }], 404)
-		}else {
+		} else {
 			next()
 		}
 	} catch (error: any) {
@@ -211,19 +211,18 @@ export const checkCorrectToken: any = async (req: Request, res: Response, next:
 			return
 		}
 		const decodedToken = verifyJWT(token)
-		if(!decodedToken.sub){
+		if (!decodedToken.sub) {
 			const message = 'Incorrect token'
 			ApiResponse.sendError(res, [{ title: 'Bad Request', detail: message }], 401)
 			return
 		}
-		const user= await User.findById(decodedToken.sub)
-		if(!user){
+		const user = await User.findById(decodedToken.sub)
+		if (!user) {
 			const message = 'User not found'
 			ApiResponse.sendError(res, [{ title: 'Not Found', detail: message }], 404)
-		}else {
+		} else {
 			next()
 		}
-
 	} catch (error: any) {
 		ApiResponse.sendError(res, [
 			{
@@ -234,21 +233,24 @@ export const checkCorrectToken: any = async (req: Request, res: Response, next:
 	}
 }
 
-export const checkRepeatedPassword: any = async (req: Request, res: Response, next: NextFunction) => {
+export const checkRepeatedPassword: any = async (
+	req: Request,
+	res: Response,
+	next: NextFunction
+) => {
 	try {
-		const {newPassword,repeatedPassword} = req.body
-		const compare=newPassword === repeatedPassword
-		if(newPassword.lenght ===0 || repeatedPassword.lenght===0){
+		const { newPassword, repeatedPassword } = req.body
+		const compare = newPassword === repeatedPassword
+		if (newPassword.lenght === 0 || repeatedPassword.lenght === 0) {
 			const message = 'There are empty fields'
 			ApiResponse.sendError(res, [{ title: 'Bad Request', detail: message }], 400)
-		}else if(!(compare)){
+		} else if (!compare) {
 			const message = 'The passwords dont match'
 			ApiResponse.sendError(res, [{ title: 'Bad Request', detail: message }], 400)
-		}else {
-			req.body.encryptedPassword=await encrypt(newPassword)
+		} else {
+			req.body.encryptedPassword = await encrypt(newPassword)
 			next()
 		}
-
 	} catch (error: any) {
 		ApiResponse.sendError(res, [
 			{
@@ -273,7 +275,10 @@ export const checkLoginUser: any = async (req: Request, res: Response, next: Nex
 			return
 		}
 		// Comprobar si el usuario existe
-		const user = await User.findOne({ username: data.username })
+		const userByEmail = await User.findOne({ email: data.username })
+		const userByUsername = await User.findOne({ username: data.username })
+		const user = userByEmail ?? userByUsername
+
 		if (!user) {
 			const message = 'User not found'
 			ApiResponse.sendError(res, [{ title: 'Not Found', detail: message }], 404)

diff --git a/api/v1/modules/user/services/UserService.ts b/api/v1/modules/user/services/UserService.ts
@@ -100,45 +100,44 @@ export const deleteUser: any = async (id: any, role: string) => {
 	}
 }
 
-export const sendEmail: any = async (to: string, subject: string, text: string,html: string) =>{
-	try{
-		const from= process.env.SENGRID_EMAIL ?? ''
+export const sendEmail: any = async (to: string, subject: string, text: string, html: string) => {
+	try {
+		const from = process.env.SENGRID_EMAIL ?? ''
 		const msg = {
 			to,
 			from,
 			subject,
 			text,
 			html,
-		  };
+		}
 		await sgMail
-		.send(msg)
-		.then(() => {
-		  console.log('Email sent')
-		})
-		.catch((error:any) => {
-		  console.error(error)
-		})
-	}catch(error:any){
+			.send(msg)
+			.then(() => {
+				console.log('Email sent')
+			})
+			.catch((error: any) => {
+				console.error(error)
+			})
+	} catch (error: any) {
 		console.error('Error creating your request:', error)
 		throw error
 	}
 }
 
-export const createChangePasswordRequest: any = async (data: any,originalUrl: string) => {
+export const createChangePasswordRequest: any = async (data: any, originalUrl: string) => {
 	try {
 		const userByEmail = await User.findOne({ email: data.usernameOrEmail })
-		const userByUsername=await User.findOne({ username: data.usernameOrEmail })
+		const userByUsername = await User.findOne({ username: data.usernameOrEmail })
 		const user = userByEmail ?? userByUsername
 		const id = user?._id.toString()
 		const token = generateJWTWithSoonerExpiration(id)
-		const result = originalUrl+"/"+token
-		const text=`To change the forgotten password, access this link: ${result}. \n
+		const result = originalUrl + '/' + token
+		const text = `The user with the username: ${user?.username} and email: ${user?.email} has requested to change the password.
+		To change the forgotten password, access this link: ${result}. \n
 		 \n
 		 In case of error, simply ignore the message.
 		Thank you very much for using IT TALENT :3`
-		await sendEmail(user?.email,'Verify password change',
-			text,`<strong> ${text} </strong>`
-		)
+		await sendEmail(user?.email, 'Verify password change', text, `<strong> ${text} </strong>`)
 	} catch (error) {
 		console.error('Error creating your request:', error)
 		throw error
@@ -147,7 +146,10 @@ export const createChangePasswordRequest: any = async (data: any,originalUrl: st
 
 export const loginUser: any = async (data: any) => {
 	try {
-		const user = await User.findOne({ username: data.username })
+		const userByEmail = await User.findOne({ email: data.username })
+		const userByUsername = await User.findOne({ username: data.username })
+		const user = userByEmail ?? userByUsername
+
 		const id = user?._id.toString()
 		const token = generateJWT(id)
 		const result = { token, user }
@@ -166,5 +168,6 @@ export default {
 	updateUserProfilePicture,
 	updateUserPassword,
 	deleteUser,
-	loginUser,createChangePasswordRequest
+	loginUser,
+	createChangePasswordRequest,
 }
diff --git a/app/src/pages/auth/Login.jsx b/app/src/pages/auth/Login.jsx
@@ -106,13 +106,15 @@ export default function Login() {
 							}}>
 							<label
 								htmlFor='Username'
-								className='block text-lg font-bold text-white self-center'
+								className='block text-lg font-bold text-white self-center text-center'
 								style={{
 									marginBottom: '1rem',
 									marginRight: '2rem',
 									marginLeft: '4rem',
 								}}>
 								Username
+								<br></br>
+								or email
 							</label>
 							<div
 								className='flex-grow'

diff --git a/app/src/pages/search/SearchForm.jsx b/app/src/pages/search/SearchForm.jsx
@@ -9,6 +9,7 @@ const apiURL = import.meta.env.VITE_BACKEND_URL
 import axios from 'axios'
 import Select from 'react-select'
 import { useAuthContext } from './../../context/authContext'
+import Swal from "sweetalert2";
 
 export default function SearchForm() {
 	const talentColor = 'var(--talent-secondary)'
@@ -259,6 +260,23 @@ export default function SearchForm() {
 		})
 	}
 	const [formErrors, setFormErrors] = useState({})
+
+	const noSearchesPopUp = () => {
+		Swal.fire({
+			title: "You are out of searches",
+			showDenyButton: false,
+			confirmButtonText: "Ok",
+			denyButtonText: ``,
+			confirmButtonColor: "var(--talent-highlight)",
+			background: "var(--talent-secondary)",
+			color: "white",
+		  }).then((result) => {
+			if (result.isConfirmed) {
+			  navigate("/");
+			}
+		});
+	};
+
 	async function handleSubmit(e) {
 		e.preventDefault()
 		let isValid = true
@@ -295,7 +313,20 @@ export default function SearchForm() {
 			const config = {
 				headers: { Authorization: `${token}` },
 			}
+
 			const subscription = localStorage.getItem('subscriptionType')
+			const subsciptionUser = await axios.get(`${import.meta.env.VITE_BACKEND_URL}/subscriptions/${userId}`,
+				{
+					headers: {
+						'Content-type': 'application/json',
+						Authorization: token,
+					},
+				}
+			)
+			if (subsciptionUser.data.data.remainingSearches <= 0) {
+				noSearchesPopUp()
+				return
+			}
 
 			const formArray = Object.values(form)
 			const response = await axios.post(apiURL + '/team-creator', formArray, config)