From a6ac50d7d910cf0374aeb76702af0fd8fe7a5398 Mon Sep 17 00:00:00 2001
From: Ahmad Safar <ahmadindoblog@gmail.com>
Date: Sun, 15 May 2016 02:20:42 +0800
Subject: [PATCH] Fix "Username Required" error

When use USERNAME_AND_EMAIL auth fields it will show error if it open in Sign Up state then switch to Sign Up state and do login even if username or email field was filled.
---
 imports/ui/components/LoginForm.jsx | 32 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/imports/ui/components/LoginForm.jsx b/imports/ui/components/LoginForm.jsx
index d42c86c..99126b9 100644
--- a/imports/ui/components/LoginForm.jsx
+++ b/imports/ui/components/LoginForm.jsx
@@ -449,7 +449,20 @@ export class LoginForm extends Tracker.Component {
 
     let loginSelector;
 
-    if (username !== null) {
+    if (usernameOrEmail !== null) {
+      // XXX not sure how we should validate this. but this seems good enough (for now),
+      // since an email must have at least 3 characters anyways
+      if (!this.validateUsername(usernameOrEmail)) {
+        return;
+      }
+      else {
+        if (_.contains([ "USERNAME_AND_EMAIL_NO_PASSWORD" ], passwordSignupFields())) {
+          this.loginWithoutPassword();
+          return;
+        }
+        loginSelector = usernameOrEmail;
+      }
+    } else if (username !== null) {
       if (!this.validateUsername(username)) {
         return;
       }
@@ -468,22 +481,7 @@ export class LoginForm extends Tracker.Component {
         }
         loginSelector = { email };
       }
-    }
-    else if (usernameOrEmail !== null) {
-      // XXX not sure how we should validate this. but this seems good enough (for now),
-      // since an email must have at least 3 characters anyways
-      if (!this.validateUsername(usernameOrEmail)) {
-        return;
-      }
-      else {
-        if (_.contains([ "USERNAME_AND_EMAIL_NO_PASSWORD" ], passwordSignupFields())) {
-          this.loginWithoutPassword();
-          return;
-        }
-        loginSelector = usernameOrEmail;
-      }
-    }
-    else {
+    } else {
       throw new Error("Unexpected -- no element to use as a login user selector");
     }