summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-12-24 18:18:41 +0200
committerLauri Ojansivu <x@xet7.org>2018-12-24 18:18:41 +0200
commitc502ab95009fc5814f1b96b45c6503313551578d (patch)
tree1f27c25b9d27755cd3ae0c3f5ace871f80c58c8d /client
parent425ae5542227ecbb8bae0acd62d553d64b4d893c (diff)
downloadwekan-c502ab95009fc5814f1b96b45c6503313551578d.tar.gz
wekan-c502ab95009fc5814f1b96b45c6503313551578d.tar.bz2
wekan-c502ab95009fc5814f1b96b45c6503313551578d.zip
- Revert "Improve authentication" and "Default Authentication Method"
to make login work again. - Fixes to docker-compose.yml so that Wekan Meteor 1.6.x version would work. Most likely Meteor 1.8.x version is still broken. Thanks to xet7 !
Diffstat (limited to 'client')
-rwxr-xr-xclient/components/main/editor.js13
-rw-r--r--client/components/main/layouts.jade1
-rw-r--r--client/components/main/layouts.js109
-rw-r--r--client/components/settings/connectionMethod.jade6
-rw-r--r--client/components/settings/connectionMethod.js34
5 files changed, 94 insertions, 69 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 152f69e2..20ece562 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -9,12 +9,10 @@ Template.editor.onRendered(() => {
match: /\B@([\w.]*)$/,
search(term, callback) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
- if (currentBoard) {
- callback(currentBoard.activeMembers().map((member) => {
- const username = Users.findOne(member.userId).username;
- return username.includes(term) ? username : null;
- }).filter(Boolean));
- }
+ callback(currentBoard.activeMembers().map((member) => {
+ const username = Users.findOne(member.userId).username;
+ return username.includes(term) ? username : null;
+ }).filter(Boolean));
},
template(value) {
return value;
@@ -39,9 +37,6 @@ const at = HTML.CharRef({html: '&commat;', 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){
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 1c22fee6..55ee2686 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -23,6 +23,7 @@ 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 89dcca2d..a50d167e 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -6,14 +6,29 @@ 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.onCreated(() => {
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));
@@ -86,11 +101,13 @@ Template.userFormsLayout.events({
}
});
},
- '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 === '') {
+ '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') {
return;
}
@@ -98,11 +115,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();
+ },
+ });
+ }
},
});
@@ -111,49 +146,3 @@ 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();
-
- switch (authenticationMethod) {
- case 'ldap':
- // Use the ldap connection package
- Meteor.loginWithLDAP(email, password, function(error) {
- if (error) {
- displayError('error-ldap-login');
- return this.stop();
- } else {
- return FlowRouter.go('/');
- }
- });
- 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('<div class="at-error"><p></p></div>');
- }
- $('.at-error p').text(translated);
-}
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();
+ },
+});