summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-03-15 10:59:54 +0200
committerLauri Ojansivu <x@xet7.org>2019-03-15 10:59:54 +0200
commit216b3cfe0121aa026139536c383aa27db0353411 (patch)
treede452fa51e65e5944c42709ce1f6c764faa20b42 /client
parentfd70556c82455df12db4d18ead6474da71928faf (diff)
downloadwekan-216b3cfe0121aa026139536c383aa27db0353411.tar.gz
wekan-216b3cfe0121aa026139536c383aa27db0353411.tar.bz2
wekan-216b3cfe0121aa026139536c383aa27db0353411.zip
Fix LDAP login.
Thanks to xet7 ! Closes wekan/wekan-ldap#43, closes wekan/wekan-snap#85
Diffstat (limited to 'client')
-rw-r--r--client/components/main/layouts.js19
1 files changed, 5 insertions, 14 deletions
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index d5b59b5f..6f7c914a 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -101,14 +101,8 @@ Template.defaultLayout.events({
});
async function authentication(event, instance) {
-
- // If header login id is set, use it for login.
- // Header username = Email address
- // Header password = Login ID
- // Not user currently: request.headers[Meteor.settings.public.headerLoginFirstname]
- // and request.headers[Meteor.settings.public.headerLoginLastname]
- const match = request.headers[Meteor.settings.public.headerLoginEmail] || $('#at-field-username_and_email').val();
- const password = request.headers[Meteor.settings.public.headerLoginId] || $('#at-field-password').val();
+ const match = $('#at-field-username_and_email').val();
+ const password = $('#at-field-password').val();
if (!match || !password) return;
@@ -116,12 +110,9 @@ async function authentication(event, instance) {
if (result === 'password') return;
- // If header login id is not set, don't try to login automatically.
- if (!Meteor.settings.public.headerLoginId) {
- // Stop submit #at-pwd-form
- event.preventDefault();
- event.stopImmediatePropagation();
- }
+ // Stop submit #at-pwd-form
+ event.preventDefault();
+ event.stopImmediatePropagation();
switch (result) {
case 'ldap':