diff options
author | guillaume <guillaume.cassou@orange.fr> | 2018-11-06 11:28:35 +0100 |
---|---|---|
committer | guillaume <guillaume.cassou@orange.fr> | 2018-11-06 11:28:35 +0100 |
commit | 8c497efb46d2193674fee2e0c9da8053c533e79e (patch) | |
tree | 8cdecaa81ecf2f58f37317baba154bd02c4fbf6c /client/components/main/layouts.js | |
parent | 6f2275e8cb286cdf9dab3fee7f19b134eab70ca6 (diff) | |
download | wekan-8c497efb46d2193674fee2e0c9da8053c533e79e.tar.gz wekan-8c497efb46d2193674fee2e0c9da8053c533e79e.tar.bz2 wekan-8c497efb46d2193674fee2e0c9da8053c533e79e.zip |
patch authentication
Diffstat (limited to 'client/components/main/layouts.js')
-rw-r--r-- | client/components/main/layouts.js | 70 |
1 files changed, 27 insertions, 43 deletions
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 393f890b..18cc6cc4 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,39 @@ 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') { 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) { + // Connection + return FlowRouter.go('/'); + } + return error; + }); + } + return this.stop(); + }, + }); }, }); |