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

Jump to bottom

refactor: remove bcrypt #375

Merged
merged 1 commit into from
May 25, 2023
Merged

refactor: remove bcrypt #375

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"@keyv/mongo": "^2.1.8",
"@waylaidwanderer/chatgpt-api": "^1.36.0",
"axios": "^1.3.4",
"bcrypt": "^5.1.0",
"bcryptjs": "^2.4.3",
"cookie": "^0.5.0",
"cookie-parser": "^1.4.6",
Expand Down
25 changes: 9 additions & 16 deletions api/server/services/auth.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const User = require('../../models/User');
const Token = require('../../models/schema/tokenSchema');
const sendEmail = require('../../utils/sendEmail');
const crypto = require('crypto');
const bcrypt = require('bcrypt');
const bcrypt = require('bcryptjs');
const DebugControl = require('../../utils/debug.js');
const { registerSchema } = require('../../strategies/validators');
const migrateDataToFirstUser = require('../../utils/migrateDataToFirstUser');
Expand Down Expand Up @@ -90,20 +90,13 @@ const registerUser = async (user) => {
// todo: implement refresh token
// const refreshToken = newUser.generateRefreshToken();
// newUser.refreshToken.push({ refreshToken });
bcrypt.genSalt(10, (err, salt) => {
bcrypt.hash(newUser.password, salt, (errh, hash) => {
if (err) {
console.log(err);
}
// set pasword to hash
newUser.password = hash;
newUser.save();
});
});
console.log('newUser', newUser);
const salt = bcrypt.genSaltSync(10);
const hash = bcrypt.hashSync(newUser.password, salt);
newUser.password = hash;
newUser.save();

if (isFirstRegisteredUser) {
migrateDataToFirstUser(newUser);
// console.log(migrate);
}
response = { status: 200, user: newUser };
return response;
Expand All @@ -127,7 +120,7 @@ const requestPasswordReset = async (email) => {
if (token) await token.deleteOne();

let resetToken = crypto.randomBytes(32).toString('hex');
const hash = await bcrypt.hash(resetToken, 10);
const hash = await bcrypt.hashSync(resetToken, 10);

await new Token({
userId: user._id,
Expand Down Expand Up @@ -156,13 +149,13 @@ const resetPassword = async (userId, token, password) => {
return new Error('Invalid or expired password reset token');
}

const isValid = await bcrypt.compare(token, passwordResetToken.token);
const isValid = bcrypt.compareSync(token, passwordResetToken.token);

if (!isValid) {
return new Error('Invalid or expired password reset token');
}

const hash = await bcrypt.hash(password, 10);
const hash = bcrypt.hashSync(password, 10);

await User.updateOne({ _id: userId }, { $set: { password: hash } }, { new: true });

Expand Down