diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-12-21 19:34:32 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-12-21 19:34:32 +0200 |
commit | a261c66f34726f5b6ddaffca82a80afb01f0d450 (patch) | |
tree | 9cb23fe8b6f0d8ef583a8a3e1e28a29230e5b91c /client/components/main/layouts.js | |
parent | ac6f8e85519da2b7eabcec6e598c96b5fb9a2cfa (diff) | |
parent | ff1c3722a87768378632e368bfe2c27cddd9ec23 (diff) | |
download | wekan-a261c66f34726f5b6ddaffca82a80afb01f0d450.tar.gz wekan-a261c66f34726f5b6ddaffca82a80afb01f0d450.tar.bz2 wekan-a261c66f34726f5b6ddaffca82a80afb01f0d450.zip |
Merge branch 'devel' of https://github.com/Akuket/wekan into Akuket-devel
Diffstat (limited to 'client/components/main/layouts.js')
-rw-r--r-- | client/components/main/layouts.js | 105 |
1 files changed, 56 insertions, 49 deletions
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index a50d167e..abc8f6e1 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -6,29 +6,14 @@ 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.onCreated(() => { +Template.userFormsLayout.onCreated(function() { + Meteor.call('getDefaultAuthenticationMethod', (error, result) => { + this.data.defaultAuthenticationMethod = new ReactiveVar(error ? undefined : result); + }); Meteor.subscribe('setting'); - }); Template.userFormsLayout.onRendered(() => { - - AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator); - const i18nTag = navigator.language; if (i18nTag) { T9n.setLanguage(i18nTagToT9n(i18nTag)); @@ -101,13 +86,11 @@ Template.userFormsLayout.events({ } }); }, - 'click #at-btn'(event) { - /* 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') { + 'click #at-btn'(event, instance) { + const email = $('#at-field-username_and_email').val(); + const password = $('#at-field-password').val(); + + if (FlowRouter.getRouteName() !== 'atSignIn' || password === '' || email === '') { return; } @@ -115,29 +98,11 @@ Template.userFormsLayout.events({ 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; - }); - } - return this.stop(); - }, - }); - } + Meteor.subscribe('user-authenticationMethod', email, { + onReady() { + return authentication.call(this, instance, email, password); + }, + }); }, }); @@ -146,3 +111,45 @@ Template.defaultLayout.events({ Modal.close(); }, }); + +function authentication(instance, email, password) { + const user = Users.findOne(); + + // Authentication with password + if (user && user.authenticationMethod === 'password') { + $('#at-pwd-form').submit(); + return this.stop(); + } + + const authenticationMethod = user + ? user.authenticationMethod + : instance.data.defaultAuthenticationMethod.get(); + + switch (authenticationMethod) { + case 'ldap': + // Use the ldap connection package + Meteor.loginWithLDAP(email, password, function(error) { + if (!error) return FlowRouter.go('/'); + displayError('error-ldap-login'); + }); + break; + + default: + displayError('error-undefined'); + } + + return this.stop(); +} + +function displayError(code) { + const translated = TAPi18n.__(code); + + if (translated === code) { + return; + } + + if(!$('.at-error').length) { + $('.at-pwd-form').before('<div class="at-error"><p></p></div>'); + } + $('.at-error p').text(translated); +}
\ No newline at end of file |