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

Thanks to xet7 !

7 files changed, 12 insertions, 12 deletions

diff --git a/packages/meteor-accounts-cas/cas_server.js b/packages/meteor-accounts-cas/cas_server.js
index e07052b0..2e8edef2 100644
--- a/packages/meteor-accounts-cas/cas_server.js
+++ b/packages/meteor-accounts-cas/cas_server.js
@@ -252,13 +252,13 @@ const casValidate = (req, ticket, token, service, callback) => {
   if (attrs.debug) {
     console.log(`CAS response : ${JSON.stringify(result)}`);
   }
-  let user = Users.findOne({ 'username': options.username });
+  let user = Meteor.users.findOne({ 'username': options.username });
   if (! user) {
     if (attrs.debug) {
       console.log(`Creating user account ${JSON.stringify(options)}`);
     }
     const userId = Accounts.insertUserDoc({}, options);
-    user = Users.findOne(userId);
+    user = Meteor.users.findOne(userId);
   }
   if (attrs.debug) {
     console.log(`Using user account ${JSON.stringify(user)}`);
diff --git a/packages/meteor-useraccounts-core/Guide.md b/packages/meteor-useraccounts-core/Guide.md
index 48499708..c84b3f8b 100644
--- a/packages/meteor-useraccounts-core/Guide.md
+++ b/packages/meteor-useraccounts-core/Guide.md
@@ -804,7 +804,7 @@ If, differently, you do something like this:
 if (Meteor.isServer){
     Meteor.methods({
         "userExists": function(username){
-            return !!Users.findOne({username: username});
+            return !!Meteor.users.findOne({username: username});
         },
     });
 }
diff --git a/packages/meteor-useraccounts-core/lib/methods.js b/packages/meteor-useraccounts-core/lib/methods.js
index 906edcaf..0d3a070d 100644
--- a/packages/meteor-useraccounts-core/lib/methods.js
+++ b/packages/meteor-useraccounts-core/lib/methods.js
@@ -10,7 +10,7 @@ Meteor.methods({
     var userId = this.userId;
 
     if (userId) {
-      var user = Users.findOne(userId);
+      var user = Meteor.users.findOne(userId);
       var numServices = _.keys(user.services).length; // including "resume"
       var unset = {};
 
diff --git a/packages/meteor-useraccounts-core/lib/server.js b/packages/meteor-useraccounts-core/lib/server.js
index 07f563bd..2a925dc7 100644
--- a/packages/meteor-useraccounts-core/lib/server.js
+++ b/packages/meteor-useraccounts-core/lib/server.js
@@ -80,7 +80,7 @@ AT.prototype._init = function() {
       return Meteor.users.find(userId, {fields: {services: 1}});
       /*
       if (userId) {
-        var user = Users.findOne(userId);
+        var user = Meteor.users.findOne(userId);
         var services_id = _.chain(user.services)
           .keys()
           .reject(function(service) {return service === "resume";})
diff --git a/packages/meteor-useraccounts-core/lib/server_methods.js b/packages/meteor-useraccounts-core/lib/server_methods.js
index 700c2eac..500440d7 100644
--- a/packages/meteor-useraccounts-core/lib/server_methods.js
+++ b/packages/meteor-useraccounts-core/lib/server_methods.js
@@ -124,7 +124,7 @@ Meteor.methods({
   ATResendVerificationEmail: function (email) {
     check(email, String);
 
-    var user = Users.findOne({ "emails.address": email });
+    var user = Meteor.users.findOne({ "emails.address": email });
 
     // Send the standard error back to the client if no user exist with this e-mail
     if (!user) {
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);
         }