summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguillaume <guillaume.cassou@supinfo.com>2018-11-09 17:46:02 +0100
committerguillaume <guillaume.cassou@supinfo.com>2018-11-09 17:46:02 +0100
commit893329d9c6d33aa5572e268e8f951400a2446303 (patch)
tree2ff09cdb61e14b1479f2fbe187bd6f2477ce5aff
parentcb091c8a54dc3b9b721a0474f4c821e0b451f3d6 (diff)
downloadwekan-893329d9c6d33aa5572e268e8f951400a2446303.tar.gz
wekan-893329d9c6d33aa5572e268e8f951400a2446303.tar.bz2
wekan-893329d9c6d33aa5572e268e8f951400a2446303.zip
patch authentication
-rw-r--r--client/components/main/layouts.js75
-rw-r--r--models/settings.js8
2 files changed, 54 insertions, 29 deletions
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
diff --git a/models/settings.js b/models/settings.js
index 35d71533..6c9f5a53 100644
--- a/models/settings.js
+++ b/models/settings.js
@@ -76,6 +76,7 @@ if (Meteor.isServer) {
}, createdAt: now, modifiedAt: now};
Settings.insert(defaultSetting);
}
+
const newSetting = Settings.findOne();
if (!process.env.MAIL_URL && newSetting.mailUrl())
process.env.MAIL_URL = newSetting.mailUrl();
@@ -235,6 +236,12 @@ if (Meteor.isServer) {
cas: isCasEnabled(),
};
},
+
+ getDefaultAuthenticationMethod() {
+ return process.env.DEFAULT_AUTHENTICATION_METHOD;
+ },
+
+ // TODO: patch error : did not check all arguments during call
logoutWithTimer(userId) {
if (process.env.LOGOUT_WITH_TIMER) {
Jobs.run('logOut', userId, {
@@ -257,6 +264,7 @@ if (Meteor.isServer) {
{_id: userId},
{$set: {'services.resume.loginTokens': []}}
);
+ this.success();
},
});
}