Skip to content

Change messages and status code #25

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

Merged
pattruong merged 1 commit into from
Feb 3, 2021
Merged

Change messages and status code #25

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
12 changes: 6 additions & 6 deletions src/controllers/password.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const forgotPasswordController = async (req, res, next) => {
// so bad actors can't use this endpoint to find user emails
// if a user isn't verified they shouldn't be able to reset
if (!barista || !barista.is_verified) {
return next(boom.badRequest("User is unable to reset password"));
return next(boom.unauthorized("User is unable to reset password"));
}

const passwordResetExpiry = new Date(
Expand Down Expand Up @@ -126,7 +126,7 @@ export const resetPasswordController = async (req, res, next) => {
const schema = joi.object().keys({
email: joi.string().email().lowercase().required(),
code: joi.string().guid({ version: "uuidv4" }).required(),
newPassword: joi.string().required(),
password: joi.string().required(),
});

const { error, value } = schema.validate(req.body);
Expand All @@ -135,7 +135,7 @@ export const resetPasswordController = async (req, res, next) => {
return next(boom.badRequest(error.details[0].message));
}

const { email, code, newPassword } = value;
const { email, code, password } = value;

// change password
try {
Expand All @@ -156,10 +156,10 @@ export const resetPasswordController = async (req, res, next) => {
const { password_reset_code } = barista;

if (new Date() > new Date(password_reset_code.expires_at)) {
return next(boom.unauthorized("expired reset code token"));
return next(boom.unauthorized("Expired reset code"));
}

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

await axios.post(
GRAPHQL_URL,
Expand All @@ -177,6 +177,6 @@ export const resetPasswordController = async (req, res, next) => {

res.send("OK");
} catch (e) {
return next(boom.badRequest("Error reseting password"));
return next(boom.badRequest("Error resetting password"));
}
};