Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 20 additions & 6 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"jsonwebtoken": "^9.0.3",
"morgan": "^1.11.0",
"mysql2": "^3.22.4",
"sequelize": "^6.37.8"
"sequelize": "^6.37.8",
"uuid": "^11.1.1"
},
"devDependencies": {
"jest": "^30.4.2",
Expand Down
8 changes: 3 additions & 5 deletions backend/src/app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const express = require('express');
const cors = require('cors');
const morgan = require('morgan');
const { sendSuccess } = require('./utils/response');
const app = express();

const authRoutes = require('./routes/auth.routes');
Expand All @@ -17,10 +18,7 @@ app.use('/api/tickets', ticketRoutes);

// Health Check
app.get('/api/health', (req, res) => {
res.json({
success: true,
message: 'SmartQueue API is running'
});
sendSuccess(res, 200, 'SmartQueue API is running');
});

module.exports = app;
module.exports = app;
161 changes: 63 additions & 98 deletions backend/src/controllers/auth.controller.js
Original file line number Diff line number Diff line change
@@ -1,127 +1,92 @@
const bcrypt = require('bcrypt');
const jwt = require('jsonwebtoken');
const { User } = require('../models');
const { sendSuccess, sendError } = require('../utils/response');
const catchAsync = require('../utils/catchAsync');

// ==========================================
// REGISTER CONTROLLER
// ==========================================
const register = async (req, res) => {
try {
const { name, email, password } = req.body;
const register = catchAsync(async (req, res) => {
const { name, email, password } = req.body;

if (!name || !email || !password) {
return res.status(400).json({
success: false,
message: 'All fields are required',
});
}
if (!name || !email || !password) {
return sendError(res, 400, 'All fields are required');
}

// 1. Check if user already exists
const existingUser = await User.findOne({
where: { email },
});
// 1. Check if user already exists
const existingUser = await User.findOne({
where: { email },
});

if (existingUser) {
return res.status(400).json({
success: false,
message: 'Email already registered',
});
}
if (existingUser) {
return sendError(res, 400, 'Email already registered');
}

// 2. Hash password
const hashedPassword = await bcrypt.hash(password, 10);
// 2. Hash password
const hashedPassword = await bcrypt.hash(password, 10);

// 3. Create user
const user = await User.create({
name,
email,
password: hashedPassword,
});
// 3. Create user
const user = await User.create({
name,
email,
password: hashedPassword,
});

// 4. Return response
return res.status(201).json({
success: true,
message: 'User registered successfully',
user: {
id: user.id,
name: user.name,
email: user.email,
},
});
} catch (error) {
console.error('Register error:', error);
return res.status(500).json({
success: false,
message: 'Server error',
});
}
};
// 4. Return response
return sendSuccess(res, 201, 'User registered successfully', {
user: {
id: user.id,
name: user.name,
email: user.email,
},
});
});

// ==========================================
// LOGIN CONTROLLER
// ==========================================
const login = async (req, res) => {
try {
const { email, password } = req.body;
const login = catchAsync(async (req, res) => {
const { email, password } = req.body;

// 1. Validate request body
if (!email || !password) {
return res.status(400).json({
success: false,
message: 'Email and password are required.'
});
}

// 2. Find user by email
const user = await User.findOne({ where: { email } });
if (!user) {
return res.status(401).json({
success: false,
message: 'Invalid email or password.'
});
}
if (!email || !password) {
return sendError(res, 400, 'Email and password are required.');
}

// 3. Compare password with bcrypt
const isPasswordValid = await bcrypt.compare(password, user.password);
if (!isPasswordValid) {
return res.status(401).json({
success: false,
message: 'Invalid email or password.'
});
}
// 1. Find user by email
const user = await User.findOne({ where: { email } });
if (!user) {
return sendError(res, 401, 'Invalid email or password.');
}

// 4. Generate JWT token
const token = jwt.sign(
{ id: user.id, email: user.email },
process.env.JWT_SECRET,
{ expiresIn: process.env.JWT_EXPIRES_IN || '24h' }
);
// 2. Compare password with bcrypt
const isPasswordValid = await bcrypt.compare(password, user.password);
if (!isPasswordValid) {
return sendError(res, 401, 'Invalid email or password.');
}

// 5. Return token and user info
return res.status(200).json({
success: true,
message: 'Login successful.',
token,
user: {
id: user.id,
name: user.name,
email: user.email,
},
});
// 3. Generate JWT token
const token = jwt.sign(
{ id: user.id, email: user.email },
process.env.JWT_SECRET,
{ expiresIn: process.env.JWT_EXPIRES_IN || '24h' }
);

} catch (error) {
console.error('Login error:', error);
return res.status(500).json({
success: false,
message: 'An error occurred during login.'
});
}
};
// 4. Return token and user info
return sendSuccess(res, 200, 'Login successful.', {
token,
user: {
id: user.id,
name: user.name,
email: user.email,
},
});
}, 'An error occurred during login.');

// ==========================================
// EXPORTS
// ==========================================
module.exports = {
register,
login,
};
};
Loading