github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Try to fix [LDAP Login: "Login forbidden", ReferenceError: req is not defined](https://github.com/wekan/wekan-ldap/issues/44).

Browse source 
Please test.

Thanks to xet7 !

Closes wekan/wekan-ldap#44
This commit is contained in:
Lauri Ojansivu 2019-03-14 00:25:40 +02:00
parent 8671f08a0e
commit 32f6de1eec
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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();

10
server/header-login.js Normal file
View file

@ -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;
}
});