Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Revert users changes that were made at Wekan v4.16.

Browse source 
Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2020-06-18 02:00:51 +03:00
parent 0ff1e63a5d
commit 5eb3784527
11 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/wekan-ldap/server/loginHandler.js
View file

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

6
packages/wekan-ldap/server/sync.js
View file

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