From 908a570664d3b2e54358d1ba9828e50e82413e79 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Mon, 5 Feb 2018 10:45:51 +0900
Subject: [PATCH] Fix Intercom ID, fix withList context issue

---
 packages/vulcan-events-intercom/lib/server/intercom-server.js | 2 +-
 packages/vulcan-lib/lib/modules/collections.js                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/vulcan-events-intercom/lib/server/intercom-server.js b/packages/vulcan-events-intercom/lib/server/intercom-server.js
index a490ca895..8ae1ef9ed 100644
--- a/packages/vulcan-events-intercom/lib/server/intercom-server.js
+++ b/packages/vulcan-events-intercom/lib/server/intercom-server.js
@@ -28,10 +28,10 @@ if (!token) {
   function intercomNewUser(user) {
     intercomClient.users.create({
       email: user.email,
+      user_id: user._id,
       custom_attributes: {
         name: user.displayName,
         profileUrl: Users.getProfileUrl(user, true),
-        _id: user._id,
       }
     });
   }
diff --git a/packages/vulcan-lib/lib/modules/collections.js b/packages/vulcan-lib/lib/modules/collections.js
index ce60a8a27..fc728b107 100644
--- a/packages/vulcan-lib/lib/modules/collections.js
+++ b/packages/vulcan-lib/lib/modules/collections.js
@@ -261,7 +261,8 @@ export const createCollection = options => {
       parameters = runCallbacks(`${collectionName.toLowerCase()}.parameters.client`, parameters, _.clone(terms), apolloClient);
     }
 
-    if (Meteor.isServer) {
+    // note: check that context exists to avoid calling this from withList during SSR
+    if (Meteor.isServer && context) {
       parameters = runCallbacks(`${collectionName.toLowerCase()}.parameters.server`, parameters, _.clone(terms), context);
     }