From 32f6de1eecfc6d93e7997da383d12db6c0ab2cd4 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 14 Mar 2019 00:25:40 +0200 Subject: Try to fix [LDAP Login: "Login forbidden", ReferenceError: req is not defined](https://github.com/wekan/wekan-ldap/issues/44). Please test. Thanks to xet7 ! Closes wekan/wekan-ldap#44 --- client/components/main/layouts.js | 10 +++++----- server/header-login.js | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 server/header-login.js diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 4305de7c..d5b59b5f 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -105,10 +105,10 @@ 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: req.headers[process.env.HEADER_LOGIN_FIRSTNAME] - // and req.headers[process.env.HEADER_LOGIN_LASTNAME] - const match = req.headers[process.env.HEADER_LOGIN_EMAIL] || $('#at-field-username_and_email').val(); - const password = req.headers[process.env.HEADER_LOGIN_ID] || $('#at-field-password').val(); + // 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(); if (!match || !password) return; @@ -117,7 +117,7 @@ async function authentication(event, instance) { if (result === 'password') return; // If header login id is not set, don't try to login automatically. - if (!process.env.HEADER_LOGIN_ID) { + if (!Meteor.settings.public.headerLoginId) { // Stop submit #at-pwd-form event.preventDefault(); event.stopImmediatePropagation(); diff --git a/server/header-login.js b/server/header-login.js new file mode 100644 index 00000000..51144c2d --- /dev/null +++ b/server/header-login.js @@ -0,0 +1,10 @@ +Meteor.startup(() => { + + if ( process.env.HEADER_LOGIN_ID ) { + Meteor.settings.public.headerLoginId = process.env.HEADER_LOGIN_ID; + Meteor.settings.public.headerLoginEmail = process.env.HEADER_LOGIN_EMAIL; + Meteor.settings.public.headerLoginFirstname = process.env.HEADER_LOGIN_FIRSTNAME; + Meteor.settings.public.headerLoginLastname = process.env.HEADER_LOGIN_LASTNAME; + } + +}); -- cgit v1.2.3-1-g7c22