summaryrefslogtreecommitdiffstats
path: root/client/components/main
diff options
context:
space:
mode:
authorguillaume <guillaume.cassou@supinfo.com>2018-11-22 18:00:21 +0100
committerguillaume <guillaume.cassou@supinfo.com>2018-11-22 18:00:21 +0100
commitf23448be3340c56f6fae85b19a52aecf55e4753b (patch)
tree0acea2f3c2286322c13a429c43baf5081b781326 /client/components/main
parenta27c16e434f413fe23279b2656b77649c4f202a9 (diff)
downloadwekan-f23448be3340c56f6fae85b19a52aecf55e4753b.tar.gz
wekan-f23448be3340c56f6fae85b19a52aecf55e4753b.tar.bz2
wekan-f23448be3340c56f6fae85b19a52aecf55e4753b.zip
revert changes for patch authentication
Diffstat (limited to 'client/components/main')
-rw-r--r--client/components/main/layouts.jade1
-rw-r--r--client/components/main/layouts.js89
2 files changed, 43 insertions, 47 deletions
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index e434eaba..969ec6a9 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 d4a9d6d1..c98eb6b9 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(() => {
Meteor.subscribe('setting');
-
+ Meteor.call('getDefaultAuthenticationMethod', (error, result) => {
+ this.data.defaultAuthenticationMethod = new ReactiveVar(error ? undefined : result);
+ });
});
Template.userFormsLayout.onRendered(() => {
-
- AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator);
-
const i18nTag = navigator.language;
if (i18nTag) {
T9n.setLanguage(i18nTagToT9n(i18nTag));
@@ -37,7 +22,6 @@ Template.userFormsLayout.onRendered(() => {
});
Template.userFormsLayout.helpers({
-
currentSetting() {
return Settings.findOne();
},
@@ -92,13 +76,14 @@ 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 !!
*/
- const authenticationMethodSelected = $('.select-authentication').val();
- // Local account
- if (authenticationMethodSelected === 'password') {
+ const email = $('#at-field-username_and_email').val();
+ const password = $('#at-field-password').val();
+
+ if (FlowRouter.getRouteName() !== 'atSignIn' || password === '') {
return;
}
@@ -106,29 +91,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);
+ },
+ });
},
});
@@ -137,3 +104,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();
+}