From bf34673bc2d7a1a558576c69545e4b0117b15dc7 Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Fri, 20 Jul 2018 10:46:15 +0300
Subject: [PATCH] feat(change-password): fix change password api
---
.../src/routes/users/changePassword.js | 2 +-
.../src/components/Admin/EditUserForm.js | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/packages/component-user-manager/src/routes/users/changePassword.js b/packages/component-user-manager/src/routes/users/changePassword.js
index d1b49ae03..57c1b2b7b 100644
--- a/packages/component-user-manager/src/routes/users/changePassword.js
+++ b/packages/component-user-manager/src/routes/users/changePassword.js
@@ -14,7 +14,7 @@ module.exports = models => async (req, res) => {
let user
try {
user = await models.User.find(req.user)
- if (!user.validPassword(password)) {
+ if (!await user.validPassword(password)) {
return res.status(400).json({ error: 'Wrong username or password.' })
}
user.password = newPassword
diff --git a/packages/components-faraday/src/components/Admin/EditUserForm.js b/packages/components-faraday/src/components/Admin/EditUserForm.js
index fbf6987a8..6924e021d 100644
--- a/packages/components-faraday/src/components/Admin/EditUserForm.js
+++ b/packages/components-faraday/src/components/Admin/EditUserForm.js
@@ -17,7 +17,7 @@ const EditUserForm = ({
{subtitle && <Subtitle>{subtitle}</Subtitle>}
<Row>
<RowItem>
- <Label> First name*1 </Label>
+ <Label> First name* </Label>
<ValidatedField
component={TextField}
name="firstName"
@@ -70,9 +70,9 @@ const EditUserForm = ({
component={input => (
<Checkbox
checked={input.value}
+ label="Editor in Chief"
type="checkbox"
{...input}
- label="Editor in Chief"
/>
)}
name="editorInChief"
@@ -81,9 +81,9 @@ const EditUserForm = ({
component={input => (
<Checkbox
checked={input.value}
+ label="Handling Editor"
type="checkbox"
{...input}
- label="Handling Editor"
/>
)}
name="handlingEditor"
@@ -92,9 +92,9 @@ const EditUserForm = ({
component={input => (
<Checkbox
checked={input.value}
+ label="Admin"
type="checkbox"
{...input}
- label="Admin"
/>
)}
name="admin"
--
GitLab