Merge branch 'devel' into edge

This commit is contained in:
Lauri Ojansivu 2019-02-27 16:26:48 +02:00
commit 4a77bc930f
14 changed files with 180 additions and 170 deletions

View file

@ -595,7 +595,7 @@ if (Meteor.isServer) {
});
Accounts.onCreateUser((options, user) => {
const userCount = Users.find().count();
if (!isSandstorm && userCount === 0) {
if (userCount === 0) {
user.isAdmin = true;
return user;
}
@ -711,7 +711,7 @@ if (Meteor.isServer) {
CollectionHooks.getUserId = () => {
return fakeUserId.get() || getUserId();
};
/*
if (!isSandstorm) {
Users.after.insert((userId, doc) => {
const fakeUser = {
@ -786,6 +786,7 @@ if (Meteor.isServer) {
});
});
}
*/
Users.after.insert((userId, doc) => {