Skip to content

Some formatting and whitespace fixes #2

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

Open
movahhedi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Some formatting and whitespace fixes #2

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
68 changes: 34 additions & 34 deletions Controllers/admin.controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const adminRegister = (req, res, next) => {
.exec()
.then((admin) => {
if (admin.length >= 1) {
res.status(409).json({
message:"Email Exists"
})
res.status(409).json({
message: "Email Exists"
})
} else {
bcrypt.hash(req.body.password, 10, (err, hash) => {
if (err) {
Expand All @@ -23,72 +23,72 @@ const adminRegister = (req, res, next) => {
_id: new mongoose.Types.ObjectId(),
email: req.body.email,
password: hash,
name: req.body.name,
phone_number: req.body.phone_number
name: req.body.name,
phone_number: req.body.phone_number
});
admin
.save()
.then(async (result) => {
await result
.save()
.then((result1) => {
console.log(`admin created ${result}`)
res.status(201).json({
adminDetails: {
adminId: result._id,
email: result.email,
name: result.name,
phone_number: result.phone_number,
},
})
console.log(`admin created ${result}`)
res.status(201).json({
adminDetails: {
adminId: result._id,
email: result.email,
name: result.name,
phone_number: result.phone_number,
},
})
})
.catch((err) => {
console.log(err)
res.status(400).json({
message: err.toString()
})
console.log(err)
res.status(400).json({
message: err.toString()
})
});
})
.catch((err) => {
console.log(err)
res.status(500).json({
message: err.toString()
})
console.log(err)
res.status(500).json({
message: err.toString()
})
});
}
});
}
})
.catch((err) => {
console.log(err)
res.status(500).json({
message: err.toString()
})
});
console.log(err)
res.status(500).json({
message: err.toString()
})
});
}


const adminLogin = (req, res, next) => {
Admin.find({ email: req.body.email })
.exec()
.then((admin) => {
console.log(admin)
console.log(admin)
if (admin.length < 1) {
return res.status(401).json({
message: "Auth failed: Email not found probably",
});
}
bcrypt.compare(req.body.password, admin[0].password, (err, result) => {
if (err) {
console.log(err)
console.log(err)
return res.status(401).json({
message: "Auth failed",
});
}
if (result) {
const token = jwt.sign(
{
adminId: admin[0]._id,
adminId: admin[0]._id,
email: admin[0].email,
name: admin[0].name,
phone_number: admin[0].phone_number,
Expand All @@ -97,8 +97,8 @@ const adminLogin = (req, res, next) => {
{
expiresIn: "1d",
}
);
console.log(admin[0])
);
console.log(admin[0])
return res.status(200).json({
message: "Auth successful",
adminDetails: {
Expand Down Expand Up @@ -138,7 +138,7 @@ const getMe = async (req, res) => {
};

module.exports = {
adminLogin,
adminRegister,
adminLogin,
adminRegister,
getMe,
};
68 changes: 34 additions & 34 deletions Controllers/users.controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const userRegister = (req, res, next) => {
.exec()
.then((user) => {
if (user.length >= 1) {
res.status(409).json({
message:"Email Exists"
})
res.status(409).json({
message: "Email Exists"
})
} else {
bcrypt.hash(req.body.password, 10, (err, hash) => {
if (err) {
Expand All @@ -23,72 +23,72 @@ const userRegister = (req, res, next) => {
_id: new mongoose.Types.ObjectId(),
email: req.body.email,
password: hash,
name: req.body.name,
phone_number: req.body.phone_number
name: req.body.name,
phone_number: req.body.phone_number
});
user
.save()
.then(async (result) => {
await result
.save()
.then((result1) => {
console.log(`User created ${result}`)
res.status(201).json({
userDetails: {
userId: result._id,
email: result.email,
name: result.name,
phone_number: result.phone_number,
},
})
console.log(`User created ${result}`)
res.status(201).json({
userDetails: {
userId: result._id,
email: result.email,
name: result.name,
phone_number: result.phone_number,
},
})
})
.catch((err) => {
console.log(err)
res.status(400).json({
message: err.toString()
})
console.log(err)
res.status(400).json({
message: err.toString()
})
});
})
.catch((err) => {
console.log(err)
res.status(500).json({
message: err.toString()
})
console.log(err)
res.status(500).json({
message: err.toString()
})
});
}
});
}
})
.catch((err) => {
console.log(err)
res.status(500).json({
message: err.toString()
})
});
console.log(err)
res.status(500).json({
message: err.toString()
})
});
}


const userLogin = (req, res, next) => {
User.find({ email: req.body.email })
.exec()
.then((user) => {
console.log(user)
console.log(user)
if (user.length < 1) {
return res.status(401).json({
message: "Auth failed: Email not found probably",
});
}
bcrypt.compare(req.body.password, user[0].password, (err, result) => {
if (err) {
console.log(err)
console.log(err)
return res.status(401).json({
message: "Auth failed",
});
}
if (result) {
const token = jwt.sign(
{
userId: user[0]._id,
userId: user[0]._id,
email: user[0].email,
name: user[0].name,
phone_number: user[0].phone_number,
Expand All @@ -97,8 +97,8 @@ const userLogin = (req, res, next) => {
{
expiresIn: "1d",
}
);
console.log(user[0])
);
console.log(user[0])
return res.status(200).json({
message: "Auth successful",
userDetails: {
Expand Down Expand Up @@ -138,7 +138,7 @@ const getMe = async (req, res) => {
};

module.exports = {
userLogin,
userRegister,
userLogin,
userRegister,
getMe,
};
20 changes: 10 additions & 10 deletions Middleware/checkAuth.middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const jwt = require("jsonwebtoken");

module.exports = function (req, res, next) {
const token = req.header("auth-token");
if (!token) return res.status(400).send("Access Denied!, no token entered");
const token = req.header("auth-token");
if (!token) return res.status(400).send("Access Denied!, no token entered");

try {
const verified = jwt.verify(token, process.env.jwtSecret);
req.user = verified;
next();
} catch (err) {
res.status(400).send({ error: "auth failed, check auth-token222" });
}
};
try {
const verified = jwt.verify(token, process.env.jwtSecret);
req.user = verified;
next();
} catch (err) {
res.status(400).send({ error: "auth failed, check auth-token222" });
}
};
12 changes: 6 additions & 6 deletions Models/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ const mongoose = require("mongoose");

const adminSchema = new mongoose.Schema({
_id: mongoose.Schema.Types.ObjectId,
name: String,
email: {
name: String,
email: {
type: String,
lowercase: true,
match: /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/,
},
password: String,
phone_number: Number,
},
password: String,
phone_number: Number,
});

module.exports = mongoose.model("Admin", adminSchema);
module.exports = mongoose.model("Admin", adminSchema);
12 changes: 6 additions & 6 deletions Models/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ const mongoose = require("mongoose");

const userSchema = new mongoose.Schema({
_id: mongoose.Schema.Types.ObjectId,
name: String,
email: {
name: String,
email: {
type: String,
lowercase: true,
match: /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/,
},
password: String,
phone_number: Number,
},
password: String,
phone_number: Number,
});

module.exports = mongoose.model("User", userSchema);
module.exports = mongoose.model("User", userSchema);
2 changes: 1 addition & 1 deletion Routes/admin.routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ router.post('/signup', adminControllers.adminRegister);
router.post('/login', adminControllers.adminLogin);
router.get('/me', checkAuth, adminControllers.getMe);

module.exports = router
module.exports = router
2 changes: 1 addition & 1 deletion Routes/users.routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ router.post('/signup', userControllers.userRegister);
router.post('/login', userControllers.userLogin);
router.get('/me', checkAuth, userControllers.getMe);

module.exports = router
module.exports = router
12 changes: 6 additions & 6 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ app.use('/admin', adminRouter)

// catch 404 and forward to error handler
app.use(function(req, res, next) {
res.status(404).json({
message: "No such route exists"
})
res.status(404).json({
message: "No such route exists"
})
});

// error handler
app.use(function(err, req, res, next) {
res.status(err.status || 500).json({
message: "Error Message"
})
res.status(err.status || 500).json({
message: "Error Message"
})
});

module.exports = app;
Loading