From f8ef8507b5620cee6df73d1cd38df72d18db48e6 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 13 Dec 2018 14:27:34 +0200 Subject: - Fix [Cannot login with new LDAP account when auto-registration disabled (request invitation code)](https://github.com/wekan/wekan-ldap/issues/29); - Fix [Unable to create new account from LDAP](https://github.com/wekan/wekan-ldap/issues/32). Thanks to Akuket ! Closes wekan/wekan-ldap#29, closes wekan/wekan-ldap#32 --- models/users.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/models/users.js b/models/users.js index 2e879d94..90ae8bf6 100644 --- a/models/users.js +++ b/models/users.js @@ -520,10 +520,14 @@ if (Meteor.isServer) { } const disableRegistration = Settings.findOne().disableRegistration; + // If this is the first Authentication by the ldap and self registration disabled + if (disableRegistration && options.ldap) { + user.authenticationMethod = 'ldap'; + return user; + } + + // If self registration enabled if (!disableRegistration) { - if (options.ldap) { - user.authenticationMethod = 'ldap'; - } return user; } -- cgit v1.2.3-1-g7c22