Skip to content

fix: edit in auth functions #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kimoo193 merged 1 commit into from
Mar 27, 2025
Merged

fix: edit in auth functions #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/controllers/auth.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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({
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);

Expand Down
25 changes: 25 additions & 0 deletions src/validations/auth.validations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -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({
Expand Down