summaryrefslogtreecommitdiffstats
path: root/sandstorm.js
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2020-06-18 02:00:51 +0300
committerLauri Ojansivu <x@xet7.org>2020-06-18 02:00:51 +0300
commit5eb378452761ad1d6d67a491316007fdf6dfd689 (patch)
treec6509dc8e69ae60db7703467bff12dd10fccd84c /sandstorm.js
parent0ff1e63a5d82d1fb3a6f0a0d994ac2c30cdb1c9f (diff)
downloadwekan-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 'sandstorm.js')
-rw-r--r--sandstorm.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/sandstorm.js b/sandstorm.js
index 34b1e507..de386d14 100644
--- a/sandstorm.js
+++ b/sandstorm.js
@@ -175,7 +175,7 @@ if (isSandstorm && Meteor.isServer) {
const users = {};
function ensureUserListed(userId) {
if (!users[userId]) {
- const user = Users.findOne(userId);
+ const user = Meteor.users.findOne(userId);
if (user) {
users[userId] = { id: user.services.sandstorm.id };
} else {
@@ -217,7 +217,7 @@ if (isSandstorm && Meteor.isServer) {
'userId',
);
(comment.text.match(/\B@([\w.]*)/g) || []).forEach(username => {
- const user = Users.findOne({
+ const user = Meteor.users.findOne({
username: username.slice(1),
});
if (user && activeMembers.indexOf(user._id) !== -1) {
@@ -368,7 +368,7 @@ if (isSandstorm && Meteor.isServer) {
if (newMethods[key].auth) {
newMethods[key].auth = function() {
const sandstormID = this.req.headers['x-sandstorm-user-id'];
- const user = Users.findOne({
+ const user = Meteor.users.findOne({
'services.sandstorm.id': sandstormID,
});
return user && user._id;