Fix bug in authentication middleware

Remchi · Aug 8, 2016 · b15425c · b15425c
1 parent d47881c
commit b15425c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/client/components/signup/SignupForm.js b/client/components/signup/SignupForm.js
@@ -39,22 +39,22 @@ class SignupForm extends React.Component {
   }
 
   checkUserExists(e) {
-    // const field = e.target.name;
-    // const val = e.target.value;
-    // if (val !== '') {
-    //   this.props.isUserExists(val).then(res => {
-    //     let errors = this.state.errors;
-    //     let invalid;
-    //     if (res.data.user) {
-    //       errors[field] = 'There is user with such ' + field;
-    //       invalid = true;
-    //     } else {
-    //       errors[field] = '';
-    //       invalid = false;
-    //     }
-    //     this.setState({ errors, invalid });
-    //   });
-    // }
+    const field = e.target.name;
+    const val = e.target.value;
+    if (val !== '') {
+      this.props.isUserExists(val).then(res => {
+        let errors = this.state.errors;
+        let invalid;
+        if (res.data.user) {
+          errors[field] = 'There is user with such ' + field;
+          invalid = true;
+        } else {
+          errors[field] = '';
+          invalid = false;
+        }
+        this.setState({ errors, invalid });
+      });
+    }
   }
 
   onSubmit(e) {

diff --git a/server/middlewares/authenticate.js b/server/middlewares/authenticate.js
@@ -21,10 +21,11 @@ export default (req, res, next) => {
         }).fetch().then(user => {
           if (!user) {
             res.status(404).json({ error: 'No such user' });
+          } else {
+            req.currentUser = user;
+            next();
           }
 
-          req.currentUser = user;
-          next();
         });
       }
     });