Skip to content
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

Fix: Bcrypt library linkage breaking in dev #56

Merged
merged 1 commit into from
May 3, 2023
Merged

Fix: Bcrypt library linkage breaking in dev #56

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
120 changes: 60 additions & 60 deletions server/controller/userController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
const User = require("../model/userModel");
const bcrypt = require("bcrypt")
const bcrypt = require("bcryptjs");

module.exports.register = async(req,res,next) => {
try{
const {username, email, password: plainPassword} = req.body;
const usernameCheck = await User.findOne({ username })
if(usernameCheck){
return res.json({msg: "Username already in use", status: false})
}
const emailCheck = await User.findOne({email})
if(emailCheck){
return res.json({msg: "Email already in use", status: false})
}
const hashedPassword = await bcrypt.hash(plainPassword, 10);
const user = await User.create({
email,
username,
password: hashedPassword
})
const {password, ...others} = user._doc;
console.log(others)
return res.json({ status: true, user:others})
}catch(err){
next(err)
module.exports.register = async (req, res, next) => {
try {
const { username, email, password: plainPassword } = req.body;
const usernameCheck = await User.findOne({ username });
if (usernameCheck) {
return res.json({ msg: "Username already in use", status: false });
}
}

module.exports.login = async(req,res,next) => {
try{
const {username, password} = req.body;
const user = await User.findOne({username})
if(!user){
return res.json({msg: "Incorrect password or username", status: false})
}
const comparePassword = await bcrypt.compare(password, user.password)
if(!comparePassword){
return res.json({msg: "Incorrect password or username", status: false})
}
delete user.password;
return res.json({ status: true, user})
}catch(err){
next(err)
const emailCheck = await User.findOne({ email });
if (emailCheck) {
return res.json({ msg: "Email already in use", status: false });
}
}
const hashedPassword = await bcrypt.hash(plainPassword, 10);
const user = await User.create({
email,
username,
password: hashedPassword,
});
const { password, ...others } = user._doc;
console.log(others);
return res.json({ status: true, user: others });
} catch (err) {
next(err);
}
};

module.exports.getAllUsers = async(req,res,next) => {
try{
const users = await User.find({_id: {$ne: req.params}}).select([
"email",
"username",
"_id"
])
return res.json(users)
}catch(err){
next(err)
module.exports.login = async (req, res, next) => {
try {
const { username, password } = req.body;
const user = await User.findOne({ username });
if (!user) {
return res.json({ msg: "Incorrect password or username", status: false });
}
const comparePassword = await bcrypt.compare(password, user.password);
if (!comparePassword) {
return res.json({ msg: "Incorrect password or username", status: false });
}
}
delete user.password;
return res.json({ status: true, user });
} catch (err) {
next(err);
}
};

module.exports.getAllUsers = async (req, res, next) => {
try {
const users = await User.find({ _id: { $ne: req.params } }).select([
"email",
"username",
"_id",
]);
return res.json(users);
} catch (err) {
next(err);
}
};

module.exports.logOut = (req, res, next) => {
try {
if (!req.params.id) return res.json({ msg: "User id is required " });
onlineUsers.delete(req.params.id);
return res.status(200).send();
} catch (ex) {
next(ex);
}
};
try {
if (!req.params.id) return res.json({ msg: "User id is required " });
onlineUsers.delete(req.params.id);
return res.status(200).send();
} catch (ex) {
next(ex);
}
};
Loading