diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-06-18 02:00:51 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-06-18 02:00:51 +0300 |
commit | 5eb378452761ad1d6d67a491316007fdf6dfd689 (patch) | |
tree | c6509dc8e69ae60db7703467bff12dd10fccd84c /packages/wekan-ldap | |
parent | 0ff1e63a5d82d1fb3a6f0a0d994ac2c30cdb1c9f (diff) | |
download | wekan-5eb378452761ad1d6d67a491316007fdf6dfd689.tar.gz wekan-5eb378452761ad1d6d67a491316007fdf6dfd689.tar.bz2 wekan-5eb378452761ad1d6d67a491316007fdf6dfd689.zip |
Revert users changes that were made at Wekan v4.16.
Thanks to xet7 !
Diffstat (limited to 'packages/wekan-ldap')
-rw-r--r-- | packages/wekan-ldap/server/loginHandler.js | 6 | ||||
-rw-r--r-- | packages/wekan-ldap/server/sync.js | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/wekan-ldap/server/loginHandler.js b/packages/wekan-ldap/server/loginHandler.js index 6f8504c3..79b3899a 100644 --- a/packages/wekan-ldap/server/loginHandler.js +++ b/packages/wekan-ldap/server/loginHandler.js @@ -96,7 +96,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) { log_info('Querying user'); log_debug('userQuery', userQuery); - user = Users.findOne(userQuery); + user = Meteor.users.findOne(userQuery); } // Attempt to find user by username @@ -137,7 +137,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) { log_debug('userQuery', userQuery); - user = Users.findOne(userQuery); + user = Meteor.users.findOne(userQuery); } // Attempt to find user by e-mail address only @@ -159,7 +159,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) { log_debug('userQuery', userQuery); - user = Users.findOne(userQuery); + user = Meteor.users.findOne(userQuery); } diff --git a/packages/wekan-ldap/server/sync.js b/packages/wekan-ldap/server/sync.js index 5d0a9839..dd3855d3 100644 --- a/packages/wekan-ldap/server/sync.js +++ b/packages/wekan-ldap/server/sync.js @@ -234,7 +234,7 @@ export function syncUserData(user, ldapUser) { const username = slug(getLdapUsername(ldapUser)); if (user && user._id && username !== user.username) { log_info('Syncing user username', user.username, '->', username); - Users.findOne({ _id: user._id }, { $set: { username }}); + Meteor.users.findOne({ _id: user._id }, { $set: { username }}); } } @@ -341,7 +341,7 @@ export function importNewUsers(ldap) { } // Add user if it was not added before - let user = Users.findOne(userQuery); + let user = Meteor.users.findOne(userQuery); if (!user && username && LDAP.settings_get('LDAP_MERGE_EXISTING_USERS') === true) { const userQuery = { @@ -350,7 +350,7 @@ export function importNewUsers(ldap) { log_debug('userQuery merge', userQuery); - user = Users.findOne(userQuery); + user = Meteor.users.findOne(userQuery); if (user) { syncUserData(user, ldapUser); } |