From 72e905675da64d403c2b9a5c51deb01d9084af85 Mon Sep 17 00:00:00 2001 From: guillaume Date: Wed, 19 Dec 2018 13:41:21 +0100 Subject: Removes the dropdown for the authentication method --- client/components/main/layouts.jade | 1 - client/components/main/layouts.js | 90 +++++++++++++++++-------------------- 2 files changed, 41 insertions(+), 50 deletions(-) (limited to 'client/components/main') diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index 55ee2686..1c22fee6 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -23,7 +23,6 @@ template(name="userFormsLayout") br 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 a50d167e..7c060ca5 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,30 @@ 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(); + + // Authentication with LDAP + if (authenticationMethod === 'ldap') { + // Use the ldap connection package + Meteor.loginWithLDAP(email, password, function(error) { + if (!error) { + return FlowRouter.go('/'); + } + return error; + }); + } + + return this.stop(); +} -- cgit v1.2.3-1-g7c22 From 1712368f6a1ec07bad2c1edb17ae480397e0f45f Mon Sep 17 00:00:00 2001 From: guillaume Date: Wed, 19 Dec 2018 17:21:27 +0100 Subject: Improves UI for ldap error messages --- client/components/main/layouts.js | 41 ++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) (limited to 'client/components/main') diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 7c060ca5..abc8f6e1 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -121,20 +121,35 @@ function authentication(instance, email, password) { return this.stop(); } - const authenticationMethod = user ? - user.authenticationMethod : - instance.data.defaultAuthenticationMethod.get(); - - // Authentication with LDAP - if (authenticationMethod === 'ldap') { - // Use the ldap connection package - Meteor.loginWithLDAP(email, password, function(error) { - if (!error) { - return FlowRouter.go('/'); - } - return error; - }); + 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('

'); + } + $('.at-error p').text(translated); +} \ No newline at end of file -- cgit v1.2.3-1-g7c22 From ff1c3722a87768378632e368bfe2c27cddd9ec23 Mon Sep 17 00:00:00 2001 From: guillaume Date: Wed, 19 Dec 2018 17:22:16 +0100 Subject: Patch currentBoard doesn't exist when logout --- client/components/main/editor.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'client/components/main') diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 20ece562..8ea73793 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -9,10 +9,12 @@ Template.editor.onRendered(() => { match: /\B@([\w.]*)$/, search(term, callback) { const currentBoard = Boards.findOne(Session.get('currentBoard')); - callback(currentBoard.activeMembers().map((member) => { - const username = Users.findOne(member.userId).username; - return username.includes(term) ? username : null; - }).filter(Boolean)); + if (currentBoard) { + callback(currentBoard.activeMembers().map((member) => { + const username = Users.findOne(member.userId).username; + return username.includes(term) ? username : null; + }).filter(Boolean)); + } }, template(value) { return value; @@ -37,6 +39,9 @@ const at = HTML.CharRef({html: '@', str: '@'}); Blaze.Template.registerHelper('mentions', new Template('mentions', function() { const view = this; const currentBoard = Boards.findOne(Session.get('currentBoard')); + if (!currentBoard) { + return HTML.Raw(""); + } const knowedUsers = currentBoard.members.map((member) => { const u = Users.findOne(member.userId); if(u){ -- cgit v1.2.3-1-g7c22 From 417dc9dc428db2fef14130d3de9a91e9efb1f717 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 21 Dec 2018 20:36:26 +0200 Subject: Fix lint errors. --- client/components/main/editor.js | 2 +- client/components/main/layouts.js | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'client/components/main') diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 8ea73793..152f69e2 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -40,7 +40,7 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() { const view = this; const currentBoard = Boards.findOne(Session.get('currentBoard')); if (!currentBoard) { - return HTML.Raw(""); + return HTML.Raw(''); } const knowedUsers = currentBoard.members.map((member) => { const u = Users.findOne(member.userId); diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index abc8f6e1..89dcca2d 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -126,16 +126,20 @@ function authentication(instance, email, password) { : instance.data.defaultAuthenticationMethod.get(); switch (authenticationMethod) { - case 'ldap': - // Use the ldap connection package - Meteor.loginWithLDAP(email, password, function(error) { - if (!error) return FlowRouter.go('/'); + case 'ldap': + // Use the ldap connection package + Meteor.loginWithLDAP(email, password, function(error) { + if (error) { displayError('error-ldap-login'); - }); - break; + return this.stop(); + } else { + return FlowRouter.go('/'); + } + }); + break; - default: - displayError('error-undefined'); + default: + displayError('error-undefined'); } return this.stop(); @@ -152,4 +156,4 @@ function displayError(code) { $('.at-pwd-form').before('

'); } $('.at-error p').text(translated); -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22