Merge pull request #21 from TaskTrial/fix/20/authsolve

fix: edit in auth functions

Author: Kimoo193

src/controllers/auth.controller.js

@@ -6,9 +6,11 @@ import { comparePassword, hashPassword } from '../utils/password.utils.js';
 import { generateOTP } from '../utils/otp.utils.js';
 import { sendEmail } from '../utils/email.utils.js';
 import {
+  forgotPasswordValidation,
   resetPasswordValidation,
   signinValidation,
   signupValidation,
+  verifyEmailValidation,
 } from '../validations/auth.validations.js';
 import {
   generateAccessToken,
@@ -82,6 +84,11 @@ export const signup = async (req, res) => {
 
 export const verifyEmail = async (req, res) => {
   try {
+    const { error } = verifyEmailValidation(req.body);
+    if (error) {
+      return res.status(400).json({ message: error.details[0].message });
+    }
+
     const { email, otp } = req.body;
 
     const user = await prisma.user.findFirst({
@@ -176,7 +183,11 @@ export const signin = async (req, res) => {
 
 export const forgotPassword = async (req, res) => {
   try {
-    // TODO: must validate user inputs
+    const { error } = forgotPasswordValidation();
+    if (error) {
+      return res.status(400).json({ message: error.details[0].message });
+    }
+
     const { email } = req.body;
 
     // Find user
@@ -211,7 +222,6 @@ export const forgotPassword = async (req, res) => {
 
     return res.status(200).json({
       message: 'Password reset OTP sent',
-      userId: user.id, // TODO: delete userId from response
     });
   } catch (error) {
     return res
@@ -271,6 +281,10 @@ export const refreshAccessToken = async (req, res) => {
   try {
     const { refreshToken } = req.body;
 
+    if (!refreshToken) {
+      return res.status(400).json({ message: 'Refresh token is required' });
+    }
+
     // Verify refresh token
     const decoded = jwt.verify(refreshToken, process.env.JWT_REFRESH_SECRET);
 

src/validations/auth.validations.js

@@ -32,6 +32,20 @@ export const signupValidation = (obj) => {
   return schema.validate(obj);
 };
 
+export const verifyEmailValidation = (obj) => {
+  const schema = Joi.object({
+    email: Joi.string().email().required().trim().messages({
+      'string.empty': 'Email is required.',
+      'string.email': 'Please enter a valid email address.',
+    }),
+    otp: Joi.string().required().trim().messages({
+      'string.empty': 'OTP is required.',
+    }),
+  });
+
+  return schema.validate(obj);
+};
+
 export const signinValidation = (obj) => {
   const schema = Joi.object({
     email: Joi.string().email().required().trim().messages({
@@ -48,6 +62,17 @@ export const signinValidation = (obj) => {
   return schema.validate(obj);
 };
 
+export const forgotPasswordValidation = (obj) => {
+  const schema = Joi.object({
+    email: Joi.string().email().required().trim().messages({
+      'string.empty': 'Email is required.',
+      'string.email': 'Please enter a valid email address.',
+    }),
+  });
+
+  return schema.validate(obj);
+};
+
 export const resetPasswordValidation = (obj) => {
   const schema = Joi.object({
     email: Joi.string().email().required().trim().messages({