Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-11 18:54:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'edge' into meteor-1.8

Browse source
This commit is contained in:
Lauri Ojansivu 2019-03-15 11:09:21 +02:00
commit 393684fb19
6 changed files with 356 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/components/main/layouts.js
View file

@ -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':