From 8c497efb46d2193674fee2e0c9da8053c533e79e Mon Sep 17 00:00:00 2001 From: guillaume Date: Tue, 6 Nov 2018 11:28:35 +0100 Subject: patch authentication --- client/components/main/layouts.jade | 1 - client/components/main/layouts.js | 70 +++++++++--------------- client/components/settings/connectionMethod.jade | 6 -- client/components/settings/connectionMethod.js | 34 ------------ 4 files changed, 27 insertions(+), 84 deletions(-) delete mode 100644 client/components/settings/connectionMethod.jade delete mode 100644 client/components/settings/connectionMethod.js (limited to 'client') 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..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(); + }, + }); }, }); diff --git a/client/components/settings/connectionMethod.jade b/client/components/settings/connectionMethod.jade deleted file mode 100644 index ac4c8c64..00000000 --- a/client/components/settings/connectionMethod.jade +++ /dev/null @@ -1,6 +0,0 @@ -template(name='connectionMethod') - div.at-form-authentication - label {{_ 'authentication-method'}} - select.select-authentication - each authentications - option(value="{{value}}") {{_ value}} diff --git a/client/components/settings/connectionMethod.js b/client/components/settings/connectionMethod.js deleted file mode 100644 index 9fe8f382..00000000 --- a/client/components/settings/connectionMethod.js +++ /dev/null @@ -1,34 +0,0 @@ -Template.connectionMethod.onCreated(function() { - this.authenticationMethods = new ReactiveVar([]); - - Meteor.call('getAuthenticationsEnabled', (_, result) => { - if (result) { - // TODO : add a management of different languages - // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')}) - this.authenticationMethods.set([ - {value: 'password'}, - // Gets only the authentication methods availables - ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})), - ]); - } - - // If only the default authentication available, hides the select boxe - const content = $('.at-form-authentication'); - if (!(this.authenticationMethods.get().length > 1)) { - content.hide(); - } else { - content.show(); - } - }); -}); - -Template.connectionMethod.onRendered(() => { - // Moves the select boxe in the first place of the at-pwd-form div - $('.at-form-authentication').detach().prependTo('.at-pwd-form'); -}); - -Template.connectionMethod.helpers({ - authentications() { - return Template.instance().authenticationMethods.get(); - }, -}); -- cgit v1.2.3-1-g7c22 From 3646a9c259634bbed03b71ead53338c3f290cf0b Mon Sep 17 00:00:00 2001 From: guillaume Date: Tue, 6 Nov 2018 17:48:12 +0100 Subject: Logout with timer --- client/components/main/layouts.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'client') diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 18cc6cc4..3fda11b7 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -80,6 +80,7 @@ Template.userFormsLayout.events({ const user = Users.findOne(); if (user && user.authenticationMethod === 'password') { + logoutWithTimer(user._id); return this.stop(); } @@ -93,6 +94,7 @@ Template.userFormsLayout.events({ // Use the ldap connection package Meteor.loginWithLDAP(email, password, function(error) { if (!error) { + logoutWithTimer(user._id); // Connection return FlowRouter.go('/'); } -- cgit v1.2.3-1-g7c22 From 893329d9c6d33aa5572e268e8f951400a2446303 Mon Sep 17 00:00:00 2001 From: guillaume Date: Fri, 9 Nov 2018 17:46:02 +0100 Subject: patch authentication --- client/components/main/layouts.js | 75 ++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 29 deletions(-) (limited to 'client') diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 3fda11b7..52584169 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -6,6 +6,12 @@ const i18nTagToT9n = (i18nTag) => { return i18nTag; }; +Template.userFormsLayout.onCreated(function() { + Meteor.call('getDefaultAuthenticationMethod', (error, result) => { + this.data.defaultAuthenticationMethod = new ReactiveVar(error ? undefined : result); + }); +}); + Template.userFormsLayout.onRendered(() => { const i18nTag = navigator.language; if (i18nTag) { @@ -65,43 +71,24 @@ Template.userFormsLayout.events({ } }); }, - 'click #at-btn'(event) { + 'click #at-btn'(event, instance) { /* 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 !! */ - if (FlowRouter.getRouteName() !== 'atSignIn') { + const email = $('#at-field-username_and_email').val(); + const password = $('#at-field-password').val(); + + if (FlowRouter.getRouteName() !== 'atSignIn' || password === '') { return; } - const email = $('#at-field-username_and_email').val(); + // Stop submit #at-pwd-form + event.preventDefault(); + event.stopImmediatePropagation(); 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(); + onReady() { + return authentication.call(this, instance, email, password); }, }); }, @@ -112,3 +99,33 @@ Template.defaultLayout.events({ Modal.close(); }, }); + +function authentication(instance, email, password) { + let user = Users.findOne(); + // Authentication with password + if (user && user.authenticationMethod === 'password') { + $('#at-pwd-form').submit(); + // Meteor.call('logoutWithTimer', user._id, () => {}); + return this.stop(); + } + + // If user doesn't exist, uses the default authentication method if it defined + if (user === undefined) { + user = { + "authenticationMethod": instance.data.defaultAuthenticationMethod.get() + }; + } + + // Authentication with LDAP + if (user.authenticationMethod === 'ldap') { + // Use the ldap connection package + Meteor.loginWithLDAP(email, password, function(error) { + if (!error) { + // Meteor.call('logoutWithTimer', Users.findOne()._id, () => {}); + return FlowRouter.go('/'); + } + return error; + }); + } + return this.stop(); +} \ No newline at end of file -- cgit v1.2.3-1-g7c22 From 3aec8087f77acba9f4fdc686b26cb36542d37dfd Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 16 Nov 2018 21:32:01 +0200 Subject: Fix lint errors. --- client/components/main/layouts.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'client') diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 52584169..9838354f 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -87,7 +87,7 @@ Template.userFormsLayout.events({ event.stopImmediatePropagation(); Meteor.subscribe('user-authenticationMethod', email, { - onReady() { + onReady() { return authentication.call(this, instance, email, password); }, }); @@ -112,7 +112,7 @@ function authentication(instance, email, password) { // If user doesn't exist, uses the default authentication method if it defined if (user === undefined) { user = { - "authenticationMethod": instance.data.defaultAuthenticationMethod.get() + 'authenticationMethod': instance.data.defaultAuthenticationMethod.get(), }; } @@ -128,4 +128,4 @@ function authentication(instance, email, password) { }); } return this.stop(); -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22