simplify login action

Author: bertho-zero

src/containers/Login/Login.js

@@ -28,14 +28,17 @@ export default class Login extends Component {
 
   onFacebookLogin = (err, data) => {
     if (err) return;
-    this.props.login('facebook', data, false).then(this.successLogin).catch(error => {
-      if (error.message === 'Incomplete oauth registration') {
-        this.context.router.push({
-          pathname: '/register',
-          state: { oauth: error.data }
-        });
-      }
-    });
+    this.props
+      .login('facebook', data)
+      .then(this.successLogin)
+      .catch(error => {
+        if (error.message === 'Incomplete oauth registration') {
+          this.context.router.push({
+            pathname: '/register',
+            state: { oauth: error.data }
+          });
+        }
+      });
   };
 
   login = data => this.props.login('local', data).then(this.successLogin);
@@ -49,18 +52,19 @@ export default class Login extends Component {
     return data;
   };
 
-  FacebookLoginButton = ({ facebookLogin }) =>
-    (<button className="btn btn-primary" onClick={facebookLogin}>
+  FacebookLoginButton = ({ facebookLogin }) => (
+    <button className="btn btn-primary" onClick={facebookLogin}>
       Login with <i className="fa fa-facebook-f" />
-    </button>);
+    </button>
+  );
 
   render() {
     const { user, logout } = this.props;
     return (
       <div className="container">
         <Helmet title="Login" />
         <h1>Login</h1>
-        {!user &&
+        {!user && (
           <div>
             <LoginForm onSubmit={this.login} />
             <p>This will "log you in" as this user, storing the username in the session of the API server.</p>
@@ -71,19 +75,19 @@ export default class Login extends Component {
               onLogin={this.onFacebookLogin}
               component={this.FacebookLoginButton}
             />
-          </div>}
-        {user &&
+          </div>
+        )}
+        {user && (
           <div>
-            <p>
-              You are currently logged in as {user.email}.
-            </p>
+            <p>You are currently logged in as {user.email}.</p>
 
             <div>
               <button className="btn btn-danger" onClick={logout}>
                 <i className="fa fa-sign-out" /> Log Out
               </button>
             </div>
-          </div>}
+          </div>
+        )}
       </div>
     );
   }

src/redux/modules/auth.js

@@ -160,11 +160,15 @@ export function load() {
 export function register(data) {
   return {
     types: [REGISTER, REGISTER_SUCCESS, REGISTER_FAIL],
-    promise: ({ app }) => app.service('users').create(data).catch(catchValidation)
+    promise: ({ app }) =>
+      app
+        .service('users')
+        .create(data)
+        .catch(catchValidation)
   };
 }
 
-export function login(strategy, data, validation = true) {
+export function login(strategy, data) {
   const socketId = socket.io.engine.id;
   return {
     types: [LOGIN, LOGIN_SUCCESS, LOGIN_FAIL],
@@ -178,7 +182,7 @@ export function login(strategy, data, validation = true) {
         .then(setToken({ client, app, restApp }))
         .then(setCookie({ app }))
         .then(setUser({ app, restApp }))
-        .catch(validation ? catchValidation : error => Promise.reject(error))
+        .catch(strategy === 'local' ? catchValidation : error => Promise.reject(error))
   };
 }