From 50d69df3c861d191b853442eb436253213a57515 Mon Sep 17 00:00:00 2001
From: Comus Leong <comus.leong@gmail.com>
Date: Sat, 18 Mar 2017 02:21:10 +0800
Subject: [PATCH] std:accounts-ui: show logging in message

---
 .../imports/ui/components/LoginForm.jsx       | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/packages/_accounts-ui/imports/ui/components/LoginForm.jsx b/packages/_accounts-ui/imports/ui/components/LoginForm.jsx
index 139ae8d70..36c6b6c3c 100755
--- a/packages/_accounts-ui/imports/ui/components/LoginForm.jsx
+++ b/packages/_accounts-ui/imports/ui/components/LoginForm.jsx
@@ -18,6 +18,8 @@ import {
   capitalize
 } from '../../helpers.js';
 
+const loggingInMessage = 'Logging In...';
+
 export class LoginForm extends Tracker.Component {
   constructor(props) {
     super(props);
@@ -100,6 +102,18 @@ export class LoginForm extends Tracker.Component {
           formState: this.props.user ? STATES.PROFILE : STATES.SIGN_IN
         });
       }
+
+      if (this.state.formState == STATES.PROFILE) {
+        if (!this.props.user && this.state.messages.length === 0) {
+          this.showMessage(loggingInMessage);
+        } else if (this.props.user &&
+          this.state.messages.find(({ message }) => message === loggingInMessage)) {
+          this.clearMessage(loggingInMessage);
+        }
+      } else if (prevState.formState == STATES.PROFILE &&
+        this.state.messages.find(({ message }) => message === loggingInMessage)) {
+        this.clearMessage(loggingInMessage);
+      }
     } else {
       if (!prevState.user !== !this.state.user) {
         this.setState({
@@ -394,10 +408,7 @@ export class LoginForm extends Tracker.Component {
         onClick: this.passwordChange.bind(this)
       });
 
-      const user = typeof this.props.user !== 'undefined'
-        ? this.props.user : Accounts.user();
-
-      if (user) {
+      if (Accounts.user()) {
         loginButtons.push({
           id: 'switchToSignOut',
           label: T9n.get('cancel'),
@@ -447,13 +458,10 @@ export class LoginForm extends Tracker.Component {
   }
 
   showForgotPasswordLink() {
-    const user = typeof this.props.user !== 'undefined'
-      ? this.props.user : this.state.user;
-    return !user
-      && this.state.formState == STATES.SIGN_IN
-      && _.contains(
-        ["USERNAME_AND_EMAIL", "USERNAME_AND_OPTIONAL_EMAIL", "EMAIL_ONLY"],
-        passwordSignupFields());
+    return this.state.formState == STATES.SIGN_IN && _.contains(
+      ["USERNAME_AND_EMAIL", "USERNAME_AND_OPTIONAL_EMAIL", "EMAIL_ONLY"],
+      passwordSignupFields()
+    );
   }
 
   /**
@@ -912,6 +920,7 @@ export class LoginForm extends Tracker.Component {
       deprecated: true,
       message: messages.map(({ message }) => message).join(', '),
     };
+
     return (
       <Accounts.ui.Form
         oauthServices={this.oauthButtons()}