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
6 changes: 5 additions & 1 deletion backend/controllers/passController.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ const { ErrorHandler } = require("../middleware/errorMiddleware")
const generatePass = async (req, res, next) => {
try {
const { name, email, phone, duration, start } = req.body
if (!name || !email || !phone || !duration || !start) {
throw new ErrorHandler(400, "Missing fields")
}
const userName = await User.findOne({ _id: req.user.id }, { name: 1 })

const newPass = await Pass.create({
name,
Expand All @@ -15,7 +19,7 @@ const generatePass = async (req, res, next) => {
duration,
start,
generatedUserId: req.user.id,
userName: req.user.name,
generatedUserName: userName.name,
})
res.status(201).json({
success: true,
Expand Down
24 changes: 12 additions & 12 deletions backend/middleware/authMiddleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@ const { ErrorHandler } = require("./errorMiddleware")

const authorize = (role) => {
return async (req, res, next) => {
if (
req.headers.authorization &&
req.headers.authorization.startsWith("Bearer")
) {
try {
try {
if (
req.headers.authorization &&
req.headers.authorization.startsWith("Bearer")
) {
let token
token = req.headers.authorization.split(" ")[1]
if (!token) {
throw new ErrorHandler(400, "Not authorized, no token")
throw new ErrorHandler(498, "No authorization token found")
}
const decoded = jwt.verify(token, process.env.JWT_SECRET)
req.user = await User.findById(decoded.id)
const user = req.user
if (!user.roles.includes(role)) {
req.user = await User.findOne({ _id: decoded.id }, { roles: 1 })
if (!req.user.roles.includes(role)) {
throw new ErrorHandler(403, "You are not authorized to access this")
}

next()
} catch (error) {
next(error)
} else {
throw new ErrorHandler(499, "No authorization token found")
}
} catch (error) {
next(error)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion backend/middleware/errorMiddleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class ErrorHandler extends Error {
const handleError = (err, res) => {
const { statusCode, message } = err
console.log(err)
res.status(statusCode).json({
res.status(statusCode ? statusCode : 500).json({
status: "error",
statusCode,
message,
Expand Down
4 changes: 4 additions & 0 deletions backend/model/pass.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ const passSchema = mongoose.Schema(
type: mongoose.Schema.Types.ObjectId,
ref: "User",
},
generatedUserName: {
type: mongoose.Schema.Types.String,
ref: "User",
},
duration: {
type: Number,
required: true,
Expand Down