2 files changed, 29 insertions, 44 deletions

diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 68876dc5..ac7da3af 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -18,7 +18,6 @@ template(name="userFormsLayout")
       img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
     section.auth-dialog
       +Template.dynamic(template=content)
-      +connectionMethod
       if isCas
         .at-form
           button#cas(class='at-btn submit' type='submit') {{casSignInLabel}}
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index 393f890b..3fda11b7 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -6,23 +6,7 @@ const i18nTagToT9n = (i18nTag) => {
   return i18nTag;
 };
 
-const validator = {
-  set(obj, prop, value) {
-    if (prop === 'state' && value !== 'signIn') {
-      $('.at-form-authentication').hide();
-    } else if (prop === 'state' && value === 'signIn') {
-      $('.at-form-authentication').show();
-    }
-    // The default behavior to store the value
-    obj[prop] = value;
-    // Indicate success
-    return true;
-  },
-};
-
 Template.userFormsLayout.onRendered(() => {
-  AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator);
-
   const i18nTag = navigator.language;
   if (i18nTag) {
     T9n.setLanguage(i18nTagToT9n(i18nTag));
@@ -85,39 +69,41 @@ Template.userFormsLayout.events({
     /* All authentication method can be managed/called here.
        !! DON'T FORGET to correctly fill the fields of the user during its creation if necessary authenticationMethod : String !!
     */
-    const authenticationMethodSelected = $('.select-authentication').val();
-    // Local account
-    if (authenticationMethodSelected === 'password') {
+    if (FlowRouter.getRouteName() !== 'atSignIn') {
       return;
     }
 
-    // Stop submit #at-pwd-form
-    event.preventDefault();
-    event.stopImmediatePropagation();
-
     const email = $('#at-field-username_and_email').val();
-    const password = $('#at-field-password').val();
 
-    // Ldap account
-    if (authenticationMethodSelected === 'ldap') {
-      // Check if the user can use the ldap connection
-      Meteor.subscribe('user-authenticationMethod', email, {
-        onReady() {
-          const user = Users.findOne();
-          if (user === undefined || user.authenticationMethod === 'ldap') {
-            // Use the ldap connection package
-            Meteor.loginWithLDAP(email, password, function(error) {
-              if (!error) {
-                // Connection
-                return FlowRouter.go('/');
-              }
-              return error;
-            });
-          }
+    Meteor.subscribe('user-authenticationMethod', email, {
+      onReady() {
+        const user = Users.findOne();
+
+        if (user && user.authenticationMethod === 'password') {
+          logoutWithTimer(user._id);
           return this.stop();
-        },
-      });
-    }
+        }
+
+        // Stop submit #at-pwd-form
+        event.preventDefault();
+        event.stopImmediatePropagation();
+
+        const password = $('#at-field-password').val();
+
+        if (user === undefined || user.authenticationMethod === 'ldap') {
+          // Use the ldap connection package
+          Meteor.loginWithLDAP(email, password, function(error) {
+            if (!error) {
+              logoutWithTimer(user._id);
+              // Connection
+              return FlowRouter.go('/');
+            }
+            return error;
+          });
+        }
+        return this.stop();
+      },
+    });
   },
 });