summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/components/main/layouts.jade1
-rw-r--r--client/components/main/layouts.js87
-rw-r--r--client/components/settings/connectionMethod.jade6
-rw-r--r--client/components/settings/connectionMethod.js34
4 files changed, 83 insertions, 45 deletions
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index ac7da3af..68876dc5 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -18,6 +18,7 @@ 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 9838354f..393f890b 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -6,13 +6,23 @@ const i18nTagToT9n = (i18nTag) => {
return i18nTag;
};
-Template.userFormsLayout.onCreated(function() {
- Meteor.call('getDefaultAuthenticationMethod', (error, result) => {
- this.data.defaultAuthenticationMethod = new ReactiveVar(error ? undefined : result);
- });
-});
+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));
@@ -71,14 +81,13 @@ Template.userFormsLayout.events({
}
});
},
- 'click #at-btn'(event, instance) {
+ '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 email = $('#at-field-username_and_email').val();
- const password = $('#at-field-password').val();
-
- if (FlowRouter.getRouteName() !== 'atSignIn' || password === '') {
+ const authenticationMethodSelected = $('.select-authentication').val();
+ // Local account
+ if (authenticationMethodSelected === 'password') {
return;
}
@@ -86,11 +95,29 @@ Template.userFormsLayout.events({
event.preventDefault();
event.stopImmediatePropagation();
- Meteor.subscribe('user-authenticationMethod', email, {
- onReady() {
- return authentication.call(this, instance, email, password);
- },
- });
+ 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();
+ },
+ });
+ }
},
});
@@ -99,33 +126,3 @@ 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();
-}
diff --git a/client/components/settings/connectionMethod.jade b/client/components/settings/connectionMethod.jade
new file mode 100644
index 00000000..ac4c8c64
--- /dev/null
+++ b/client/components/settings/connectionMethod.jade
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000..9fe8f382
--- /dev/null
+++ b/client/components/settings/connectionMethod.js
@@ -0,0 +1,34 @@
+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();
+ },
+});