From 9e90679a8e3f31a779a63abb99088cb38794dfaa Mon Sep 17 00:00:00 2001
From: Luca Hagel <hagel.luca@gmail.com>
Date: Tue, 10 Oct 2017 06:45:17 +0200
Subject: [PATCH 01/69] bump react-bootstrap -> 0.31.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8781f530e..e44376c86 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "react": "^15.6.1",
     "react-addons-pure-render-mixin": "^15.4.1",
     "react-apollo": "^1.1.1",
-    "react-bootstrap": "^0.30.7",
+    "react-bootstrap": "^0.31.3",
     "react-bootstrap-datetimepicker": "0.0.22",
     "react-cookie": "^0.4.6",
     "react-datetime": "^2.3.2",

From 48ad632bf337f0b82a3d9e3c3b2a5086396f044e Mon Sep 17 00:00:00 2001
From: Al Pagan <generamics@gmail.com>
Date: Fri, 13 Oct 2017 14:20:20 +0100
Subject: [PATCH 02/69] Add callbacks to vulcan:routing SSR hooks

This method allows for access to the SSR app component and associated css in the routing's hook functions without needing to hack core files.

This makes it possible, for example, to add MUI wrapper components and inject compiled css with the JSS library (see https://material-ui-1dab0.firebaseapp.com/guides/server-rendering).

Here's how I'd implement the callbacks in my own custom module: https://gist.github.com/wayfarerboy/96c0f1d13b3b7d3d2743501a1c7c0187
---
 packages/vulcan-routing/lib/server/routing.jsx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/vulcan-routing/lib/server/routing.jsx b/packages/vulcan-routing/lib/server/routing.jsx
index ef24021de..9b39929aa 100644
--- a/packages/vulcan-routing/lib/server/routing.jsx
+++ b/packages/vulcan-routing/lib/server/routing.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import Helmet from 'react-helmet';
 import { getDataFromTree, ApolloProvider } from 'react-apollo';
-// import styleSheet from 'styled-components/lib/models/StyleSheet';
 
 import { Meteor } from 'meteor/meteor';
 
@@ -10,7 +9,7 @@ import {
   addRoute,
   Routes, populateComponentsApp, populateRoutesApp, initializeFragments,
   getRenderContext,
-  dynamicLoader,
+  runCallbacks,
 } from 'meteor/vulcan:lib';
 
 import { RouterServer } from './router.jsx';
@@ -42,30 +41,30 @@ Meteor.startup(() => {
 
   const options = {
     historyHook(req, res, newHistory) {
-      const { history } = getRenderContext();
+      let { history } = getRenderContext();
+      history = runCallbacks('router.server.history', history, { req, res, newHistory });
       return history;
     },
     wrapperHook(req, res, appGenerator) {
       const { apolloClient, store } = getRenderContext();
       store.reload();
       store.dispatch({ type: '@@nova/INIT' }) // the first dispatch will generate a newDispatch function from middleware
-      const app = appGenerator();
+      const app = runCallbacks('router.server.wrapper', appGenerator(), { req, res, store, apolloClient });
       return <ApolloProvider store={store} client={apolloClient}>{app}</ApolloProvider>;
     },
     preRender(req, res, app) {
+      runCallbacks('router.server.preRender', { req, res, app });
       return Promise.await(getDataFromTree(app));
     },
     dehydrateHook(req, res) {
-      const context = getRenderContext();
+      const context = runCallbacks('router.server.dehydrate', getRenderContext(), { req, res });
       return context.apolloClient.store.getState();
     },
     postRender(req, res) {
-      // req.css = styleSheet.sheet ? styleSheet.rules().map(rule => rule.cssText).join('\n') : '';
-      // const context = renderContext.get();
-      // context.css = req.css;
+      runCallbacks('router.server.postRender', { req, res });
     },
     htmlHook(req, res, dynamicHead, dynamicBody) {
-      const head = Helmet.rewind();
+      const head = runCallbacks('router.server.html', Helmet.rewind(), { req, res, dynamicHead, dynamicBody });
       return {
         dynamicHead: `${head.title}${head.meta}${head.link}${head.script}${dynamicHead}`,
         dynamicBody,

From 1c0635db658053d9ae87f708f489905b865dbb28 Mon Sep 17 00:00:00 2001
From: Al Pagan <generamics@gmail.com>
Date: Fri, 13 Oct 2017 14:25:35 +0100
Subject: [PATCH 03/69] Add callbacks to vulcan:routing SSR hooks

This method allows for access to the SSR app component and associated css in the routing's hook functions without needing to hack core files.

This makes it possible, for example, to add MUI wrapper components and inject compiled css with the JSS library (see https://material-ui-1dab0.firebaseapp.com/guides/server-rendering).

Here's how I'd implement the callbacks in my own custom module: https://gist.github.com/wayfarerboy/96c0f1d13b3b7d3d2743501a1c7c0187
---
 packages/vulcan-routing/lib/client/routing.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/vulcan-routing/lib/client/routing.jsx b/packages/vulcan-routing/lib/client/routing.jsx
index 5d5639d1f..98d8166c2 100644
--- a/packages/vulcan-routing/lib/client/routing.jsx
+++ b/packages/vulcan-routing/lib/client/routing.jsx
@@ -8,10 +8,8 @@ import { Meteor } from 'meteor/meteor';
 import {
   Components,
   addRoute,
-  addReducer, addMiddleware,
   Routes, populateComponentsApp, populateRoutesApp, runCallbacks, initializeFragments,
   getRenderContext,
-  dynamicLoader,
 } from 'meteor/vulcan:lib';
 
 import { RouterClient } from './router.jsx';
@@ -53,14 +51,16 @@ Meteor.startup(() => {
       context.addReducer({ apollo: apolloClientReducer });
       context.store.reload();
       context.store.dispatch({ type: '@@nova/INIT' }) // the first dispatch will generate a newDispatch function from middleware
+      runCallbacks('router.client.rehydrate', { initialState, store: context.store});
     },
     historyHook(newHistory) {
-      const { history } = getRenderContext();
+      let { history } = getRenderContext();
+      history = runCallbacks('router.client.history', history, { newHistory });
       return history;
     },
     wrapperHook(appGenerator) {
       const { apolloClient, store } = getRenderContext();
-      const app = appGenerator({
+      const app = runCallbacks('router.client.wrapper', appGenerator({
         onUpdate: () => {
           // the first argument is an item to iterate on, needed by vulcan:lib/callbacks
           // note: this item is not used in this specific callback: router.onUpdate
@@ -70,7 +70,7 @@ Meteor.startup(() => {
           // if the action is REPLACE, return false so that we don't jump back to top of page
           return !(nextRouterProps.location.action === 'REPLACE');
         }))
-      });
+      }));
       return <ApolloProvider store={store} client={apolloClient}>{app}</ApolloProvider>;
     },
   };

From 2144ce8a87dae9fce42d1d007d15fb65286181b9 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Sat, 14 Oct 2017 11:04:26 +0900
Subject: [PATCH 04/69] Add share URLs to post schema

---
 .../example-forum/lib/modules/posts/schema.js | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/packages/example-forum/lib/modules/posts/schema.js b/packages/example-forum/lib/modules/posts/schema.js
index 0d31ed1ec..d106bcdef 100644
--- a/packages/example-forum/lib/modules/posts/schema.js
+++ b/packages/example-forum/lib/modules/posts/schema.js
@@ -403,6 +403,39 @@ const schema = {
       }
   },
 
+  emailShareUrl: {
+    type: String,
+    optional: true,
+    resolveAs: {
+      type: 'String',
+      resolver: (post) => {
+        return Posts.getEmailShareUrl(post);
+      }
+    }
+  },
+
+  twitterShareUrl: {
+    type: String,
+    optional: true,
+    resolveAs: {
+      type: 'String',
+      resolver: (post) => {
+        return Posts.getTwitterShareUrl(post);
+      }
+    }
+  },
+
+  facebookShareUrl: {
+    type: String,
+    optional: true,
+    resolveAs: {
+      type: 'String',
+      resolver: (post) => {
+        return Posts.getFacebookShareUrl(post);
+      }
+    }
+  },
+  
 };
 
 export default schema;

From 0af5e365d30fa225bf3fbc270e016b63a13249ba Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Sat, 14 Oct 2017 11:05:36 +0900
Subject: [PATCH 05/69] Add new HeadComponent to make it easier to add
 permanent head tags

---
 packages/vulcan-core/lib/modules/components/App.jsx       | 1 +
 .../vulcan-core/lib/modules/components/HeadComponent.jsx  | 8 ++++++++
 packages/vulcan-core/lib/modules/index.js                 | 1 +
 3 files changed, 10 insertions(+)
 create mode 100644 packages/vulcan-core/lib/modules/components/HeadComponent.jsx

diff --git a/packages/vulcan-core/lib/modules/components/App.jsx b/packages/vulcan-core/lib/modules/components/App.jsx
index 803b89d35..f12132518 100644
--- a/packages/vulcan-core/lib/modules/components/App.jsx
+++ b/packages/vulcan-core/lib/modules/components/App.jsx
@@ -29,6 +29,7 @@ class App extends PureComponent {
       <IntlProvider locale={this.getLocale()} messages={Strings[this.getLocale()]}>
         <div>
           <Components.HeadTags />
+          <Components.HeadComponent />
           <LayoutComponent {...this.props} currentRoute={currentRoute}>
             { this.props.currentUserLoading ? <Components.Loading /> : (this.props.children ? this.props.children : <Components.Welcome />) }
           </LayoutComponent>
diff --git a/packages/vulcan-core/lib/modules/components/HeadComponent.jsx b/packages/vulcan-core/lib/modules/components/HeadComponent.jsx
new file mode 100644
index 000000000..39c3057c3
--- /dev/null
+++ b/packages/vulcan-core/lib/modules/components/HeadComponent.jsx
@@ -0,0 +1,8 @@
+import { registerComponent } from 'meteor/vulcan:lib';
+import React from 'react';
+
+const HeadComponent = () => null;
+
+HeadComponent.displayName = 'HeadComponent';
+
+registerComponent('HeadComponent', HeadComponent);
diff --git a/packages/vulcan-core/lib/modules/index.js b/packages/vulcan-core/lib/modules/index.js
index 9c4f9dac3..945423d2a 100644
--- a/packages/vulcan-core/lib/modules/index.js
+++ b/packages/vulcan-core/lib/modules/index.js
@@ -14,6 +14,7 @@ export { default as ShowIf } from "./components/ShowIf.jsx";
 export { default as ModalTrigger } from './components/ModalTrigger.jsx';
 export { default as Error404 } from './components/Error404.jsx';
 export { default as DynamicLoading } from './components/DynamicLoading.jsx';
+export { default as HeadComponent } from './components/HeadComponent.jsx';
 export { default as HeadTags } from './components/HeadTags.jsx';
 export { default as Avatar } from './components/Avatar.jsx';
 export { default as Card } from './components/Card.jsx';

From f5c2d21274fbbe8143b6aa893ee27641676ab67f Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Sat, 14 Oct 2017 11:06:25 +0900
Subject: [PATCH 06/69] Small fixes; Default newsletter to *not* be
 automatically sent out

---
 packages/vulcan-core/lib/modules/default_resolvers.js | 5 +++--
 packages/vulcan-newsletter/lib/server/cron.js         | 2 +-
 packages/vulcan-subscribe/package.js                  | 1 -
 packages/vulcan-users/lib/fragments.js                | 1 +
 packages/vulcan-voting/package.js                     | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/vulcan-core/lib/modules/default_resolvers.js b/packages/vulcan-core/lib/modules/default_resolvers.js
index 3e2232b9f..045ea24b7 100644
--- a/packages/vulcan-core/lib/modules/default_resolvers.js
+++ b/packages/vulcan-core/lib/modules/default_resolvers.js
@@ -74,11 +74,12 @@ export const getDefaultResolvers = collectionName => ({
         Utils.performCheck(collection.checkAccess, currentUser, doc, collection, documentId);
       }
 
+      const restrictedDoc = Users.restrictViewableFields(currentUser, collection, doc);
+
       debug(`//--------------- end ${collectionName} single resolver ---------------//`);
 
-
       // filter out disallowed properties and return resulting document
-      return Users.restrictViewableFields(currentUser, collection, doc);
+      return restrictedDoc;
     },
   
   },
diff --git a/packages/vulcan-newsletter/lib/server/cron.js b/packages/vulcan-newsletter/lib/server/cron.js
index 14342c3b3..c6997c5c3 100644
--- a/packages/vulcan-newsletter/lib/server/cron.js
+++ b/packages/vulcan-newsletter/lib/server/cron.js
@@ -76,7 +76,7 @@ var addJob = function () {
 };
 
 Meteor.startup(function () {
-  if (getSetting('newsletter.enabled', true)) {
+  if (getSetting('newsletter.enabled', false)) {
     addJob();
   }
 });
diff --git a/packages/vulcan-subscribe/package.js b/packages/vulcan-subscribe/package.js
index 55b84bbac..c99f4a8f2 100644
--- a/packages/vulcan-subscribe/package.js
+++ b/packages/vulcan-subscribe/package.js
@@ -12,7 +12,6 @@ Package.onUse(function (api) {
 
   api.use([
     'vulcan:core@1.8.0',
-    'vulcan:notifications@1.8.0',
     // dependencies on posts, categories are done with nested imports to reduce explicit dependencies
   ]);
   
diff --git a/packages/vulcan-users/lib/fragments.js b/packages/vulcan-users/lib/fragments.js
index 9026da738..bd6922271 100644
--- a/packages/vulcan-users/lib/fragments.js
+++ b/packages/vulcan-users/lib/fragments.js
@@ -16,5 +16,6 @@ registerFragment(`
     groups
     services
     avatarUrl
+    pageUrl
   }
 `);
diff --git a/packages/vulcan-voting/package.js b/packages/vulcan-voting/package.js
index ade8efbc6..b1590ab5d 100644
--- a/packages/vulcan-voting/package.js
+++ b/packages/vulcan-voting/package.js
@@ -10,7 +10,7 @@ Package.onUse(function (api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'fourseven:scss',
+    'fourseven:scss@4.5.0',
     'vulcan:core@1.8.0',
     'vulcan:i18n@1.8.0',
   ], ['client', 'server']);

From 8f05de2a2ec49d1993f65eb8f48acde163f1b188 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Tue, 17 Oct 2017 08:58:58 +0900
Subject: [PATCH 07/69] Update Vulcan version in package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8781f530e..5e5c4c948 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Vulcan",
-  "version": "1.2.0",
+  "version": "1.8.0",
   "engines": {
     "npm": "^3.0"
   },

From 5d444df3a57d776a31cbf3e51ac07f93184deb0d Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Tue, 17 Oct 2017 10:26:38 +0900
Subject: [PATCH 08/69] Enable adding components to HeadTags outside of Helmet

---
 packages/vulcan-core/lib/modules/components/App.jsx |  1 -
 .../lib/modules/components/HeadComponent.jsx        |  8 --------
 .../vulcan-core/lib/modules/components/HeadTags.jsx | 13 +++++++++++++
 packages/vulcan-core/lib/modules/index.js           |  1 -
 packages/vulcan-lib/lib/modules/headtags.js         |  1 +
 5 files changed, 14 insertions(+), 10 deletions(-)
 delete mode 100644 packages/vulcan-core/lib/modules/components/HeadComponent.jsx

diff --git a/packages/vulcan-core/lib/modules/components/App.jsx b/packages/vulcan-core/lib/modules/components/App.jsx
index f12132518..803b89d35 100644
--- a/packages/vulcan-core/lib/modules/components/App.jsx
+++ b/packages/vulcan-core/lib/modules/components/App.jsx
@@ -29,7 +29,6 @@ class App extends PureComponent {
       <IntlProvider locale={this.getLocale()} messages={Strings[this.getLocale()]}>
         <div>
           <Components.HeadTags />
-          <Components.HeadComponent />
           <LayoutComponent {...this.props} currentRoute={currentRoute}>
             { this.props.currentUserLoading ? <Components.Loading /> : (this.props.children ? this.props.children : <Components.Welcome />) }
           </LayoutComponent>
diff --git a/packages/vulcan-core/lib/modules/components/HeadComponent.jsx b/packages/vulcan-core/lib/modules/components/HeadComponent.jsx
deleted file mode 100644
index 39c3057c3..000000000
--- a/packages/vulcan-core/lib/modules/components/HeadComponent.jsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { registerComponent } from 'meteor/vulcan:lib';
-import React from 'react';
-
-const HeadComponent = () => null;
-
-HeadComponent.displayName = 'HeadComponent';
-
-registerComponent('HeadComponent', HeadComponent);
diff --git a/packages/vulcan-core/lib/modules/components/HeadTags.jsx b/packages/vulcan-core/lib/modules/components/HeadTags.jsx
index 2cb5764cc..431e44c95 100644
--- a/packages/vulcan-core/lib/modules/components/HeadTags.jsx
+++ b/packages/vulcan-core/lib/modules/components/HeadTags.jsx
@@ -2,6 +2,7 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
 import { registerComponent, Utils, getSetting, registerSetting, Head } from 'meteor/vulcan:lib';
+import { compose } from 'react-apollo';
 
 registerSetting('logoUrl', null, 'Absolute URL for the logo image');
 registerSetting('title', 'My App', 'App title');
@@ -61,6 +62,18 @@ class HeadTags extends PureComponent {
           {Head.script.map((tag, index) => <script key={index} {...tag}/>)}
 
         </Helmet>
+
+        {Head.components.map((componentOrArray, index) => {
+          let HeadComponent;
+          if (Array.isArray(componentOrArray)) {
+            const [component, ...hocs] = componentOrArray;
+            HeadComponent = compose(...hocs)(component);
+          } else {
+            HeadComponent = componentOrArray;
+          }
+          return <HeadComponent key={index} />
+        })}
+        
       </div>
     );
   }
diff --git a/packages/vulcan-core/lib/modules/index.js b/packages/vulcan-core/lib/modules/index.js
index 945423d2a..9c4f9dac3 100644
--- a/packages/vulcan-core/lib/modules/index.js
+++ b/packages/vulcan-core/lib/modules/index.js
@@ -14,7 +14,6 @@ export { default as ShowIf } from "./components/ShowIf.jsx";
 export { default as ModalTrigger } from './components/ModalTrigger.jsx';
 export { default as Error404 } from './components/Error404.jsx';
 export { default as DynamicLoading } from './components/DynamicLoading.jsx';
-export { default as HeadComponent } from './components/HeadComponent.jsx';
 export { default as HeadTags } from './components/HeadTags.jsx';
 export { default as Avatar } from './components/Avatar.jsx';
 export { default as Card } from './components/Card.jsx';
diff --git a/packages/vulcan-lib/lib/modules/headtags.js b/packages/vulcan-lib/lib/modules/headtags.js
index 9a2622359..18348d49c 100644
--- a/packages/vulcan-lib/lib/modules/headtags.js
+++ b/packages/vulcan-lib/lib/modules/headtags.js
@@ -2,6 +2,7 @@ export const Head = {
   meta: [],
   link: [],
   script: [],
+  components: [],
 }
 
 export const removeFromHeadTags = (type, name)=>{

From d81279385126937701a64142e3b5042c4f9baa3a Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Tue, 17 Oct 2017 10:27:40 +0900
Subject: [PATCH 09/69] Simple Intercom package

---
 packages/vulcan-intercom/README.md            | 21 +++++++++++++++++
 .../vulcan-intercom/lib/client/intercom.js    | 23 +++++++++++++++++++
 packages/vulcan-intercom/lib/client/main.js   |  3 +++
 packages/vulcan-intercom/lib/modules/index.js |  0
 packages/vulcan-intercom/lib/server/main.js   |  1 +
 packages/vulcan-intercom/package.js           | 19 +++++++++++++++
 6 files changed, 67 insertions(+)
 create mode 100644 packages/vulcan-intercom/README.md
 create mode 100644 packages/vulcan-intercom/lib/client/intercom.js
 create mode 100644 packages/vulcan-intercom/lib/client/main.js
 create mode 100644 packages/vulcan-intercom/lib/modules/index.js
 create mode 100644 packages/vulcan-intercom/lib/server/main.js
 create mode 100644 packages/vulcan-intercom/package.js

diff --git a/packages/vulcan-intercom/README.md b/packages/vulcan-intercom/README.md
new file mode 100644
index 000000000..128e4c4dc
--- /dev/null
+++ b/packages/vulcan-intercom/README.md
@@ -0,0 +1,21 @@
+Intercom package.
+
+### Settings
+
+```
+{
+  "public": {
+
+    "intercom": {
+      "appId": "123foo"
+    }
+
+  },
+  
+  "intercom": {
+    "accessToken": "456bar"
+  }
+}
+```
+
+Requires installing the [react-intercom](https://github.com/nhagen/react-intercom) package (`npm install --save react-intercom`).
\ No newline at end of file
diff --git a/packages/vulcan-intercom/lib/client/intercom.js b/packages/vulcan-intercom/lib/client/intercom.js
new file mode 100644
index 000000000..96d46e7c7
--- /dev/null
+++ b/packages/vulcan-intercom/lib/client/intercom.js
@@ -0,0 +1,23 @@
+import { Components, replaceComponent, getSetting, withCurrentUser, Head } from 'meteor/vulcan:core';
+import React from 'react';
+import Intercom from 'react-intercom';
+
+const IntercomWrapper = ({ currentUser }) => {
+  const appId = getSetting('intercom.appId');
+
+  if (!appId) {
+    console.warn('Please add intercom.appId to your public settings or disable the vulcan:intercom package.');
+    return null;
+  }
+
+  return <Intercom 
+    appID={appId} 
+    email={currentUser.email}
+    name={currentUser.displayName}
+    _id={currentUser._id}
+    profileUrl={currentUser.pageUrl}
+  />;
+
+}
+
+Head.components.push([IntercomWrapper, withCurrentUser]);
diff --git a/packages/vulcan-intercom/lib/client/main.js b/packages/vulcan-intercom/lib/client/main.js
new file mode 100644
index 000000000..05de0f718
--- /dev/null
+++ b/packages/vulcan-intercom/lib/client/main.js
@@ -0,0 +1,3 @@
+export * from '../modules/index.js'
+
+import './intercom.js';
\ No newline at end of file
diff --git a/packages/vulcan-intercom/lib/modules/index.js b/packages/vulcan-intercom/lib/modules/index.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/vulcan-intercom/lib/server/main.js b/packages/vulcan-intercom/lib/server/main.js
new file mode 100644
index 000000000..094a9a675
--- /dev/null
+++ b/packages/vulcan-intercom/lib/server/main.js
@@ -0,0 +1 @@
+export * from '../modules/index.js';
diff --git a/packages/vulcan-intercom/package.js b/packages/vulcan-intercom/package.js
new file mode 100644
index 000000000..fdce11f9a
--- /dev/null
+++ b/packages/vulcan-intercom/package.js
@@ -0,0 +1,19 @@
+Package.describe({
+  name: 'vulcan:intercom',
+  summary: 'Vulcan Intercom integration package.',
+  version: '1.8.0',
+  git: "https://github.com/VulcanJS/Vulcan.git"
+});
+
+Package.onUse(function (api) {
+
+  api.versionsFrom('METEOR@1.5.2');
+
+  api.use([
+    'vulcan:core@1.8.0'
+  ]);
+
+  api.mainModule("lib/client/main.js", "client");
+  api.mainModule("lib/server/main.js", "server");
+
+});

From 587a1f6de333d54736e61b1debc2f1e8a43c0655 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Tue, 17 Oct 2017 10:43:19 +0900
Subject: [PATCH 10/69] Small refactoring for SSR

---
 packages/vulcan-intercom/lib/client/main.js                   | 4 +---
 .../lib/{client/intercom.js => components/IntercomWrapper.js} | 4 ++--
 packages/vulcan-intercom/lib/modules/index.js                 | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename packages/vulcan-intercom/lib/{client/intercom.js => components/IntercomWrapper.js} (92%)

diff --git a/packages/vulcan-intercom/lib/client/main.js b/packages/vulcan-intercom/lib/client/main.js
index 05de0f718..29c383227 100644
--- a/packages/vulcan-intercom/lib/client/main.js
+++ b/packages/vulcan-intercom/lib/client/main.js
@@ -1,3 +1 @@
-export * from '../modules/index.js'
-
-import './intercom.js';
\ No newline at end of file
+export * from '../modules/index.js'
\ No newline at end of file
diff --git a/packages/vulcan-intercom/lib/client/intercom.js b/packages/vulcan-intercom/lib/components/IntercomWrapper.js
similarity index 92%
rename from packages/vulcan-intercom/lib/client/intercom.js
rename to packages/vulcan-intercom/lib/components/IntercomWrapper.js
index 96d46e7c7..df46d6022 100644
--- a/packages/vulcan-intercom/lib/client/intercom.js
+++ b/packages/vulcan-intercom/lib/components/IntercomWrapper.js
@@ -10,13 +10,13 @@ const IntercomWrapper = ({ currentUser }) => {
     return null;
   }
 
-  return <Intercom 
+  return currentUser ? <Intercom 
     appID={appId} 
     email={currentUser.email}
     name={currentUser.displayName}
     _id={currentUser._id}
     profileUrl={currentUser.pageUrl}
-  />;
+  /> : null;
 
 }
 
diff --git a/packages/vulcan-intercom/lib/modules/index.js b/packages/vulcan-intercom/lib/modules/index.js
index e69de29bb..97609b655 100644
--- a/packages/vulcan-intercom/lib/modules/index.js
+++ b/packages/vulcan-intercom/lib/modules/index.js
@@ -0,0 +1 @@
+import '../components/IntercomWrapper.js';
\ No newline at end of file

From 6dad94099fa08b6db1c71ee9748febd6e255a2c3 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Tue, 17 Oct 2017 10:52:45 +0900
Subject: [PATCH 11/69] Default to redirecting to root path on new sign up

---
 packages/vulcan-accounts/imports/accounts_ui.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vulcan-accounts/imports/accounts_ui.js b/packages/vulcan-accounts/imports/accounts_ui.js
index 3d9fb17de..24546e64d 100755
--- a/packages/vulcan-accounts/imports/accounts_ui.js
+++ b/packages/vulcan-accounts/imports/accounts_ui.js
@@ -21,14 +21,14 @@ Accounts.ui._options = {
   passwordSignupFields: 'USERNAME_AND_EMAIL',
   minimumPasswordLength: 7,
   loginPath: '/',
-  signUpPath: null,
+  signUpPath: '/',
   resetPasswordPath: null,
   profilePath: '/',
   changePasswordPath: null,
   homeRoutePath: '/',
   onSubmitHook: () => {},
   onPreSignUpHook: () => new Promise(resolve => resolve()),
-  onPostSignUpHook: () => {},
+  onPostSignUpHook: () => redirect(`${Accounts.ui._options.signUpPath}`),
   onEnrollAccountHook: () => redirect(`${Accounts.ui._options.loginPath}`),
   onResetPasswordHook: () => redirect(`${Accounts.ui._options.loginPath}`),
   onVerifyEmailHook: () => redirect(`${Accounts.ui._options.profilePath}`),

From 88da22952dd84ee97db1d265cf09f195490d6a76 Mon Sep 17 00:00:00 2001
From: Erik Schannen <erikschannen@gmail.com>
Date: Tue, 17 Oct 2017 09:35:41 -0400
Subject: [PATCH 12/69] Abstract out bootstrap-specific components in
 vulcan:forms and register them using registerComponent so that they can be
 overridden by other gui frameworks like material-ui.

---
 .../vulcan-forms/lib/components/Flash.jsx     |  3 +-
 packages/vulcan-forms/lib/components/Form.jsx | 40 ++++++---------
 .../lib/components/FormComponent.jsx          |  3 +-
 .../vulcan-forms/lib/components/FormGroup.jsx |  6 +--
 .../lib/components/FormSubmit.jsx             | 51 +++++++++++++++++++
 .../vulcan-forms/lib/modules/components.js    |  4 ++
 6 files changed, 78 insertions(+), 29 deletions(-)
 create mode 100644 packages/vulcan-forms/lib/components/FormSubmit.jsx

diff --git a/packages/vulcan-forms/lib/components/Flash.jsx b/packages/vulcan-forms/lib/components/Flash.jsx
index 9ce77b4ff..927fdb821 100644
--- a/packages/vulcan-forms/lib/components/Flash.jsx
+++ b/packages/vulcan-forms/lib/components/Flash.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Alert from 'react-bootstrap/lib/Alert'
+import { registerComponent } from 'meteor/vulcan:core';
 
 const Flash = ({message, type}) => {
   
@@ -24,4 +25,4 @@ Flash.propTypes = {
   message: PropTypes.oneOfType([PropTypes.object.isRequired, PropTypes.array.isRequired])
 }
 
-export default Flash;
\ No newline at end of file
+registerComponent('FormFlash', Flash);
\ No newline at end of file
diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx
index 8ca04813a..72e8736ca 100644
--- a/packages/vulcan-forms/lib/components/Form.jsx
+++ b/packages/vulcan-forms/lib/components/Form.jsx
@@ -25,12 +25,9 @@ This component expects:
 import { Components, Utils, runCallbacks } from 'meteor/vulcan:core';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
+import { intlShape } from 'meteor/vulcan:i18n';
 import Formsy from 'formsy-react';
-import Button from 'react-bootstrap/lib/Button';
-import Flash from "./Flash.jsx";
-import FormGroup from "./FormGroup.jsx";
-import { flatten, deepValue, getEditableFields, getInsertableFields } from '../modules/utils.js';
+import { getEditableFields, getInsertableFields } from '../modules/utils.js';
 
 /*
 
@@ -362,8 +359,8 @@ class Form extends Component {
             message = {content: error.message || this.context.intl.formatMessage({id: error.id, defaultMessage: error.id}, error.data)}
 
           }
-
-          return <Flash key={index} message={message} type="error"/>
+  
+          return <Components.FormFlash key={index} message={message} type="error"/>;
         })}
       </div>
     )
@@ -614,25 +611,20 @@ class Form extends Component {
           ref="form"
         >
           {this.renderErrors()}
-          {fieldGroups.map(group => <FormGroup key={group.name} {...group} updateCurrentValues={this.updateCurrentValues} />)}
-
-          <div className="form-submit">
-            <Button type="submit" bsStyle="primary">{this.props.submitLabel ? this.props.submitLabel : <FormattedMessage id="forms.submit"/>}</Button>
-            {this.props.cancelCallback ? <a className="form-cancel" onClick={(e) => {e.preventDefault(); this.props.cancelCallback(this.getDocument())}}>{this.props.cancelLabel ? this.props.cancelLabel : <FormattedMessage id="forms.cancel"/>}</a> : null}
-          </div>
+          {fieldGroups.map(group => <Components.FormGroup key={group.name} {...group} updateCurrentValues={this.updateCurrentValues} />)}
+  
+          <Components.FormSubmit submitLabel={this.props.submitLabel}
+                                 cancelLabel={this.props.cancelLabel}
+                                 cancelCallback={this.props.cancelCallback}
+                                 document={this.getDocument()}
+                                 deleteDocument={(this.props.formType === 'edit'
+                                   && this.props.showRemove
+                                   && this.deleteDocument)
+                                 || null}
+                                 collectionName={collectionName}
+          />
 
         </Formsy.Form>
-
-        {
-          this.props.formType === 'edit' && this.props.showRemove
-            ? <div>
-                <hr/>
-                <a href="javascript:void()" onClick={this.deleteDocument} className={`delete-link ${collectionName}-delete-link`}>
-                  <Components.Icon name="close"/> <FormattedMessage id="forms.delete"/>
-                </a>
-              </div>
-            : null
-        }
       </div>
     )
   }
diff --git a/packages/vulcan-forms/lib/components/FormComponent.jsx b/packages/vulcan-forms/lib/components/FormComponent.jsx
index 58e1f86fb..314f4544a 100644
--- a/packages/vulcan-forms/lib/components/FormComponent.jsx
+++ b/packages/vulcan-forms/lib/components/FormComponent.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { intlShape } from 'meteor/vulcan:i18n';
 import classNames from 'classnames';
 import { Components } from 'meteor/vulcan:core';
+import { registerComponent } from 'meteor/vulcan:core';
 
 class FormComponent extends PureComponent {
 
@@ -156,4 +157,4 @@ FormComponent.contextTypes = {
   intl: intlShape
 };
 
-export default FormComponent;
+registerComponent('FormComponent', FormComponent);
diff --git a/packages/vulcan-forms/lib/components/FormGroup.jsx b/packages/vulcan-forms/lib/components/FormGroup.jsx
index 05de64f3e..79f168a9b 100644
--- a/packages/vulcan-forms/lib/components/FormGroup.jsx
+++ b/packages/vulcan-forms/lib/components/FormGroup.jsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import FormComponent from './FormComponent.jsx';
 import { Components } from 'meteor/vulcan:core';
 import classNames from 'classnames';
+import { registerComponent } from 'meteor/vulcan:core';
 
 class FormGroup extends PureComponent {
 
@@ -40,7 +40,7 @@ class FormGroup extends PureComponent {
       <div className="form-section">
         {this.props.name === 'default' ? null : this.renderHeading()}
         <div className={classNames({'form-section-collapsed': this.state.collapsed && !hasErrors})}>
-          {this.props.fields.map(field => <FormComponent key={field.name} {...field} updateCurrentValues={this.props.updateCurrentValues} />)}
+          {this.props.fields.map(field => <Components.FormComponent key={field.name} {...field} updateCurrentValues={this.props.updateCurrentValues} />)}
         </div>
       </div>
     )
@@ -55,4 +55,4 @@ FormGroup.propTypes = {
   updateCurrentValues: PropTypes.func
 }
 
-export default FormGroup;
\ No newline at end of file
+registerComponent('FormGroup', FormGroup);
\ No newline at end of file
diff --git a/packages/vulcan-forms/lib/components/FormSubmit.jsx b/packages/vulcan-forms/lib/components/FormSubmit.jsx
new file mode 100644
index 000000000..58aac8de3
--- /dev/null
+++ b/packages/vulcan-forms/lib/components/FormSubmit.jsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Components } from 'meteor/vulcan:core';
+import { registerComponent } from 'meteor/vulcan:core';
+import Button from 'react-bootstrap/lib/Button';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
+
+
+const FormSubmit = ({
+                      submitLabel,
+                      cancelLabel,
+                      cancelCallback,
+                      document,
+                      deleteDocument,
+                      collectionName,
+                      classes
+                    }) => (
+  <div className="form-submit">
+    
+    <Button type="submit" bsStyle="primary">
+      {submitLabel ? submitLabel : <FormattedMessage id="forms.submit"/>}
+    </Button>
+    
+    {
+      cancelCallback
+        ?
+        <a className="form-cancel" onClick={(e) => {
+          e.preventDefault();
+          cancelCallback(document);
+        }}>{cancelLabel ? cancelLabel :
+          <FormattedMessage id="forms.cancel"/>}</a>
+        :
+        null
+    }
+    
+  </div>
+);
+
+
+FormSubmit.propTypes = {
+  submitLabel: PropTypes.string,
+  cancelLabel: PropTypes.string,
+  cancelCallback: PropTypes.func,
+  document: PropTypes.object,
+  deleteDocument: PropTypes.func,
+  collectionName: PropTypes.string,
+  classes: PropTypes.object,
+};
+
+
+registerComponent('FormSubmit', FormSubmit);
diff --git a/packages/vulcan-forms/lib/modules/components.js b/packages/vulcan-forms/lib/modules/components.js
index 390b5768f..2fa5ae1be 100644
--- a/packages/vulcan-forms/lib/modules/components.js
+++ b/packages/vulcan-forms/lib/modules/components.js
@@ -9,4 +9,8 @@ import '../components/bootstrap/Select.jsx';
 import '../components/bootstrap/Textarea.jsx';
 import '../components/bootstrap/Url.jsx';
 
+import '../components/Flash.jsx';
+import '../components/FormComponent.jsx';
+import '../components/FormGroup.jsx';
+import '../components/FormSubmit.jsx';
 import '../components/FormWrapper.jsx';

From 756029c93d70082f96ff955cd15f205b2d66ae94 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Wed, 18 Oct 2017 20:05:51 +0900
Subject: [PATCH 13/69] Refactoring payments package to handle subscriptions

---
 .../lib/components/Checkout.jsx               |   8 +-
 ...thCreateCharge.js => withPaymentAction.js} |  10 +-
 .../lib/modules/charges/schema.js             |  35 +++
 .../lib/modules/custom_fields.js              |  11 +
 packages/vulcan-payments/lib/modules/index.js |   1 +
 .../lib/server/integrations/stripe.js         | 235 +++++++++++++++---
 packages/vulcan-payments/lib/server/main.js   |   2 +-
 .../vulcan-payments/lib/server/mutations.js   |   8 +-
 8 files changed, 258 insertions(+), 52 deletions(-)
 rename packages/vulcan-payments/lib/containers/{withCreateCharge.js => withPaymentAction.js} (51%)
 create mode 100644 packages/vulcan-payments/lib/modules/custom_fields.js

diff --git a/packages/vulcan-payments/lib/components/Checkout.jsx b/packages/vulcan-payments/lib/components/Checkout.jsx
index e1af58357..6a5b65c86 100644
--- a/packages/vulcan-payments/lib/components/Checkout.jsx
+++ b/packages/vulcan-payments/lib/components/Checkout.jsx
@@ -4,7 +4,7 @@ import { Components, registerComponent, getSetting, registerSetting, withCurrent
 import Users from 'meteor/vulcan:users';
 import { intlShape } from 'meteor/vulcan:i18n';
 import classNames from 'classnames';
-import withCreateCharge from '../containers/withCreateCharge.js';
+import withPaymentAction from '../containers/withPaymentAction.js';
 import { Products } from '../modules/products.js';
 
 const stripeSettings = getSetting('stripe');
@@ -22,7 +22,7 @@ class Checkout extends React.Component {
 
   onToken(token) {
 
-    const {createChargeMutation, productKey, associatedCollection, associatedDocument, callback, properties, currentUser, flash, coupon} = this.props;
+    const {paymentActionMutation, productKey, associatedCollection, associatedDocument, callback, properties, currentUser, flash, coupon} = this.props;
 
     this.setState({ loading: true });
 
@@ -36,7 +36,7 @@ class Checkout extends React.Component {
       coupon,
     }
 
-    createChargeMutation(args).then(response => {
+    paymentActionMutation(args).then(response => {
 
       // not needed because we just unmount the whole component:
       this.setState({ loading: false });
@@ -109,7 +109,7 @@ Checkout.contextTypes = {
 
 const WrappedCheckout = (props) => {
   const { fragment, fragmentName } = props;
-  const WrappedCheckout = withCreateCharge({fragment, fragmentName})(Checkout);
+  const WrappedCheckout = withPaymentAction({fragment, fragmentName})(Checkout);
   return <WrappedCheckout {...props}/>;
 }
 
diff --git a/packages/vulcan-payments/lib/containers/withCreateCharge.js b/packages/vulcan-payments/lib/containers/withPaymentAction.js
similarity index 51%
rename from packages/vulcan-payments/lib/containers/withCreateCharge.js
rename to packages/vulcan-payments/lib/containers/withPaymentAction.js
index 8184844cc..16b770334 100644
--- a/packages/vulcan-payments/lib/containers/withCreateCharge.js
+++ b/packages/vulcan-payments/lib/containers/withPaymentAction.js
@@ -2,14 +2,14 @@ import { graphql } from 'react-apollo';
 import gql from 'graphql-tag';
 import { getFragment, getFragmentName } from 'meteor/vulcan:core';
 
-export default function withCreateCharge(options) {
+export default function withPaymentAction(options) {
 
   const fragment = options.fragment || getFragment(options.fragmentName);
   const fragmentName = getFragmentName(fragment) || fragmentName;
 
   const mutation = gql`
-    mutation createChargeMutation($token: JSON, $userId: String, $productKey: String, $associatedCollection: String, $associatedId: String, $properties: JSON, $coupon: String) {
-      createChargeMutation(token: $token, userId: $userId, productKey: $productKey, associatedCollection: $associatedCollection, associatedId: $associatedId, properties: $properties, coupon: $coupon) {
+    mutation paymentActionMutation($token: JSON, $userId: String, $productKey: String, $associatedCollection: String, $associatedId: String, $properties: JSON, $coupon: String) {
+      paymentActionMutation(token: $token, userId: $userId, productKey: $productKey, associatedCollection: $associatedCollection, associatedId: $associatedId, properties: $properties, coupon: $coupon) {
         __typename
         ...${fragmentName}
       }
@@ -18,9 +18,9 @@ export default function withCreateCharge(options) {
   `;
 
   return graphql(mutation, {
-    alias: 'withCreateCharge',
+    alias: 'withPaymentAction',
     props: ({ownProps, mutate}) => ({
-      createChargeMutation: (vars) => {
+      paymentActionMutation: (vars) => {
         return mutate({ 
           variables: vars,
         });
diff --git a/packages/vulcan-payments/lib/modules/charges/schema.js b/packages/vulcan-payments/lib/modules/charges/schema.js
index 5498f6582..d7a197fe1 100644
--- a/packages/vulcan-payments/lib/modules/charges/schema.js
+++ b/packages/vulcan-payments/lib/modules/charges/schema.js
@@ -1,3 +1,4 @@
+import moment from 'moment';
 
 const schema = {
 
@@ -24,6 +25,16 @@ const schema = {
   
   // custom properties
 
+  associatedCollection: {
+    type: String,
+    optional: true,
+  },
+
+  associatedId: {
+    type: String,
+    optional: true,
+  },
+
   tokenId: {
     type: String,
     optional: false,
@@ -59,6 +70,30 @@ const schema = {
     optional: true,
   },
 
+  // GraphQL only
+
+  createdAtFormatted: {
+    type: String,
+    optional: true,
+    resolveAs: {
+      type: 'String',
+      resolver: (charge, args, context) => {
+        return moment(charge.createdAt).format('dddd, MMMM Do YYYY');
+      }
+    }  
+  },
+
+  stripeChargeUrl: {
+    type: String,
+    optional: true,
+    resolveAs: {
+      type: 'String',
+      resolver: (charge, args, context) => {
+        return `https://dashboard.stripe.com/payments/${charge.data.id}`;
+      }
+    } 
+  },
+
 };
 
 export default schema;
diff --git a/packages/vulcan-payments/lib/modules/custom_fields.js b/packages/vulcan-payments/lib/modules/custom_fields.js
new file mode 100644
index 000000000..de9dc5d70
--- /dev/null
+++ b/packages/vulcan-payments/lib/modules/custom_fields.js
@@ -0,0 +1,11 @@
+import Users from 'meteor/vulcan:users';
+
+Users.addField([
+  {
+    fieldName: 'stripeCustomerId',
+    fieldSchema: {
+      type: String,
+      optional: true,
+    }
+  }
+]);
diff --git a/packages/vulcan-payments/lib/modules/index.js b/packages/vulcan-payments/lib/modules/index.js
index e6c277eaf..f2f945723 100644
--- a/packages/vulcan-payments/lib/modules/index.js
+++ b/packages/vulcan-payments/lib/modules/index.js
@@ -4,5 +4,6 @@ import '../components/Checkout.jsx';
 
 import './routes.js';
 import './i18n.js';
+import './custom_fields.js';
 
 export * from './products.js'
\ No newline at end of file
diff --git a/packages/vulcan-payments/lib/server/integrations/stripe.js b/packages/vulcan-payments/lib/server/integrations/stripe.js
index 3f671ea7e..a3b9b6424 100644
--- a/packages/vulcan-payments/lib/server/integrations/stripe.js
+++ b/packages/vulcan-payments/lib/server/integrations/stripe.js
@@ -1,8 +1,8 @@
 import { getSetting, registerSetting, newMutation, editMutation, Collections, runCallbacks, runCallbacksAsync } from 'meteor/vulcan:core';
-// import express from 'express';
+import express from 'express';
 import Stripe from 'stripe';
-// import { Picker } from 'meteor/meteorhacks:picker';
-// import bodyParser from 'body-parser';
+import { Picker } from 'meteor/meteorhacks:picker';
+import bodyParser from 'body-parser';
 import Charges from '../../modules/charges/collection.js';
 import Users from 'meteor/vulcan:users';
 import { Products } from '../../modules/products.js';
@@ -11,6 +11,10 @@ registerSetting('stripe', null, 'Stripe settings');
 
 const stripeSettings = getSetting('stripe');
 
+// initialize Stripe
+const keySecret = Meteor.isDevelopment ? stripeSettings.secretKeyTest : stripeSettings.secretKey;
+const stripe = new Stripe(keySecret);
+
 const sampleProduct = {
   amount: 10000,
   name: 'My Cool Product',
@@ -18,20 +22,21 @@ const sampleProduct = {
   currency: 'USD',
 }
 
-// returns a promise:
-export const createCharge = async (args) => {
+/*
+
+Create new Stripe charge
+(returns a promise)
+
+*/
+export const performAction = async (args) => {
   
   let collection, document, returnDocument = {};
 
-  const {token, userId, productKey, associatedCollection, associatedId, properties, coupon } = args;
+  const {token, userId, productKey, associatedCollection, associatedId, properties } = args;
 
   if (!stripeSettings) {
     throw new Error('Please fill in your Stripe settings');
   }
-  
-  // initialize Stripe
-  const keySecret = Meteor.isDevelopment ? stripeSettings.secretKeyTest : stripeSettings.secretKey;
-  const stripe = new Stripe(keySecret);
 
   // if an associated collection name and document id have been provided, 
   // get the associated collection and document
@@ -45,25 +50,66 @@ export const createCharge = async (args) => {
   const definedProduct = Products[productKey];
   const product = typeof definedProduct === 'function' ? definedProduct(document) : definedProduct || sampleProduct;
 
-  let amount = product.amount;
-
   // get the user performing the transaction
   const user = Users.findOne(userId);
 
-  // create Stripe customer
-  const customer = await stripe.customers.create({
-    email: token.email,
-    source: token.id
-  });
+  let customer;
+
+  if (user.stripeCustomerId) {
+    // if user has a stripe id already, retrieve customer from Stripe
+    customer = await stripe.customers.retrieve(user.stripeCustomerId);
+  } else {
+    // else create new Stripe customer
+    customer = await stripe.customers.create({
+      email: token.email,
+      source: token.id
+    });
+
+    // add stripe customer id to user object
+    await editMutation({
+      collection: Users,
+      documentId: user._id,
+      set: {stripeCustomerId: customer.id},
+      validate: false
+    });
+  }
 
   // create metadata object
   const metadata = {
     userId: userId,
     userName: Users.getDisplayName(user),
     userProfile: Users.getProfileUrl(user, true),
+    productKey,
     ...properties
   }
 
+  if (associatedCollection && associatedId) {
+    metadata.associatedCollection = associatedCollection;
+    metadata.associatedId = associatedId;
+  }
+
+  if (product.plan) {
+    // if product has a plan, subscribe user to it
+    returnDocument = await subscribeUser({user, customer, product, collection, document, metadata, args});
+  } else {
+    // else, perform charge
+    returnDocument = await createCharge({user, customer, product, collection, document, metadata, args});
+  }
+
+  return returnDocument;
+}
+
+/*
+
+Create one-time charge. 
+
+*/
+export const createCharge = async ({user, customer, product, collection, document, metadata, args}) => {
+  
+  const {token, userId, productKey, associatedId, properties, coupon } = args;
+
+  let amount = product.amount;
+
   // apply discount coupon and add it to metadata, if there is one
   if (coupon && product.coupons && product.coupons[coupon]) {
     amount -= product.coupons[coupon];
@@ -83,19 +129,39 @@ export const createCharge = async (args) => {
   // create Stripe charge
   const charge = await stripe.charges.create(chargeData);
 
+  return processCharge({collection, document, charge, args})
+
+}
+
+/*
+
+Process charge on Vulcan's side
+
+*/
+export const processCharge = async ({collection, document, charge, args}) => {
+ 
+  let returnDocument = {};
+
+  const {token, userId, productKey, associatedCollection, associatedId, properties, livemode } = args;
+
   // create charge document for storing in our own Charges collection
   const chargeDoc = {
     createdAt: new Date(),
     userId,
-    tokenId: token.id, 
     type: 'stripe',
-    test: !token.livemode,
+    test: !livemode,
     data: charge,
-    ip: token.client_ip,
+    associatedCollection,
+    associatedId,
     properties,
     productKey,
   }
 
+  if (token) {
+    chargeDoc.tokenId = token.id;
+    chargeDoc.test = !token.livemode; // get livemode from token if provided
+    chargeDoc.ip = token.client_ip;
+  }
   // insert
   const chargeSaved = newMutation({
     collection: Charges,
@@ -107,12 +173,14 @@ export const createCharge = async (args) => {
   // update the associated document
   if (collection && document) {
     
+    // note: assume a single document can have multiple successive charges associated to it
     const chargeIds = document.chargeIds ? [...document.chargeIds, chargeSaved._id] : [chargeSaved._id];
 
     let modifier = {
       $set: {chargeIds},
       $unset: {}
     }
+
     // run collection.charge.sync callbacks
     modifier = runCallbacks(`${collection._name}.charge.sync`, modifier, document, chargeDoc);
 
@@ -135,30 +203,121 @@ export const createCharge = async (args) => {
 
 /*
 
-POST route with Picker
+Create new subscription plan
+
+*/
+export const createPlan = async (options) => {
+  try {
+    await stripe.plans.create(options);
+  } catch (error) {
+    console.log('// Stripe createPlan error')
+    console.log(error)
+  }
+}
+
+/*
+
+Subscribe a user to a Stripe plan
+
+*/
+export const subscribeUser = async ({user, customer, product, collection, document, metadata, args }) => {
+
+  console.log('////////////// subscribeUser')
+  console.log(product)
+
+  try {
+    const subscription = await stripe.subscriptions.create({
+      customer: customer.id,
+      items: [
+        { plan: product.plan },
+      ],
+      metadata,
+    });
+    console.log(subscription)
+  } catch (error) {
+    console.log('// Stripe subscribeUser error')
+    console.log(error)
+  }
+}
+
+
+/*
+
+Webhooks with Picker
 
 */
 
-// Picker.middleware(bodyParser.text());
+// const app = express()
 
-// Picker.route('/charge', function(params, req, res, next) {
 
-//   const body = JSON.parse(req.body);
+// app.post('/stripe', function(req, res) {
+//   // Retrieve the request's body and parse it as JSON
+//   console.log('////////////// stripe webhook')
 
-//   // console.log(body)
+//   var event_json = JSON.parse(req.body);
 
-//   const { token, userId, productKey, associatedCollection, associatedId } = body;
-
-//   createCharge({
-//     token,
-//     userId,
-//     productKey,
-//     associatedCollection,
-//     associatedId,
-//     callback: (charge) => {
-//       // return Stripe charge
-//       res.end(JSON.stringify(charge));
-//     }
-//   });
+//   console.log(event_json)
 
+//   res.send(200);
 // });
+
+Picker.middleware(bodyParser.json());
+
+Picker.route('/stripe', async function(params, req, res, next) {
+
+  console.log('////////////// stripe webhook')
+
+  const body = req.body;
+
+
+   // Retrieve the request's body and parse it as JSON
+   switch (body.type) {
+
+    case 'charge.succeeded':
+
+      console.log('////// charge body')
+      console.log(body)
+
+      const charge = body.data.object;
+
+      try {
+
+        // look up corresponding invoice
+        const invoice = await stripe.invoices.retrieve(body.data.object.invoice);
+        console.log('////// invoice')
+
+        // look up corresponding subscription
+        const subscription = await stripe.subscriptions.retrieve(invoice.subscription);
+        console.log('////// subscription')
+        console.log(subscription)
+
+        const { userId, productKey, associatedCollection, associatedId } = subscription.metadata;
+
+        if (associatedCollection && associatedId) {
+          const collection = _.findWhere(Collections, {_name: associatedCollection});
+          const document = collection.findOne(associatedId);
+
+          const args = {
+            userId, 
+            productKey,
+            associatedCollection,
+            associatedId,
+            livemode: subscription.livemode,
+          }
+
+          processCharge({ collection, document, charge, args});
+
+        }      
+      } catch (error) {
+        console.log('// Stripe webhook error')
+        console.log(error)
+      }
+
+      break;
+
+   }
+
+  res.statusCode = 200;
+  res.end();
+
+});
diff --git a/packages/vulcan-payments/lib/server/main.js b/packages/vulcan-payments/lib/server/main.js
index 890d522d3..64ed7b383 100644
--- a/packages/vulcan-payments/lib/server/main.js
+++ b/packages/vulcan-payments/lib/server/main.js
@@ -1,4 +1,4 @@
 export * from '../modules/index.js';
 
 import './mutations.js';
-import './integrations/stripe.js';
+export * from './integrations/stripe.js';
diff --git a/packages/vulcan-payments/lib/server/mutations.js b/packages/vulcan-payments/lib/server/mutations.js
index 564c56ee8..d638119f3 100644
--- a/packages/vulcan-payments/lib/server/mutations.js
+++ b/packages/vulcan-payments/lib/server/mutations.js
@@ -1,16 +1,16 @@
 import { addGraphQLSchema, addGraphQLResolvers, addGraphQLMutation, Collections, addCallback } from 'meteor/vulcan:core';
 // import Users from 'meteor/vulcan:users';
-import { createCharge } from '../server/integrations/stripe.js';
+import { performAction } from '../server/integrations/stripe.js';
 
 const resolver = {
   Mutation: {
-    async createChargeMutation(root, args, context) {
-      return await createCharge(args);
+    async paymentActionMutation(root, args, context) {
+      return await performAction(args);
     },
   },
 };
 addGraphQLResolvers(resolver);
-addGraphQLMutation('createChargeMutation(token: JSON, userId: String, productKey: String, associatedCollection: String, associatedId: String, properties: JSON, coupon: String) : Chargeable');
+addGraphQLMutation('paymentActionMutation(token: JSON, userId: String, productKey: String, associatedCollection: String, associatedId: String, properties: JSON, coupon: String) : Chargeable');
 
 function CreateChargeableUnionType() {
   const chargeableSchema = `

From d48c84b749998ed3f4089dca0f1d28938e1e1fb9 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Wed, 18 Oct 2017 20:06:31 +0900
Subject: [PATCH 14/69] Small fixes

---
 packages/example-forum/lib/modules/posts/schema.js | 4 ++--
 packages/vulcan-lib/lib/modules/callbacks.js       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/example-forum/lib/modules/posts/schema.js b/packages/example-forum/lib/modules/posts/schema.js
index d106bcdef..3a9eb3a61 100644
--- a/packages/example-forum/lib/modules/posts/schema.js
+++ b/packages/example-forum/lib/modules/posts/schema.js
@@ -367,8 +367,8 @@ const schema = {
     optional: true,
     resolveAs: {
       type: 'String',
-      resolver: (booking, args, context) => {
-        return moment(booking.endAt).format('dddd, MMMM Do YYYY');
+      resolver: (post, args, context) => {
+        return moment(post.postedAt).format('dddd, MMMM Do YYYY');
       }
     }  
   },
diff --git a/packages/vulcan-lib/lib/modules/callbacks.js b/packages/vulcan-lib/lib/modules/callbacks.js
index a401bc292..698699271 100644
--- a/packages/vulcan-lib/lib/modules/callbacks.js
+++ b/packages/vulcan-lib/lib/modules/callbacks.js
@@ -114,7 +114,7 @@ export const runCallbacksAsync = function () {
     Meteor.defer(function () {
       // run all post submit server callbacks on post object successively
       callbacks.forEach(function(callback) {
-        // console.log("// "+hook+": running callback ["+callback.name+"] at "+moment().format("hh:mm:ss"))
+        debug(`// Running async callback [${callback.name}] on hook [${hook}]`);
         callback.apply(this, args);
       });
     });

From a5f9d64a2e55d76ac65794e797ab12c431233680 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Wed, 18 Oct 2017 20:07:43 +0900
Subject: [PATCH 15/69] Working on form clearing

---
 .../lib/components/FormComponent.jsx          | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/vulcan-forms/lib/components/FormComponent.jsx b/packages/vulcan-forms/lib/components/FormComponent.jsx
index 58e1f86fb..de19c1d64 100644
--- a/packages/vulcan-forms/lib/components/FormComponent.jsx
+++ b/packages/vulcan-forms/lib/components/FormComponent.jsx
@@ -120,6 +120,26 @@ class FormComponent extends PureComponent {
     )
   }
 
+  showClear = () => {
+    return ['datetime', 'select', 'radiogroup'].includes(this.props.control);
+  }
+
+  clearField = (e) => {
+    e.preventDefault();
+    console.log(this.props)
+    const fieldName = this.props.name;
+    // clear value
+    this.props.updateCurrentValues({[fieldName]: null});
+    // add it to unset
+    this.context.addToDeletedValues(fieldName);
+  }
+
+  renderClear() {
+    return (
+      <button className="form-component-clear" title={this.context.intl.formatMessage({id: 'forms.clear_field'})} onClick={this.clearField}><span>✕</span></button>
+    )
+  }
+
   render() {
 
     const hasErrors = this.props.errors && this.props.errors.length;
@@ -130,6 +150,7 @@ class FormComponent extends PureComponent {
         {this.props.beforeComponent ? this.props.beforeComponent : null}
         {this.renderComponent()}
         {hasErrors ? this.renderErrors() : null}
+        {this.showClear() ? this.renderClear() : null}
         {this.props.limit ? <div className={classNames('form-control-limit', {danger: this.state.limit < 10})}>{this.state.limit}</div> : null}
         {this.props.afterComponent ? this.props.afterComponent : null}
       </div>
@@ -153,7 +174,8 @@ FormComponent.propTypes = {
 }
 
 FormComponent.contextTypes = {
-  intl: intlShape
+  intl: intlShape,
+  addToDeletedValues: PropTypes.func,
 };
 
 export default FormComponent;

From 1f312c5fe663050f7a2e2b26b724c3f9f96eab85 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Thu, 19 Oct 2017 12:36:18 +0900
Subject: [PATCH 16/69] Enable checking checkboxes by default by setting
 checked = true in options

---
 packages/vulcan-forms/lib/components/Form.jsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx
index 72e8736ca..500a1b374 100644
--- a/packages/vulcan-forms/lib/components/Form.jsx
+++ b/packages/vulcan-forms/lib/components/Form.jsx
@@ -160,6 +160,11 @@ class Form extends Component {
       // add options if they exist
       if (fieldSchema.form && fieldSchema.form.options) {
         field.options = typeof fieldSchema.form.options === "function" ? fieldSchema.form.options.call(fieldSchema, this.props) : fieldSchema.form.options;
+      
+        // in case of checkbox groups, check "checked" option to populate value
+        if (!field.value) {
+          field.value = _.where(fieldSchema.form.options, {checked: true}).map(option => option.value);
+        }
       }
 
       if (fieldSchema.form && fieldSchema.form.disabled) {

From df2db270e57e4d48860fd62c19985951d9f03772 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Fri, 20 Oct 2017 10:08:09 +0900
Subject: [PATCH 17/69] Fix default checked values for when options is a
 function

---
 packages/vulcan-forms/lib/components/Form.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx
index 500a1b374..32b20b0af 100644
--- a/packages/vulcan-forms/lib/components/Form.jsx
+++ b/packages/vulcan-forms/lib/components/Form.jsx
@@ -163,7 +163,7 @@ class Form extends Component {
       
         // in case of checkbox groups, check "checked" option to populate value
         if (!field.value) {
-          field.value = _.where(fieldSchema.form.options, {checked: true}).map(option => option.value);
+          field.value = _.where(field.options, {checked: true}).map(option => option.value);
         }
       }
 

From 4e259ec117ab8be415ba4c3763bec374f0b07da1 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Fri, 20 Oct 2017 10:08:56 +0900
Subject: [PATCH 18/69] Finish work on form field clearing feature

---
 .../example-forum/lib/modules/posts/schema.js | 13 +++++---
 .../lib/components/FormComponent.jsx          |  4 +--
 .../vulcan-forms/lib/stylesheets/style.scss   | 32 +++++++++++++++++++
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/packages/example-forum/lib/modules/posts/schema.js b/packages/example-forum/lib/modules/posts/schema.js
index 3a9eb3a61..84442e9e1 100644
--- a/packages/example-forum/lib/modules/posts/schema.js
+++ b/packages/example-forum/lib/modules/posts/schema.js
@@ -198,10 +198,15 @@ const schema = {
     insertableBy: ['admins'],
     editableBy: ['admins'],
     control: 'select',
-    onInsert: document => {
-      if (document.userId && !document.status) {
-        const user = Users.findOne(document.userId);
-        return Posts.getDefaultStatus(user);
+    onInsert: (document, currentUser) => {
+      if (!document.status) {
+        return Posts.getDefaultStatus(currentUser);
+      }
+    },
+    onEdit: (modifier, document, currentUser) => {
+      // if for some reason post status has been removed, give it default status
+      if (modifier.$unset && modifier.$unset.status) {
+        return Posts.getDefaultStatus(currentUser);
       }
     },
     form: {
diff --git a/packages/vulcan-forms/lib/components/FormComponent.jsx b/packages/vulcan-forms/lib/components/FormComponent.jsx
index 8b28301e7..f9c4bc41c 100644
--- a/packages/vulcan-forms/lib/components/FormComponent.jsx
+++ b/packages/vulcan-forms/lib/components/FormComponent.jsx
@@ -137,14 +137,14 @@ class FormComponent extends PureComponent {
 
   renderClear() {
     return (
-      <button className="form-component-clear" title={this.context.intl.formatMessage({id: 'forms.clear_field'})} onClick={this.clearField}><span>✕</span></button>
+      <a href="javascript:void(0)" className="form-component-clear" title={this.context.intl.formatMessage({id: 'forms.clear_field'})} onClick={this.clearField}><span>✕</span></a>
     )
   }
 
   render() {
 
     const hasErrors = this.props.errors && this.props.errors.length;
-    const inputClass = classNames('form-input', `input-${this.props.name}`, {'input-error': hasErrors});
+    const inputClass = classNames('form-input', `input-${this.props.name}`, `form-component-${this.props.control || 'default'}`,{'input-error': hasErrors});
 
     return (
       <div className={inputClass}>
diff --git a/packages/vulcan-forms/lib/stylesheets/style.scss b/packages/vulcan-forms/lib/stylesheets/style.scss
index c0789f50c..3ff8eaf9e 100644
--- a/packages/vulcan-forms/lib/stylesheets/style.scss
+++ b/packages/vulcan-forms/lib/stylesheets/style.scss
@@ -1,4 +1,5 @@
 $light-grey: #ddd;
+$medium-grey: #bbb;
 $vmargin: 15px;
 $light-border: $light-grey;
 
@@ -181,4 +182,35 @@ div.ReactTags__suggestions mark{
   li{
     margin: 0;
   }
+}
+
+.form-component-select, .form-component-datetime{
+  .col-sm-9{
+    padding-right: 40px;
+  }
+}
+
+.form-component-clear{
+  position: absolute;
+  top: 11px;
+  right: 0px;
+  background: $light-grey;
+  color: #fff;
+  border-radius: 100%;
+  height: 16px;
+  width: 16px;
+  border: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  span{
+    font-size: 8px;
+    display: block;
+    line-height: 1;
+  }
+  &:hover{
+    text-decoration: none;
+    background: $medium-grey;
+    color: #fff;
+  }
 }
\ No newline at end of file

From b496d01d83c85c24edd0b44e20c778cce4c04bf1 Mon Sep 17 00:00:00 2001
From: Discordius <panisnecis@gmail.com>
Date: Thu, 19 Oct 2017 21:28:26 -0700
Subject: [PATCH 19/69] Order of operation fix in scoring.js

---
 packages/vulcan-voting/lib/server/scoring.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/vulcan-voting/lib/server/scoring.js b/packages/vulcan-voting/lib/server/scoring.js
index 1955e6157..240298aef 100644
--- a/packages/vulcan-voting/lib/server/scoring.js
+++ b/packages/vulcan-voting/lib/server/scoring.js
@@ -10,17 +10,18 @@ Returns how many documents have been updated (1 or 0).
 export const updateScore = ({collection, item, forceUpdate}) => {
 
   // Age Check
-
-  // If for some reason item doesn't have a "postedAt" property, abort
-  // Or, if post has been scheduled in the future, don't update its score
-  if (!item.postedAt || postedAt > now)
-    return 0;
-
-  const postedAt = item.postedAt.valueOf();
+  const postedAt = item && item.postedAt && item.postedAt.valueOf();
   const now = new Date().getTime();
   const age = now - postedAt;
   const ageInHours = age / (60 * 60 * 1000);
 
+  // If for some reason item doesn't have a "postedAt" property, abort
+  // Or, if post has been scheduled in the future, don't update its score
+  if (postedAt || postedAt > now)
+    return 0;
+
+
+
   // For performance reasons, the database is only updated if the difference between the old score and the new score
   // is meaningful enough. To find out, we calculate the "power" of a single vote after n days.
   // We assume that after n days, a single vote will not be powerful enough to affect posts' ranking order.

From faa856f78f0db4118c41e94b19d87a2045cb6c9b Mon Sep 17 00:00:00 2001
From: Discordius <panisnecis@gmail.com>
Date: Thu, 19 Oct 2017 21:35:27 -0700
Subject: [PATCH 20/69] Added index to Votes on startup

---
 packages/vulcan-voting/lib/server/indexes.js | 3 +++
 packages/vulcan-voting/lib/server/main.js    | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 packages/vulcan-voting/lib/server/indexes.js

diff --git a/packages/vulcan-voting/lib/server/indexes.js b/packages/vulcan-voting/lib/server/indexes.js
new file mode 100644
index 000000000..439c7638e
--- /dev/null
+++ b/packages/vulcan-voting/lib/server/indexes.js
@@ -0,0 +1,3 @@
+import Votes from '../modules/votes/collection.js';
+
+Votes._ensureIndex({ "userId": 1, "documentId": 1 });
diff --git a/packages/vulcan-voting/lib/server/main.js b/packages/vulcan-voting/lib/server/main.js
index 4d5033e3f..ac39cbf91 100644
--- a/packages/vulcan-voting/lib/server/main.js
+++ b/packages/vulcan-voting/lib/server/main.js
@@ -1,5 +1,6 @@
 import './graphql.js';
 import './cron.js';
 import './scoring.js';
+import './indexes.js';
 
 export * from '../modules/index.js';

From 20caeb47fb569458250ec2e92e28b882393ddfc8 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Sat, 21 Oct 2017 12:47:58 +0900
Subject: [PATCH 21/69] Add before/after collection callbacks to run callback
 hooks either before or after the db insertion/update

---
 packages/vulcan-lib/lib/server/mutations.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/vulcan-lib/lib/server/mutations.js b/packages/vulcan-lib/lib/server/mutations.js
index 71acb9b00..01eb5efd7 100644
--- a/packages/vulcan-lib/lib/server/mutations.js
+++ b/packages/vulcan-lib/lib/server/mutations.js
@@ -83,12 +83,17 @@ export const newMutation = async ({ collection, document, currentUser, validate,
   // }
 
   // run sync callbacks
+  newDocument = await runCallbacks(`${collectionName}.new.before`, newDocument, currentUser);
   newDocument = await runCallbacks(`${collectionName}.new.sync`, newDocument, currentUser);
 
   // add _id to document
   newDocument._id = collection.insert(newDocument);
 
+  // run any post-operation sync callbacks
+  newDocument = await runCallbacks(`${collectionName}.new.after`, newDocument, currentUser);
+
   // get fresh copy of document from db
+  // TODO: not needed?
   const insertedDocument = collection.findOne(newDocument._id);
 
   // run async callbacks
@@ -154,6 +159,7 @@ export const editMutation = async ({ collection, documentId, set = {}, unset = {
   }
 
   // run sync callbacks (on mongo modifier)
+  modifier = await runCallbacks(`${collectionName}.edit.before`, modifier, document, currentUser);
   modifier = await runCallbacks(`${collectionName}.edit.sync`, modifier, document, currentUser);
 
   // remove empty modifiers
@@ -168,13 +174,16 @@ export const editMutation = async ({ collection, documentId, set = {}, unset = {
   collection.update(documentId, modifier, {removeEmptyStrings: false});
 
   // get fresh copy of document from db
-  const newDocument = collection.findOne(documentId);
+  let newDocument = collection.findOne(documentId);
 
   // clear cache if needed
   if (collection.loader) {
     collection.loader.clear(documentId);
   }
 
+  // run any post-operation sync callbacks
+  newDocument = await runCallbacks(`${collectionName}.edit.after`, newDocument, document, currentUser);
+
   // run async callbacks
   runCallbacksAsync(`${collectionName}.edit.async`, newDocument, document, currentUser, collection);
 

From 59ec044d04194c9a0cbd15c6dddb8c3504220b1f Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Sat, 21 Oct 2017 12:49:16 +0900
Subject: [PATCH 22/69] Make upvoting own posts/comments sync

---
 .../example-forum/lib/modules/comments/fragments.js    |  8 +++++++-
 .../lib/server/comments/callbacks/voting.js            |  5 +++--
 .../example-forum/lib/server/posts/callbacks/voting.js |  2 +-
 packages/vulcan-voting/lib/modules/make_voteable.js    |  2 ++
 packages/vulcan-voting/lib/modules/vote.js             | 10 +++++-----
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/packages/example-forum/lib/modules/comments/fragments.js b/packages/example-forum/lib/modules/comments/fragments.js
index 7b781295d..ce9764114 100644
--- a/packages/example-forum/lib/modules/comments/fragments.js
+++ b/packages/example-forum/lib/modules/comments/fragments.js
@@ -25,6 +25,12 @@ registerFragment(`
         ...UsersMinimumInfo
       }
     }
-    # vulcan:voting
+    # voting
+    currentUserVotes{
+      ...VoteFragment
+    }
+    baseScore
+    score
   }
 `);
+
diff --git a/packages/example-forum/lib/server/comments/callbacks/voting.js b/packages/example-forum/lib/server/comments/callbacks/voting.js
index 11bae5fc4..cbac25c23 100644
--- a/packages/example-forum/lib/server/comments/callbacks/voting.js
+++ b/packages/example-forum/lib/server/comments/callbacks/voting.js
@@ -9,7 +9,8 @@ import { performVoteServer } from 'meteor/vulcan:voting';
  */
 function CommentsNewUpvoteOwnComment(comment) {
   var commentAuthor = Users.findOne(comment.userId);
-  return {...comment, ...performVoteServer({ document: comment, voteType: 'upvote', collection: Comments, user: commentAuthor })};
+  const votedComent = performVoteServer({ document: comment, voteType: 'upvote', collection: Comments, user: commentAuthor })
+  return {...comment, ...votedComent};
 }
 
-addCallback('comments.new.async', CommentsNewUpvoteOwnComment);
\ No newline at end of file
+addCallback('comments.new.after', CommentsNewUpvoteOwnComment);
\ No newline at end of file
diff --git a/packages/example-forum/lib/server/posts/callbacks/voting.js b/packages/example-forum/lib/server/posts/callbacks/voting.js
index d238241db..0694ac821 100644
--- a/packages/example-forum/lib/server/posts/callbacks/voting.js
+++ b/packages/example-forum/lib/server/posts/callbacks/voting.js
@@ -17,4 +17,4 @@ function PostsNewUpvoteOwnPost(post) {
   return {...post, ...performVoteServer({ document: post, voteType: 'upvote', collection: Posts, user: postAuthor })};
 }
 
-addCallback('posts.new.async', PostsNewUpvoteOwnPost);
+addCallback('posts.new.after', PostsNewUpvoteOwnPost);
diff --git a/packages/vulcan-voting/lib/modules/make_voteable.js b/packages/vulcan-voting/lib/modules/make_voteable.js
index 735a6de83..1963a71fa 100644
--- a/packages/vulcan-voting/lib/modules/make_voteable.js
+++ b/packages/vulcan-voting/lib/modules/make_voteable.js
@@ -102,6 +102,7 @@ export const makeVoteable = collection => {
         optional: true,
         defaultValue: 0,
         viewableBy: ['guests'],
+        onInsert: () => 0
       }
     },
     /**
@@ -114,6 +115,7 @@ export const makeVoteable = collection => {
         optional: true,
         defaultValue: 0,
         viewableBy: ['guests'],
+        onInsert: () => 0
       }
     },
     /**
diff --git a/packages/vulcan-voting/lib/modules/vote.js b/packages/vulcan-voting/lib/modules/vote.js
index 3fb8deba0..86f2b4945 100644
--- a/packages/vulcan-voting/lib/modules/vote.js
+++ b/packages/vulcan-voting/lib/modules/vote.js
@@ -1,4 +1,4 @@
-import { runCallbacksAsync, runCallbacks, addCallback } from 'meteor/vulcan:core';
+import { debug, runCallbacksAsync, runCallbacks, addCallback } from 'meteor/vulcan:core';
 import { createError } from 'apollo-errors';
 import Votes from './votes/collection.js';
 import Users from 'meteor/vulcan:users';
@@ -268,10 +268,10 @@ export const performVoteServer = ({ documentId, document, voteType = 'upvote', c
   const collectionName = collection.options.collectionName;
   document = document || collection.findOne(documentId);
 
-  console.log('// performVoteMutation')
-  console.log('collectionName: ', collectionName)
-  console.log('document: ', document)
-  console.log('voteType: ', voteType)
+  debug('// performVoteMutation')
+  debug('collectionName: ', collectionName)
+  debug('document: ', document)
+  debug('voteType: ', voteType)
   
   const voteOptions = {document, collection, voteType, user, voteId};
 

From 50943f01dee6d80b816b82918832ed1a107cc580 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Sat, 21 Oct 2017 15:58:02 +0900
Subject: [PATCH 23/69] First pass at `/callbacks` dashboard

---
 .../lib/modules/default_mutations.js          | 300 ++++++++++++------
 .../vulcan-debug/lib/components/Callbacks.jsx |  31 ++
 .../lib/modules/callbacks/collection.js       |  19 ++
 .../lib/modules/callbacks/fragments.js        |  12 +
 .../lib/modules/callbacks/resolvers.js        |  26 ++
 .../lib/modules/callbacks/schema.js           |  63 ++++
 .../vulcan-debug/lib/modules/components.js    |   1 +
 packages/vulcan-debug/lib/modules/routes.js   |   1 +
 packages/vulcan-lib/lib/modules/callbacks.js  |  15 +
 packages/vulcan-lib/lib/server/mutations.js   |   1 +
 10 files changed, 365 insertions(+), 104 deletions(-)
 create mode 100644 packages/vulcan-debug/lib/components/Callbacks.jsx
 create mode 100644 packages/vulcan-debug/lib/modules/callbacks/collection.js
 create mode 100644 packages/vulcan-debug/lib/modules/callbacks/fragments.js
 create mode 100644 packages/vulcan-debug/lib/modules/callbacks/resolvers.js
 create mode 100644 packages/vulcan-debug/lib/modules/callbacks/schema.js

diff --git a/packages/vulcan-core/lib/modules/default_mutations.js b/packages/vulcan-core/lib/modules/default_mutations.js
index 2f4d3a178..8aa451e47 100644
--- a/packages/vulcan-core/lib/modules/default_mutations.js
+++ b/packages/vulcan-core/lib/modules/default_mutations.js
@@ -4,121 +4,213 @@ Default mutations
 
 */
 
-import { newMutation, editMutation, removeMutation, Utils } from 'meteor/vulcan:lib';
+import { registerCallback, newMutation, editMutation, removeMutation, Utils } from 'meteor/vulcan:lib';
 import Users from 'meteor/vulcan:users';
 
-export const getDefaultMutations = (collectionName, options = {}) => ({
+export const getDefaultMutations = (collectionName, options = {}) => {
 
-  // mutation for inserting a new document
+  // register callbacks for documentation purposes
+  registerCollectionCallbacks(collectionName);
 
-  new: {
-    
-    name: `${collectionName}New`,
-    
-    // check function called on a user to see if they can perform the operation
-    check(user, document) {
-      if (options.newCheck) {
-        return options.newCheck(user, document);
-      }
-      // if user is not logged in, disallow operation
-      if (!user) return false;
-      // else, check if they can perform "foo.new" operation (e.g. "movies.new")
-      return Users.canDo(user, `${collectionName.toLowerCase()}.new`);
-    },
-    
-    async mutation(root, {document}, context) {
+  return {
+
+    // mutation for inserting a new document
+
+    new: {
       
-      const collection = context[collectionName];
-
-      // check if current user can pass check function; else throw error
-      Utils.performCheck(this.check, context.currentUser, document);
-
-      // pass document to boilerplate newMutation function
-      return await newMutation({
-        collection,
-        document: document, 
-        currentUser: context.currentUser,
-        validate: true,
-        context,
-      });
-    },
-
-  },
-
-  // mutation for editing a specific document
-
-  edit: {
-    
-    name: `${collectionName}Edit`,
-    
-    // check function called on a user and document to see if they can perform the operation
-    check(user, document) {
-      if (options.editCheck) {
-        return options.editCheck(user, document);
-      }
-
-      if (!user || !document) return false;
-      // check if user owns the document being edited. 
-      // if they do, check if they can perform "foo.edit.own" action
-      // if they don't, check if they can perform "foo.edit.all" action
-      return Users.owns(user, document) ? Users.canDo(user, `${collectionName.toLowerCase()}.edit.own`) : Users.canDo(user, `${collectionName.toLowerCase()}.edit.all`);
-    },
-
-    async mutation(root, {documentId, set, unset}, context) {
-
-      const collection = context[collectionName];
-
-      // get entire unmodified document from database
-      const document = collection.findOne(documentId);
-
-      // check if user can perform operation; if not throw error
-      Utils.performCheck(this.check, context.currentUser, document);
-
-      // call editMutation boilerplate function
-      return await editMutation({
-        collection, 
-        documentId: documentId, 
-        set: set, 
-        unset: unset, 
-        currentUser: context.currentUser,
-        validate: true,
-        context,
-      });
-    },
-
-  },
-  
-  // mutation for removing a specific document (same checks as edit mutation)
-
-  remove: {
-
-    name: `${collectionName}Remove`,
-    
-    check(user, document) {
-      if (options.removeCheck) {
-        return options.removeCheck(user, document);
-      }
+      name: `${collectionName}New`,
       
-      if (!user || !document) return false;
-      return Users.owns(user, document) ? Users.canDo(user, `${collectionName.toLowerCase()}.remove.own`) : Users.canDo(user, `${collectionName.toLowerCase()}.remove.all`);
+      // check function called on a user to see if they can perform the operation
+      check(user, document) {
+        if (options.newCheck) {
+          return options.newCheck(user, document);
+        }
+        // if user is not logged in, disallow operation
+        if (!user) return false;
+        // else, check if they can perform "foo.new" operation (e.g. "movies.new")
+        return Users.canDo(user, `${collectionName.toLowerCase()}.new`);
+      },
+      
+      async mutation(root, {document}, context) {
+        
+        const collection = context[collectionName];
+
+        // check if current user can pass check function; else throw error
+        Utils.performCheck(this.check, context.currentUser, document);
+
+        // pass document to boilerplate newMutation function
+        return await newMutation({
+          collection,
+          document: document, 
+          currentUser: context.currentUser,
+          validate: true,
+          context,
+        });
+      },
+
+    },
+
+    // mutation for editing a specific document
+
+    edit: {
+      
+      name: `${collectionName}Edit`,
+      
+      // check function called on a user and document to see if they can perform the operation
+      check(user, document) {
+        if (options.editCheck) {
+          return options.editCheck(user, document);
+        }
+
+        if (!user || !document) return false;
+        // check if user owns the document being edited. 
+        // if they do, check if they can perform "foo.edit.own" action
+        // if they don't, check if they can perform "foo.edit.all" action
+        return Users.owns(user, document) ? Users.canDo(user, `${collectionName.toLowerCase()}.edit.own`) : Users.canDo(user, `${collectionName.toLowerCase()}.edit.all`);
+      },
+
+      async mutation(root, {documentId, set, unset}, context) {
+
+        const collection = context[collectionName];
+
+        // get entire unmodified document from database
+        const document = collection.findOne(documentId);
+
+        // check if user can perform operation; if not throw error
+        Utils.performCheck(this.check, context.currentUser, document);
+
+        // call editMutation boilerplate function
+        return await editMutation({
+          collection, 
+          documentId: documentId, 
+          set: set, 
+          unset: unset, 
+          currentUser: context.currentUser,
+          validate: true,
+          context,
+        });
+      },
+
     },
     
-    async mutation(root, {documentId}, context) {
+    // mutation for removing a specific document (same checks as edit mutation)
 
-      const collection = context[collectionName];
+    remove: {
 
-      const document = collection.findOne(documentId);
-      Utils.performCheck(this.check, context.currentUser, document, context);
+      name: `${collectionName}Remove`,
+      
+      check(user, document) {
+        if (options.removeCheck) {
+          return options.removeCheck(user, document);
+        }
+        
+        if (!user || !document) return false;
+        return Users.owns(user, document) ? Users.canDo(user, `${collectionName.toLowerCase()}.remove.own`) : Users.canDo(user, `${collectionName.toLowerCase()}.remove.all`);
+      },
+      
+      async mutation(root, {documentId}, context) {
+
+        const collection = context[collectionName];
+
+        const document = collection.findOne(documentId);
+        Utils.performCheck(this.check, context.currentUser, document, context);
+
+        return await removeMutation({
+          collection, 
+          documentId: documentId, 
+          currentUser: context.currentUser,
+          validate: true,
+          context,
+        });
+      },
 
-      return await removeMutation({
-        collection, 
-        documentId: documentId, 
-        currentUser: context.currentUser,
-        validate: true,
-        context,
-      });
     },
+  }
 
-  },
+};
 
-});
+
+const registerCollectionCallbacks = collectionName => {
+
+  collectionName = collectionName.toLowerCase();
+
+  registerCallback({
+    name: `${collectionName}.new.validate`, 
+    arguments: [{document: 'The document being inserted'}, {currentUser: 'The current user'}, {validationErrors: 'An object that can be used to accumulate validation errors'}], 
+    runs: 'sync', 
+    returns: 'document',
+    description: `Validate a document before insertion (can be skipped when inserting directly on server).`
+  });
+  registerCallback({
+    name: `${collectionName}.new.before`, 
+    arguments: [{document: 'The document being inserted'}, {currentUser: 'The current user'}], 
+    runs: 'sync', 
+    returns: 'document',
+    description: `Perform operations on a new document before it's inserted in the database.`
+  });
+  registerCallback({
+    name: `${collectionName}.new.after`, 
+    arguments: [{document: 'The document being inserted'}, {currentUser: 'The current user'}], 
+    runs: 'sync', 
+    returns: 'document',
+    description: `Perform operations on a new document after it's inserted in the database but *before* the mutation returns it.`
+  });
+  registerCallback({
+    name: `${collectionName}.new.async`, 
+    arguments: [{document: 'The document being inserted'}, {currentUser: 'The current user'}, {collection: 'The collection the document belongs to'}], 
+    runs: 'async', 
+    returns: null,
+    description: `Perform operations on a new document after it's inserted in the database asynchronously.`
+  });
+
+  registerCallback({
+    name: `${collectionName}.edit.validate`, 
+    arguments: [{modifier: 'The MongoDB modifier'}, {document: 'The document being inserted'}, {currentUser: 'The current user'}, {validationErrors: 'An object that can be used to accumulate validation errors'}], 
+    runs: 'sync', 
+    returns: 'modifier',
+    description: `Validate a document before update (can be skipped when updating directly on server).`
+  });
+  registerCallback({
+    name: `${collectionName}.edit.before`, 
+    arguments: [{modifier: 'The MongoDB modifier'}, {document: 'The document being inserted'}, {currentUser: 'The current user'}], 
+    runs: 'sync', 
+    returns: 'modifier',
+    description: `Perform operations on a document before it's updated in the database.`
+  });
+  registerCallback({
+    name: `${collectionName}.edit.after`, 
+    arguments: [{document: 'The document being inserted'}, {currentUser: 'The current user'}], 
+    runs: 'sync', 
+    returns: 'document',
+    description: `Perform operations on a document after it's updated in the database but *before* the mutation returns it.`
+  });
+  registerCallback({
+    name: `${collectionName}.edit.async`, 
+    arguments: [{document: 'The document being updated'}, {currentUser: 'The current user'}, {collection: 'The collection the document belongs to'}], 
+    runs: 'async', 
+    returns: null,
+    description: `Perform operations on a document after it's updated in the database asynchronously.`
+  });
+
+  registerCallback({
+    name: `${collectionName}.remove.validate`, 
+    arguments: [{document: 'The document being removed'}, {currentUser: 'The current user'}, {validationErrors: 'An object that can be used to accumulate validation errors'}], 
+    runs: 'sync', 
+    returns: 'document',
+    description: `Validate a document before removal (can be skipped when removing directly on server).`
+  });
+  registerCallback({
+    name: `${collectionName}.remove.before`, 
+    arguments: [{document: 'The document being removed'}, {currentUser: 'The current user'}], 
+    runs: 'sync', 
+    returns: null,
+    description: `Perform operations on a document before it's removed from the database.`
+  });
+  registerCallback({
+    name: `${collectionName}.new.async`, 
+    arguments: [{document: 'The document being removed'}, {currentUser: 'The current user'}, {collection: 'The collection the document belongs to'}], 
+    runs: 'async', 
+    returns: null,
+    description: `Perform operations on a document after it's removed from the database asynchronously.`
+  });
+}
\ No newline at end of file
diff --git a/packages/vulcan-debug/lib/components/Callbacks.jsx b/packages/vulcan-debug/lib/components/Callbacks.jsx
new file mode 100644
index 000000000..b158d1f8f
--- /dev/null
+++ b/packages/vulcan-debug/lib/components/Callbacks.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
+import { registerComponent, Components } from 'meteor/vulcan:lib';
+import Callbacks from '../modules/callbacks/collection.js';
+
+const CallbacksName = ({ document }) => 
+  <strong>{document.name}</strong>
+
+const CallbacksDashboard = props => 
+  <div className="settings">
+    <Components.Datatable
+      showSearch={false}
+      showEdit={false}
+      collection={Callbacks} 
+      options={{
+        fragmentName: 'CallbacksFragment'        
+      }}
+      columns={[
+        { name: 'name', component: CallbacksName }, 
+        'arguments', 
+        'returns', 
+        'runs', 
+        'description',
+        'hooks',
+      ]}
+    />
+  </div>
+
+registerComponent('Callbacks', CallbacksDashboard);
+
+export default Callbacks;
\ No newline at end of file
diff --git a/packages/vulcan-debug/lib/modules/callbacks/collection.js b/packages/vulcan-debug/lib/modules/callbacks/collection.js
new file mode 100644
index 000000000..ca30d4a7a
--- /dev/null
+++ b/packages/vulcan-debug/lib/modules/callbacks/collection.js
@@ -0,0 +1,19 @@
+import { createCollection } from 'meteor/vulcan:lib';
+import schema from './schema.js';
+import resolvers from './resolvers.js';
+import './fragments.js';
+
+const Callbacks = createCollection({
+
+  collectionName: 'Callbacks',
+
+  typeName: 'Callback',
+
+  schema,
+  
+  resolvers,
+
+});
+
+
+export default Callbacks;
diff --git a/packages/vulcan-debug/lib/modules/callbacks/fragments.js b/packages/vulcan-debug/lib/modules/callbacks/fragments.js
new file mode 100644
index 000000000..b0f706b5e
--- /dev/null
+++ b/packages/vulcan-debug/lib/modules/callbacks/fragments.js
@@ -0,0 +1,12 @@
+import { registerFragment } from 'meteor/vulcan:lib';
+
+registerFragment(`
+  fragment CallbacksFragment on Callback {
+    name
+    arguments
+    runs
+    returns
+    description
+    hooks
+  }
+`);
diff --git a/packages/vulcan-debug/lib/modules/callbacks/resolvers.js b/packages/vulcan-debug/lib/modules/callbacks/resolvers.js
new file mode 100644
index 000000000..4d2326a9e
--- /dev/null
+++ b/packages/vulcan-debug/lib/modules/callbacks/resolvers.js
@@ -0,0 +1,26 @@
+import { CallbackHooks } from 'meteor/vulcan:lib';
+
+const resolvers = {
+
+  list: {
+
+    name: 'CallbacksList',
+
+    resolver(root, {terms = {}}, context, info) {
+      return CallbackHooks;
+    },
+
+  },
+
+  total: {
+    
+    name: 'CallbacksTotal',
+    
+    resolver(root, {terms = {}}, context) {
+      return CallbackHooks.length;
+    },
+  
+  }
+};
+
+export default resolvers;
\ No newline at end of file
diff --git a/packages/vulcan-debug/lib/modules/callbacks/schema.js b/packages/vulcan-debug/lib/modules/callbacks/schema.js
new file mode 100644
index 000000000..86cc28bbe
--- /dev/null
+++ b/packages/vulcan-debug/lib/modules/callbacks/schema.js
@@ -0,0 +1,63 @@
+import { Callbacks } from 'meteor/vulcan:lib';
+
+const schema = {
+
+  name: {
+    label: 'Name',
+    type: String,
+    viewableBy: ['admins'],
+  },
+
+  arguments: {
+    label: 'Arguments',
+    type: Array,
+    viewableBy: ['admins'],
+  },
+
+  'arguments.$': {
+    type: Object,
+    viewableBy: ['admins'],
+  },
+
+  runs: {
+    label: 'Runs',
+    type: String,
+    viewableBy: ['admins'],
+  },
+
+  returns: {
+    label: 'Should Return',
+    type: String,
+    viewableBy: ['admins'],
+  },
+
+  description: {
+    label: 'Description',
+    type: String,
+    viewableBy: ['admins'],
+  },
+
+  hooks: {
+    label: 'Hooks',
+    type: Array,
+    viewableBy: ['admins'],
+    resolveAs: {
+      type: '[String]',
+      resolver: (callback) => {
+        console.log('// callback')
+        console.log(callback)
+        console.log(Callbacks[callback.name])
+        if (Callbacks[callback.name]) {
+          const callbacks = Callbacks[callback.name].map(f => f.name);
+          console.log(callbacks)
+          return callbacks;
+        } else {
+          return [];
+        }
+      }
+    }
+  }
+
+};
+
+export default schema;
diff --git a/packages/vulcan-debug/lib/modules/components.js b/packages/vulcan-debug/lib/modules/components.js
index 4e61994fe..017a9ea69 100644
--- a/packages/vulcan-debug/lib/modules/components.js
+++ b/packages/vulcan-debug/lib/modules/components.js
@@ -2,3 +2,4 @@
 import '../components/Emails.jsx';
 import '../components/Groups.jsx';
 import '../components/Settings.jsx';
+import '../components/Callbacks.jsx';
diff --git a/packages/vulcan-debug/lib/modules/routes.js b/packages/vulcan-debug/lib/modules/routes.js
index f1b85b835..1517f8590 100644
--- a/packages/vulcan-debug/lib/modules/routes.js
+++ b/packages/vulcan-debug/lib/modules/routes.js
@@ -4,6 +4,7 @@ addRoute([
   // {name: 'cheatsheet', path: '/cheatsheet', component: import('./components/Cheatsheet.jsx')},
   {name: 'groups', path: '/groups', component: () => getDynamicComponent(import('../components/Groups.jsx'))},
   {name: 'settings', path: '/settings', componentName: 'Settings'},
+  {name: 'settings', path: '/callbacks', componentName: 'Callbacks'},
   // {name: 'emails', path: '/emails', component: () => getDynamicComponent(import('./components/Emails.jsx'))},
   {name: 'emails', path: '/emails', componentName: 'Emails'},
 ]);
\ No newline at end of file
diff --git a/packages/vulcan-lib/lib/modules/callbacks.js b/packages/vulcan-lib/lib/modules/callbacks.js
index 698699271..26ba1a71a 100644
--- a/packages/vulcan-lib/lib/modules/callbacks.js
+++ b/packages/vulcan-lib/lib/modules/callbacks.js
@@ -1,11 +1,26 @@
 import { debug } from './debug.js';
 
+/**
+ * @summary A list of all registered callback hooks
+ */
+export const CallbackHooks = [];
+
 /**
  * @summary Callback hooks provide an easy way to add extra steps to common operations.
  * @namespace Callbacks
  */
 export const Callbacks = {};
 
+
+/**
+ * @summary Register a callback
+ * @param {String} hook - The name of the hook
+ * @param {Function} callback - The callback function
+ */
+export const registerCallback = function (callback) {
+  CallbackHooks.push(callback);
+};
+
 /**
  * @summary Add a callback function to a hook
  * @param {String} hook - The name of the hook
diff --git a/packages/vulcan-lib/lib/server/mutations.js b/packages/vulcan-lib/lib/server/mutations.js
index 01eb5efd7..9c3acd816 100644
--- a/packages/vulcan-lib/lib/server/mutations.js
+++ b/packages/vulcan-lib/lib/server/mutations.js
@@ -220,6 +220,7 @@ export const removeMutation = async ({ collection, documentId, currentUser, vali
     }
   }
 
+  await runCallbacks(`${collectionName}.remove.before`, document, currentUser);
   await runCallbacks(`${collectionName}.remove.sync`, document, currentUser);
 
   collection.remove(documentId);

From 3501a661eb3d91806c11e6fafb546744d6d1ad78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Mart=C3=ADn?= <codedeep@users.noreply.github.com>
Date: Mon, 23 Oct 2017 19:19:13 +0200
Subject: [PATCH 24/69] Add chalk library and change prestart

Add chalk library for color console. https://www.npmjs.com/package/chalk
---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8781f530e..ac97f9c17 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,16 @@
 {
   "name": "Vulcan",
-  "version": "1.2.0",
+  "version": "1.8.0",
   "engines": {
     "npm": "^3.0"
   },
   "scripts": {
-    "prestart": "sh prestart_vulcan.sh",
+    "prestart": "node prestart_vulcan.js",
     "start": "meteor --settings settings.json",
     "lint": "eslint --cache --ext .jsx,js packages"
   },
   "dependencies": {
+    "chalk": "2.2.0",    
     "analytics-node": "^2.1.1",
     "apollo-client": "^1.2.2",
     "apollo-errors": "^1.4.0",

From 5a29a030d28abfcebe6dbcd725b15b90ab60f073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Mart=C3=ADn?= <codedeep@users.noreply.github.com>
Date: Mon, 23 Oct 2017 19:21:49 +0200
Subject: [PATCH 25/69] prestart script vulcan cross-platform

Added prestart script vulcan cross-platform. Linux, MacOS and Windows
Add Logo of Vulcan framework and colors
---
 prestart_vulcan.js | 70 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 prestart_vulcan.js

diff --git a/prestart_vulcan.js b/prestart_vulcan.js
new file mode 100644
index 000000000..6fcb44e92
--- /dev/null
+++ b/prestart_vulcan.js
@@ -0,0 +1,70 @@
+#!/usr/bin/env node
+
+//Functions
+var fs         = require('fs');
+function existsSync(filePath){
+  try{
+    fs.statSync(filePath);
+  }catch(err){
+    if(err.code == 'ENOENT') return false;
+  }
+  return true;
+}
+
+function copySync(origin,target){
+  try{
+    fs.writeFileSync(target, fs.readFileSync(origin));
+  }catch(err){
+    if(err.code == 'ENOENT') return false;
+  }
+  return true;
+}
+
+//Add Definition Colors
+const chalk = require('chalk');
+
+//Vulkan letters
+console.log(chalk.gray(' ___  ___ '));
+console.log(chalk.gray(' '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.dim.yellow(String.fromCharCode(92))+chalk.gray(String.fromCharCode(92)+'/')+chalk.dim.yellow('/')+chalk.yellowBright('/')+chalk.gray('/'));
+console.log(chalk.gray('  '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.dim.yellow(String.fromCharCode(92))+chalk.dim.yellow('/')+chalk.yellowBright('/')+chalk.gray('/    Vulcan.js'));
+console.log(chalk.gray('   '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.yellowBright('/')+chalk.gray('/    The full-stack React+GraphQL framework'));
+console.log(chalk.gray('    ──     '));
+
+
+var os = require('os');
+var exec = require('child_process').execSync;
+var options = {
+  encoding: 'utf8'
+};
+//Check Meteor and install if not installed
+var checker = exec("meteor --version", options);
+if (!checker.includes("Meteor ")) {
+console.log("Vulcan requires Meteor but it's not installed. Trying to Install...");
+  //Check platform
+  if (os.platform()=='darwin') {
+    //Mac OS platform
+    console.log("🌋  "+chalk.bold.yellow("Good news you have a Mac and we will install it now! }"));
+    console.log(exec("curl https://install.meteor.com/ | bash", options));
+  } else if (os.platform()=='linux') {
+    //GNU/Linux platform
+    console.log("🌋  "+chalk.bold.yellow("Good news you are on  GNU/Linux platform and we will install Meteor now!"));
+    console.log(exec("curl https://install.meteor.com/ | bash", options));
+  } else if (os.platform()=='win32') {
+    //Windows NT platform
+      console.log(">  "+chalk.bold.yellow("Oh no! you are on a Windows platform and you will need to install Meteor Manually!"));
+      console.log(">  "+chalk.dim.yellow("Meteor for Windows is available at: ")+chalk.redBright("https://install.meteor.com/windows"));
+      process.exit(-1)
+  }
+} else {
+//Check exist file settings and create if not exist
+if (!existsSync("settings.json")) {
+  console.log(">  "+chalk.bold.yellow("Creating your own settings.json file...\n"));
+  if (!copySync("sample_settings.json","settings.json")) {
+    console.log(">  "+chalk.bold.red("Error Creating your own settings.json file...check files and permissions\n"));
+    process.exit(-1);
+  }
+}
+
+  console.log(">  "+chalk.bold.yellow("Happy hacking with Vulcan!"));
+  console.log(">  "+chalk.dim.yellow("The docs are available at: ")+chalk.redBright("http://docs.vulcanjs.org"));
+}

From 793ec88f0235d29e1e2fbf8f5d88f639c4cdcf90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Mart=C3=ADn?= <codedeep@users.noreply.github.com>
Date: Mon, 23 Oct 2017 19:22:20 +0200
Subject: [PATCH 26/69] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f335dc4f7..45c23ab8d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Vulcan (formerly Telescope)
 
-[Version 1.6.0](https://github.com/TelescopeJS/Telescope/releases)
+[Version 1.8.0](https://github.com/TelescopeJS/Telescope/releases)
 
 This is the Apollo/GraphQL version of Telescope, now known as [Vulcan](http://vulcanjs.org). [You can find the documentation here](http://docs.vulcanjs.org/).
 

From cd2bc586c7767387b92fed8aa28c8eb269e87fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Mart=C3=ADn?= <codedeep@users.noreply.github.com>
Date: Mon, 23 Oct 2017 19:26:33 +0200
Subject: [PATCH 27/69] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 45c23ab8d..a50904eaf 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Vulcan (formerly Telescope)
 
-[Version 1.8.0](https://github.com/TelescopeJS/Telescope/releases)
+[Version 1.8.0](https://github.com/VulcanJS/Vulcan/releases)
 
 This is the Apollo/GraphQL version of Telescope, now known as [Vulcan](http://vulcanjs.org). [You can find the documentation here](http://docs.vulcanjs.org/).
 

From f118d0a374d15094cfba5d72fd2b700b45280cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Mart=C3=ADn?= <codedeep@users.noreply.github.com>
Date: Mon, 23 Oct 2017 19:49:56 +0200
Subject: [PATCH 28/69] Corrected Logo Vulkan

---
 prestart_vulcan.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/prestart_vulcan.js b/prestart_vulcan.js
index 6fcb44e92..33747d47c 100644
--- a/prestart_vulcan.js
+++ b/prestart_vulcan.js
@@ -24,11 +24,11 @@ function copySync(origin,target){
 const chalk = require('chalk');
 
 //Vulkan letters
-console.log(chalk.gray(' ___  ___ '));
-console.log(chalk.gray(' '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.dim.yellow(String.fromCharCode(92))+chalk.gray(String.fromCharCode(92)+'/')+chalk.dim.yellow('/')+chalk.yellowBright('/')+chalk.gray('/'));
-console.log(chalk.gray('  '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.dim.yellow(String.fromCharCode(92))+chalk.dim.yellow('/')+chalk.yellowBright('/')+chalk.gray('/    Vulcan.js'));
-console.log(chalk.gray('   '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.yellowBright('/')+chalk.gray('/    The full-stack React+GraphQL framework'));
-console.log(chalk.gray('    ──     '));
+console.log(chalk.gray(' ___    ___ '));
+console.log(chalk.gray(' '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.dim.yellow(String.fromCharCode(92))+chalk.gray(String.fromCharCode(92)+'  /')+chalk.dim.yellow('/')+chalk.yellowBright('/')+chalk.gray('/'));
+console.log(chalk.gray('  '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.dim.yellow(String.fromCharCode(92))+chalk.gray(String.fromCharCode(92))+chalk.gray('/')+chalk.dim.yellow('/')+chalk.yellowBright('/')+chalk.gray('/    Vulcan.js'));
+console.log(chalk.gray('   '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.dim.yellow(String.fromCharCode(92))+chalk.dim.yellow('/')+chalk.yellowBright('/')+chalk.gray('/    The full-stack React+GraphQL framework'));
+console.log(chalk.gray('    ────     '));
 
 
 var os = require('os');

From 78308f6810eb5456fc3ea57e00313abdc1c4394b Mon Sep 17 00:00:00 2001
From: Discordius <panisnecis@gmail.com>
Date: Wed, 25 Oct 2017 04:45:21 -0700
Subject: [PATCH 29/69] Improved speed of vote score updates (Mongo aggregator
 + bulkwrite)

---
 packages/vulcan-voting/lib/server/cron.js    |  26 +++--
 packages/vulcan-voting/lib/server/scoring.js | 102 +++++++++++++++++++
 2 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/packages/vulcan-voting/lib/server/cron.js b/packages/vulcan-voting/lib/server/cron.js
index aba95fcb0..e5e376e47 100644
--- a/packages/vulcan-voting/lib/server/cron.js
+++ b/packages/vulcan-voting/lib/server/cron.js
@@ -1,5 +1,5 @@
 import { getSetting, registerSetting, debug } from 'meteor/vulcan:core';
-import { updateScore } from './scoring.js';
+import { /*updateScore,*/ batchUpdateScore } from './scoring.js';
 import { VoteableCollections } from '../modules/make_voteable.js';
 
 registerSetting('voting.scoreUpdateInterval', 60, 'How often to update scores, in seconds');
@@ -14,28 +14,32 @@ Meteor.startup(function () {
     VoteableCollections.forEach(collection => {
 
       // active items get updated every N seconds
-      Meteor.setInterval(function () {
+      Meteor.setInterval(async function () {
 
-        let updatedDocuments = 0;
+        // let updatedDocuments = 0;
 
         // console.log('tick ('+scoreInterval+')');
-        collection.find({'inactive': {$ne : true}}).forEach(document => {
-          updatedDocuments += updateScore({collection, item: document});
-        });
+        // collection.find({'inactive': {$ne : true}}).forEach(document => {
+        //   updatedDocuments += updateScore({collection, item: document});
+        // });
+
+        const updatedDocuments = await batchUpdateScore(collection, false, false);
 
         debug(`[vulcan:voting] Updated scores for ${updatedDocuments} active documents in collection ${collection.options.collectionName}`)
 
       }, scoreInterval * 1000);
 
       // inactive items get updated every hour
-      Meteor.setInterval(function () {
+      Meteor.setInterval(async function () {
 
 
-        let updatedDocuments = 0;
+        // let updatedDocuments = 0;
+        //
+        // collection.find({'inactive': true}).forEach(document => {
+        //   updatedDocuments += updateScore({collection, item: document});
+        // });
 
-        collection.find({'inactive': true}).forEach(document => {
-          updatedDocuments += updateScore({collection, item: document});
-        });
+        const updatedDocuments = await batchUpdateScore(collection, true, false);
 
         debug(`[vulcan:voting] Updated scores for ${updatedDocuments} inactive documents in collection ${collection.options.collectionName}`)
 
diff --git a/packages/vulcan-voting/lib/server/scoring.js b/packages/vulcan-voting/lib/server/scoring.js
index 1955e6157..29544f072 100644
--- a/packages/vulcan-voting/lib/server/scoring.js
+++ b/packages/vulcan-voting/lib/server/scoring.js
@@ -57,3 +57,105 @@ export const updateScore = ({collection, item, forceUpdate}) => {
   }
   return 0;
 };
+
+export const batchUpdateScore = async (collection, inactive = false, forceUpdate = false) => {
+  // n =  number of days after which a single vote will not have a big enough effect to trigger a score update
+  //      and posts can become inactive
+  const n = 30;
+  // x = score increase amount of a single vote after n days (for n=100, x=0.000040295)
+  const x = 1/Math.pow(n*24+2,1.3);
+  // time decay factor
+  const f = 1.3
+  const itemsPromise = collection.rawCollection().aggregate([
+    {
+      $match: {
+        $and: [
+          {postedAt: {$exists: true}},
+          {postedAt: {$lte: new Date()}},
+          {inactive: inactive ? true : {$ne: true}}
+        ]
+      }
+    },
+    {
+      $project: {
+        postedAt: 1,
+        baseScore: 1,
+        score: 1,
+        newScore: {
+          $divide: [
+            "$baseScore",
+              {
+                $pow: [
+                  {
+                    $add: [
+                      {
+                        $divide: [
+                          {
+                            $subtract: [new Date(), "$postedAt"] // Age in miliseconds
+                          },
+                          60 * 60 * 1000
+                        ]
+                      }, // Age in hours
+                      2
+                    ]
+                  },
+                  f
+                ]
+              }
+            ]
+        }
+      }
+    },
+    {
+      $project: {
+        postedAt: 1,
+        baseScore: 1,
+        score: 1,
+        newScore: 1,
+        scoreDiffSignificant: {
+          $gt: [
+            {$abs: {$subtract: ["$score", "$newScore"]}},
+            x
+          ]
+        },
+        oldEnough: { // Only set a post as inactive if it's older than n days
+          $gt: [
+            {$divide: [
+              {
+                $subtract: [new Date(), "$postedAt"] // Difference in miliseconds
+              },
+              60 * 60 * 1000 //Difference in hours
+            ]},
+            n*24]
+        }
+      }
+    },
+  ])
+
+  const items = await itemsPromise;
+  const itemsArray = await items.toArray();
+  let updatedDocumentsCounter = 0;
+  const itemUpdates = _.compact(itemsArray.map(i => {
+    if (forceUpdate || i.scoreDiffSignificant) {
+      updatedDocumentsCounter++;
+      return {
+        updateOne: {
+          filter: {_id: i._id},
+          update: {$set: {score: i.newScore, inactive: false}},
+          upsert: false,
+        }
+      }
+    } else if (i.oldEnough) {
+      // only set a post as inactive if it's older than n days
+      return {
+        updateOne: {
+          filter: {_id: i._id},
+          update: {$set: {inactive: true}},
+          upsert: false,
+        }
+      }
+    }
+  }))
+  if (itemUpdates && itemUpdates.length) {await collection.rawCollection().bulkWrite(itemUpdates, {ordered: false});}
+  return updatedDocumentsCounter;
+}

From 2fa0405dfadf6e28fb4bc7ec9c6df555a1fde403 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Thu, 26 Oct 2017 11:27:22 +0900
Subject: [PATCH 30/69] Use Express instead of Picker for /stripe route; add
 webhook verification

---
 .../lib/server/integrations/stripe.js         | 194 +++++++++++++-----
 1 file changed, 147 insertions(+), 47 deletions(-)

diff --git a/packages/vulcan-payments/lib/server/integrations/stripe.js b/packages/vulcan-payments/lib/server/integrations/stripe.js
index a3b9b6424..85aff4c58 100644
--- a/packages/vulcan-payments/lib/server/integrations/stripe.js
+++ b/packages/vulcan-payments/lib/server/integrations/stripe.js
@@ -6,6 +6,7 @@ import bodyParser from 'body-parser';
 import Charges from '../../modules/charges/collection.js';
 import Users from 'meteor/vulcan:users';
 import { Products } from '../../modules/products.js';
+import { webAppConnectHandlersUse } from 'meteor/vulcan:core';
 
 registerSetting('stripe', null, 'Stripe settings');
 
@@ -243,81 +244,180 @@ export const subscribeUser = async ({user, customer, product, collection, docume
 
 /*
 
-Webhooks with Picker
+Webhooks with Express
 
 */
 
-// const app = express()
+// see https://github.com/stripe/stripe-node/blob/master/examples/webhook-signing/express.js
 
+const app = express()
 
-// app.post('/stripe', function(req, res) {
-//   // Retrieve the request's body and parse it as JSON
-//   console.log('////////////// stripe webhook')
+// Add the raw text body of the request to the `request` object
+function addRawBody(req, res, next) {
+  req.setEncoding('utf8');
 
-//   var event_json = JSON.parse(req.body);
+  var data = '';
 
-//   console.log(event_json)
+  req.on('data', function(chunk) {
+    data += chunk;
+  });
 
-//   res.send(200);
-// });
+  req.on('end', function() {
+    req.rawBody = data;
 
-Picker.middleware(bodyParser.json());
+    next();
+  });
+}
 
-Picker.route('/stripe', async function(params, req, res, next) {
+app.use(addRawBody);
+
+app.post('/stripe', async function(req, res) {
 
   console.log('////////////// stripe webhook')
 
-  const body = req.body;
+  const sig = req.headers['stripe-signature'];
 
+  try {
 
-   // Retrieve the request's body and parse it as JSON
-   switch (body.type) {
+    const event = stripe.webhooks.constructEvent(req.rawBody, sig, stripeSettings.endpointSecret);
 
-    case 'charge.succeeded':
+    console.log('event ///////////////////')
+    console.log(event)
 
-      console.log('////// charge body')
-      console.log(body)
+    switch (event.type) {
 
-      const charge = body.data.object;
+      case 'charge.succeeded':
 
-      try {
+        console.log('////// charge succeeded')
 
-        // look up corresponding invoice
-        const invoice = await stripe.invoices.retrieve(body.data.object.invoice);
-        console.log('////// invoice')
+        const charge = event.data.object;
 
-        // look up corresponding subscription
-        const subscription = await stripe.subscriptions.retrieve(invoice.subscription);
-        console.log('////// subscription')
-        console.log(subscription)
+        console.log(charge)
 
-        const { userId, productKey, associatedCollection, associatedId } = subscription.metadata;
+        try {
 
-        if (associatedCollection && associatedId) {
-          const collection = _.findWhere(Collections, {_name: associatedCollection});
-          const document = collection.findOne(associatedId);
+          // look up corresponding invoice
+          const invoice = await stripe.invoices.retrieve(charge.invoice);
+          console.log('////// invoice')
+          console.log(invoice)
 
-          const args = {
-            userId, 
-            productKey,
-            associatedCollection,
-            associatedId,
-            livemode: subscription.livemode,
-          }
+          // look up corresponding subscription
+          const subscription = await stripe.subscriptions.retrieve(invoice.subscription);
+          console.log('////// subscription')
+          console.log(subscription)
 
-          processCharge({ collection, document, charge, args});
+          const { userId, productKey, associatedCollection, associatedId } = subscription.metadata;
 
-        }      
-      } catch (error) {
-        console.log('// Stripe webhook error')
-        console.log(error)
-      }
+          if (associatedCollection && associatedId) {
+            const collection = _.findWhere(Collections, {_name: associatedCollection});
+            const document = collection.findOne(associatedId);
 
-      break;
+            const args = {
+              userId, 
+              productKey,
+              associatedCollection,
+              associatedId,
+              livemode: subscription.livemode,
+            }
 
-   }
+            processCharge({ collection, document, charge, args});
 
-  res.statusCode = 200;
-  res.end();
+          }      
+        } catch (error) {
+          console.log('// Stripe webhook error')
+          console.log(error)
+        }
 
+        break;
+
+     }
+
+  } catch (error) {
+    console.log('///// Stripe webhook error')
+    console.log(error)
+  }
+
+  res.sendStatus(200);
 });
+
+webAppConnectHandlersUse(Meteor.bindEnvironment(app), {name: 'stripe_endpoint', order: 100});
+
+// Picker.middleware(bodyParser.json());
+
+// Picker.route('/stripe', async function(params, req, res, next) {
+
+//   console.log('////////////// stripe webhook')
+
+//   console.log(req)
+//   const sig = req.headers['stripe-signature'];
+//   const body = req.body;
+
+//   console.log('sig ///////////////////')
+//   console.log(sig)
+
+//   console.log('body ///////////////////')
+//   console.log(body)
+
+//   console.log('rawBody ///////////////////')
+//   console.log(req.rawBody)
+
+//   try {
+//     const event = stripe.webhooks.constructEvent(req.rawBody, sig, stripeSettings.endpointSecret);
+//     console.log('event ///////////////////')
+//     console.log(event)
+//   } catch (error) {
+//     console.log('///// Stripe webhook error')
+//     console.log(error)
+//   }
+
+//    // Retrieve the request's body and parse it as JSON
+//    switch (body.type) {
+
+//     case 'charge.succeeded':
+
+//       console.log('////// charge succeeded')
+//       // console.log(body)
+
+//       const charge = body.data.object;
+
+//       try {
+
+//         // look up corresponding invoice
+//         const invoice = await stripe.invoices.retrieve(body.data.object.invoice);
+//         console.log('////// invoice')
+
+//         // look up corresponding subscription
+//         const subscription = await stripe.subscriptions.retrieve(invoice.subscription);
+//         console.log('////// subscription')
+//         console.log(subscription)
+
+//         const { userId, productKey, associatedCollection, associatedId } = subscription.metadata;
+
+//         if (associatedCollection && associatedId) {
+//           const collection = _.findWhere(Collections, {_name: associatedCollection});
+//           const document = collection.findOne(associatedId);
+
+//           const args = {
+//             userId, 
+//             productKey,
+//             associatedCollection,
+//             associatedId,
+//             livemode: subscription.livemode,
+//           }
+
+//           processCharge({ collection, document, charge, args});
+
+//         }      
+//       } catch (error) {
+//         console.log('// Stripe webhook error')
+//         console.log(error)
+//       }
+
+//       break;
+
+//    }
+
+//   res.statusCode = 200;
+//   res.end();
+
+// });

From 6dd521a9b10eebbffe0f9d3205d5c5be4639e9db Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Thu, 26 Oct 2017 16:04:26 +0900
Subject: [PATCH 31/69] Add EditButton core component

---
 .../lib/modules/components/EditButton.jsx.js  | 20 +++++++++++++++++++
 packages/vulcan-core/lib/modules/index.js     |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 packages/vulcan-core/lib/modules/components/EditButton.jsx.js

diff --git a/packages/vulcan-core/lib/modules/components/EditButton.jsx.js b/packages/vulcan-core/lib/modules/components/EditButton.jsx.js
new file mode 100644
index 000000000..143a635da
--- /dev/null
+++ b/packages/vulcan-core/lib/modules/components/EditButton.jsx.js
@@ -0,0 +1,20 @@
+import { Components, registerComponent } from 'meteor/vulcan:lib';
+import React from 'react';
+import Button from 'react-bootstrap/lib/Button';
+import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
+
+const EditButton = ({ collection, document, bsStyle = 'primary' }, {intl}) =>
+  <Components.ModalTrigger 
+    label={intl.formatMessage({id: 'datatable.edit'})} 
+    component={<Button bsStyle={bsStyle}><FormattedMessage id="datatable.edit" /></Button>}
+  >
+    <Components.DatatableEditForm collection={collection} document={document} />
+  </Components.ModalTrigger>
+
+EditButton.contextTypes = {
+  intl: intlShape
+};
+
+EditButton.displayName = 'EditButton';
+
+registerComponent('EditButton', EditButton);
\ No newline at end of file
diff --git a/packages/vulcan-core/lib/modules/index.js b/packages/vulcan-core/lib/modules/index.js
index 9c4f9dac3..ae49d8996 100644
--- a/packages/vulcan-core/lib/modules/index.js
+++ b/packages/vulcan-core/lib/modules/index.js
@@ -12,6 +12,7 @@ export { default as Icon } from "./components/Icon.jsx";
 export { default as Loading } from "./components/Loading.jsx";
 export { default as ShowIf } from "./components/ShowIf.jsx";
 export { default as ModalTrigger } from './components/ModalTrigger.jsx';
+export { default as EditButton } from './components/EditButton.jsx';
 export { default as Error404 } from './components/Error404.jsx';
 export { default as DynamicLoading } from './components/DynamicLoading.jsx';
 export { default as HeadTags } from './components/HeadTags.jsx';

From 5ae75f6d626a3c52d0b283376999a6c4822a93a8 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Tue, 31 Oct 2017 10:18:16 +0900
Subject: [PATCH 32/69] Add initial cost support to subscriptions; handle
 erroneous stripe customer ids

---
 .../lib/server/integrations/stripe.js         | 74 ++++++++++++-------
 1 file changed, 49 insertions(+), 25 deletions(-)

diff --git a/packages/vulcan-payments/lib/server/integrations/stripe.js b/packages/vulcan-payments/lib/server/integrations/stripe.js
index 85aff4c58..881b377f0 100644
--- a/packages/vulcan-payments/lib/server/integrations/stripe.js
+++ b/packages/vulcan-payments/lib/server/integrations/stripe.js
@@ -54,26 +54,7 @@ export const performAction = async (args) => {
   // get the user performing the transaction
   const user = Users.findOne(userId);
 
-  let customer;
-
-  if (user.stripeCustomerId) {
-    // if user has a stripe id already, retrieve customer from Stripe
-    customer = await stripe.customers.retrieve(user.stripeCustomerId);
-  } else {
-    // else create new Stripe customer
-    customer = await stripe.customers.create({
-      email: token.email,
-      source: token.id
-    });
-
-    // add stripe customer id to user object
-    await editMutation({
-      collection: Users,
-      documentId: user._id,
-      set: {stripeCustomerId: customer.id},
-      validate: false
-    });
-  }
+  const customer = await getCustomer(user, token.id);
 
   // create metadata object
   const metadata = {
@@ -102,6 +83,41 @@ export const performAction = async (args) => {
 
 /*
 
+Retrieve or create a Stripe customer
+
+*/
+export const getCustomer = async (user, id) => {
+
+  let customer;
+
+  try {
+    
+    // try retrieving customer from Stripe
+    customer = await stripe.customers.retrieve(user.stripeCustomerId);
+
+  } catch (error) {
+    
+    // if user doesn't have a stripeCustomerId; or if id doesn't match up with Stripe
+    // create new customer object
+    const customerOptions = { email: user.email };
+    if (id) { customerOptions.source = id; }
+    customer = await stripe.customers.create(customerOptions);
+
+    // add stripe customer id to user object
+    await editMutation({
+      collection: Users,
+      documentId: user._id,
+      set: {stripeCustomerId: customer.id},
+      validate: false
+    });
+    
+  }
+
+  return customer;
+}
+
+/*
+
 Create one-time charge. 
 
 */
@@ -222,11 +238,19 @@ Subscribe a user to a Stripe plan
 
 */
 export const subscribeUser = async ({user, customer, product, collection, document, metadata, args }) => {
-
-  console.log('////////////// subscribeUser')
-  console.log(product)
-
   try {
+    // if product has an initial cost, 
+    // create an invoice item and attach it to the customer first
+    // see https://stripe.com/docs/subscriptions/invoices#adding-invoice-items
+    if (product.initialAmount) {
+      const initialInvoiceItem = await stripe.invoiceItems.create({
+        customer: customer.id,
+        amount: product.initialAmount,
+        currency: product.currency,
+        description: product.initialAmountDescription,
+      });
+    }
+
     const subscription = await stripe.subscriptions.create({
       customer: customer.id,
       items: [
@@ -234,7 +258,7 @@ export const subscribeUser = async ({user, customer, product, collection, docume
       ],
       metadata,
     });
-    console.log(subscription)
+
   } catch (error) {
     console.log('// Stripe subscribeUser error')
     console.log(error)

From 1ab3e4e022ff94bdfa0e76df930d0eebb4d66a10 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Tue, 31 Oct 2017 10:19:21 +0900
Subject: [PATCH 33/69] package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 11449e617..1efb53597 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "apollo-errors": "^1.4.0",
     "babel-runtime": "^6.18.0",
     "bcrypt": "^0.8.7",
-    "body-parser": "^1.15.2",
+    "body-parser": "^1.18.2",
     "classnames": "^2.2.3",
     "cookie-parser": "^1.4.3",
     "cross-fetch": "^0.0.8",

From 33296c1421589ccd3870521472eb5585f6ec5b5c Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Wed, 1 Nov 2017 15:37:57 +0900
Subject: [PATCH 34/69] Add fetchPolicy and propertyName options to withList
 and withDocument

---
 .../lib/modules/containers/withDocument.js         | 11 +++++++++--
 .../vulcan-core/lib/modules/containers/withList.js | 14 +++++++++++---
 .../vulcan-forms/lib/components/FormWrapper.jsx    |  1 +
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/vulcan-core/lib/modules/containers/withDocument.js b/packages/vulcan-core/lib/modules/containers/withDocument.js
index 96f9c645a..8e1fd4380 100644
--- a/packages/vulcan-core/lib/modules/containers/withDocument.js
+++ b/packages/vulcan-core/lib/modules/containers/withDocument.js
@@ -33,17 +33,24 @@ export default function withDocument (options) {
     alias: 'withDocument',
     
     options(ownProps) {
-      return {
+      const graphQLOptions = {
         variables: { documentId: ownProps.documentId, slug: ownProps.slug },
         pollInterval, // note: pollInterval can be set to 0 to disable polling (20s by default)
       };
+
+      if (options.fetchPolicy) {
+        graphQLOptions.fetchPolicy = options.fetchPolicy;
+      }
+
+      return graphQLOptions;
     },
     props: returnedProps => {
       const { ownProps, data } = returnedProps;
+      const propertyName = options.propertyName || 'document';
       return {
         loading: data.loading,
         // document: Utils.convertDates(collection, data[singleResolverName]),
-        document: data[singleResolverName],
+        [ propertyName ]: data[singleResolverName],
         fragmentName,
         fragment,
       };
diff --git a/packages/vulcan-core/lib/modules/containers/withList.js b/packages/vulcan-core/lib/modules/containers/withList.js
index 3e683cbae..943cd6439 100644
--- a/packages/vulcan-core/lib/modules/containers/withList.js
+++ b/packages/vulcan-core/lib/modules/containers/withList.js
@@ -106,7 +106,8 @@ const withList = (options) => {
         options({terms, paginationTerms, client: apolloClient}) {
           // get terms from options, then props, then pagination
           const mergedTerms = {...options.terms, ...terms, ...paginationTerms};
-          return {
+
+          const graphQLOptions = {
             variables: {
               terms: mergedTerms,
             },
@@ -119,6 +120,12 @@ const withList = (options) => {
             
             },
           };
+
+          if (options.fetchPolicy) {
+            graphQLOptions.fetchPolicy = options.fetchPolicy
+          }
+          
+          return graphQLOptions;
         },
 
         // define props returned by graphql HoC
@@ -130,7 +137,8 @@ const withList = (options) => {
                 totalCount = props.data[totalResolverName],
                 networkStatus = props.data.networkStatus,
                 loading = props.data.loading,
-                error = props.data.error;
+                error = props.data.error,
+                propertyName = options.propertyName || 'results';
 
           if (error) {
             console.log(error);
@@ -140,7 +148,7 @@ const withList = (options) => {
             // see https://github.com/apollostack/apollo-client/blob/master/src/queries/store.ts#L28-L36
             // note: loading will propably change soon https://github.com/apollostack/apollo-client/issues/831
             loading: networkStatus === 1,
-            results,
+            [ propertyName ]: results,
             totalCount,
             refetch,
             networkStatus,
diff --git a/packages/vulcan-forms/lib/components/FormWrapper.jsx b/packages/vulcan-forms/lib/components/FormWrapper.jsx
index 3ab78f520..206d2585b 100644
--- a/packages/vulcan-forms/lib/components/FormWrapper.jsx
+++ b/packages/vulcan-forms/lib/components/FormWrapper.jsx
@@ -136,6 +136,7 @@ class FormWrapper extends PureComponent {
       queryName: `${prefix}FormQuery`,
       collection: this.props.collection,
       fragment: this.getFragments().queryFragment,
+      fetchPolicy: 'network-only' // we always want to load a fresh copy of the document
     };
 
     // options for withNew, withEdit, and withRemove HoCs

From 3950c2b891b81a0db686e45617c2400cb3aebdda Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Wed, 1 Nov 2017 15:38:10 +0900
Subject: [PATCH 35/69] Handle initialAmount in Checkout component

---
 .../vulcan-payments/lib/components/Checkout.jsx    |  3 ++-
 .../lib/server/integrations/stripe.js              | 14 --------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/packages/vulcan-payments/lib/components/Checkout.jsx b/packages/vulcan-payments/lib/components/Checkout.jsx
index 6a5b65c86..91566dd27 100644
--- a/packages/vulcan-payments/lib/components/Checkout.jsx
+++ b/packages/vulcan-payments/lib/components/Checkout.jsx
@@ -72,7 +72,8 @@ class Checkout extends React.Component {
     const definedProduct = Products[productKey];
     const product = typeof definedProduct === 'function' ? definedProduct(this.props.associatedDocument) : definedProduct || sampleProduct;
 
-    let amount = product.amount;
+    // if product has initial amount, add it to amount (for subscription products)
+    let amount = product.initialAmount ? product.initialAmount + product.amount : product.amount;
 
     if (coupon && product.coupons && product.coupons[coupon]) {
       amount -= product.coupons[coupon];
diff --git a/packages/vulcan-payments/lib/server/integrations/stripe.js b/packages/vulcan-payments/lib/server/integrations/stripe.js
index 881b377f0..41940ee19 100644
--- a/packages/vulcan-payments/lib/server/integrations/stripe.js
+++ b/packages/vulcan-payments/lib/server/integrations/stripe.js
@@ -220,20 +220,6 @@ export const processCharge = async ({collection, document, charge, args}) => {
 
 /*
 
-Create new subscription plan
-
-*/
-export const createPlan = async (options) => {
-  try {
-    await stripe.plans.create(options);
-  } catch (error) {
-    console.log('// Stripe createPlan error')
-    console.log(error)
-  }
-}
-
-/*
-
 Subscribe a user to a Stripe plan
 
 */

From f9ccef64ca1075565a770742f4b925a704495330 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Fri, 3 Nov 2017 11:40:53 +0900
Subject: [PATCH 36/69] Add new Time component; add new 'default' form schema
 option

---
 packages/vulcan-forms/lib/components/Form.jsx |  6 +-
 .../lib/components/FormComponent.jsx          |  3 +
 .../lib/components/bootstrap/Time.jsx         | 73 +++++++++++++++++++
 .../vulcan-forms/lib/modules/components.js    |  1 +
 packages/vulcan-lib/lib/modules/config.js     |  1 +
 5 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 packages/vulcan-forms/lib/components/bootstrap/Time.jsx

diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx
index 32b20b0af..1309d706d 100644
--- a/packages/vulcan-forms/lib/components/Form.jsx
+++ b/packages/vulcan-forms/lib/components/Form.jsx
@@ -153,9 +153,13 @@ class Form extends Component {
       }
 
       // replace empty value, which has not been prefilled, by the default value from the schema
-      if (fieldSchema.defaultValue && field.value === "") {
+      // keep defaultValue for backwards compatibility even though it doesn't actually work
+      if (fieldSchema.defaultValue && (typeof field.value === 'undefined' || field.value === '')) {
         field.value = fieldSchema.defaultValue;
       }
+      if (fieldSchema.default && (typeof field.value === 'undefined' || field.value === '')) {
+        field.value = fieldSchema.default;
+      }
 
       // add options if they exist
       if (fieldSchema.form && fieldSchema.form.options) {
diff --git a/packages/vulcan-forms/lib/components/FormComponent.jsx b/packages/vulcan-forms/lib/components/FormComponent.jsx
index f9c4bc41c..2e1cc468a 100644
--- a/packages/vulcan-forms/lib/components/FormComponent.jsx
+++ b/packages/vulcan-forms/lib/components/FormComponent.jsx
@@ -98,6 +98,9 @@ class FormComponent extends PureComponent {
         case 'datetime':
           return <Components.FormComponentDateTime {...properties} />;
         
+        case 'time':
+          return <Components.FormComponentTime {...properties} />;
+        
         case 'text':
           return <Components.FormComponentDefault {...properties}/>;
         
diff --git a/packages/vulcan-forms/lib/components/bootstrap/Time.jsx b/packages/vulcan-forms/lib/components/bootstrap/Time.jsx
new file mode 100644
index 000000000..8051c4dbf
--- /dev/null
+++ b/packages/vulcan-forms/lib/components/bootstrap/Time.jsx
@@ -0,0 +1,73 @@
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
+import DateTimePicker from 'react-datetime';
+import { registerComponent } from 'meteor/vulcan:core';
+
+class Time extends PureComponent {
+  
+  constructor(props) {
+    super(props);
+    this.updateDate = this.updateDate.bind(this);
+  }
+
+  // when the datetime picker has mounted, SmartForm will catch the date value (no formsy mixin in this component)
+  componentDidMount() {
+    if (this.props.value) {
+      this.updateDate(this.props.value);
+    }
+  }
+
+  updateDate(mDate) {
+    // if this is a properly formatted moment date, update time
+    if (typeof mDate === 'object') {
+      this.context.updateCurrentValues({[this.props.name]: mDate.format('HH:mm')});
+    }
+  }
+
+  render() {
+
+    const date = new Date();
+
+    // transform time string into date object to work inside datetimepicker
+    const time = this.props.value;
+    if (time) {
+      date.setHours(parseInt(time.substr(0,2)), parseInt(time.substr(3,5)));
+    } else {
+      date.setHours(0,0);
+    }
+
+    return (
+      <div className="form-group row">
+        <label className="control-label col-sm-3">{this.props.label}</label>
+        <div className="col-sm-9">
+          <DateTimePicker
+            value={date}
+            viewMode="time"
+            dateFormat={false}
+            timeFormat="HH:mm"
+            // newDate argument is a Moment object given by react-datetime
+            onChange={newDate => this.updateDate(newDate)}
+            inputProps={{name: this.props.name}}
+          />
+        </div>
+      </div>
+    );
+  }
+}
+
+Time.propTypes = {
+  control: PropTypes.any,
+  datatype: PropTypes.any,
+  group: PropTypes.any,
+  label: PropTypes.string,
+  name: PropTypes.string,
+  value: PropTypes.any,
+};
+
+Time.contextTypes = {
+  updateCurrentValues: PropTypes.func,
+};
+
+export default Time;
+
+registerComponent('FormComponentTime', Time);
\ No newline at end of file
diff --git a/packages/vulcan-forms/lib/modules/components.js b/packages/vulcan-forms/lib/modules/components.js
index 2fa5ae1be..df9b3e833 100644
--- a/packages/vulcan-forms/lib/modules/components.js
+++ b/packages/vulcan-forms/lib/modules/components.js
@@ -7,6 +7,7 @@ import '../components/bootstrap/Number.jsx';
 import '../components/bootstrap/Radiogroup.jsx';
 import '../components/bootstrap/Select.jsx';
 import '../components/bootstrap/Textarea.jsx';
+import '../components/bootstrap/Time.jsx';
 import '../components/bootstrap/Url.jsx';
 
 import '../components/Flash.jsx';
diff --git a/packages/vulcan-lib/lib/modules/config.js b/packages/vulcan-lib/lib/modules/config.js
index b03c736a6..cc320363e 100644
--- a/packages/vulcan-lib/lib/modules/config.js
+++ b/packages/vulcan-lib/lib/modules/config.js
@@ -32,6 +32,7 @@ SimpleSchema.extendOptions([
   'resolveAs',
   'limit',
   'searchable',
+  'default',
 ]);
 
 export default Vulcan;

From 712f258a7cc0df3cc0be964fb32ffd2e2c859d4e Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Fri, 3 Nov 2017 11:41:12 +0900
Subject: [PATCH 37/69] make pollInterval globally configurable via a setting

---
 packages/vulcan-core/lib/modules/containers/withDocument.js | 4 ++--
 packages/vulcan-core/lib/modules/containers/withList.js     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/vulcan-core/lib/modules/containers/withDocument.js b/packages/vulcan-core/lib/modules/containers/withDocument.js
index 8e1fd4380..b1d67833a 100644
--- a/packages/vulcan-core/lib/modules/containers/withDocument.js
+++ b/packages/vulcan-core/lib/modules/containers/withDocument.js
@@ -1,11 +1,11 @@
 import React, { PropTypes, Component } from 'react';
 import { graphql } from 'react-apollo';
 import gql from 'graphql-tag';
-import { getFragment, getFragmentName } from 'meteor/vulcan:core';
+import { getSetting, getFragment, getFragmentName } from 'meteor/vulcan:core';
 
 export default function withDocument (options) {
   
-  const { collection, pollInterval = 20000 } = options,
+  const { collection, pollInterval = getSetting('pollInterval', 20000) } = options,
         queryName = options.queryName || `${collection.options.collectionName}SingleQuery`,
         singleResolverName = collection.options.resolvers.single && collection.options.resolvers.single.name;
 
diff --git a/packages/vulcan-core/lib/modules/containers/withList.js b/packages/vulcan-core/lib/modules/containers/withList.js
index 943cd6439..732839e20 100644
--- a/packages/vulcan-core/lib/modules/containers/withList.js
+++ b/packages/vulcan-core/lib/modules/containers/withList.js
@@ -38,7 +38,7 @@ import React, { PropTypes, Component } from 'react';
 import { withApollo, graphql } from 'react-apollo';
 import gql from 'graphql-tag';
 import update from 'immutability-helper';
-import { getFragment, getFragmentName } from 'meteor/vulcan:core';
+import { getSetting, getFragment, getFragmentName } from 'meteor/vulcan:core';
 import Mingo from 'mingo';
 import compose from 'recompose/compose';
 import withState from 'recompose/withState';
@@ -47,7 +47,7 @@ const withList = (options) => {
 
   // console.log(options)
   
-  const { collection, limit = 10, pollInterval = 20000, totalResolver = true } = options,
+  const { collection, limit = 10, pollInterval = getSetting('pollInterval', 20000), totalResolver = true } = options,
         queryName = options.queryName || `${collection.options.collectionName}ListQuery`,
         listResolverName = collection.options.resolvers.list && collection.options.resolvers.list.name,
         totalResolverName = collection.options.resolvers.total && collection.options.resolvers.total.name;

From 7accd7c6aebad82868fa78b081e193d56c5b59cd Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Wed, 8 Nov 2017 10:06:01 +0900
Subject: [PATCH 38/69] improve calback documentation; fix edit validation
 issue; add postedAt callback

---
 .../lib/server/posts/callbacks/other.js       | 14 +++++++++--
 .../lib/modules/default_mutations.js          | 10 ++++----
 packages/vulcan-lib/lib/modules/validation.js | 24 +++++++++----------
 packages/vulcan-lib/lib/server/mutations.js   | 10 ++++----
 4 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/packages/example-forum/lib/server/posts/callbacks/other.js b/packages/example-forum/lib/server/posts/callbacks/other.js
index 0bcf9aa7e..ce7fdf4b9 100644
--- a/packages/example-forum/lib/server/posts/callbacks/other.js
+++ b/packages/example-forum/lib/server/posts/callbacks/other.js
@@ -96,7 +96,7 @@ Posts.increaseClicks = (post, ip) => {
     const existingClickEvent = Events.findOne({name: 'click', 'properties.postId': post._id, 'properties.ip': ip});
 
     if(!existingClickEvent) {
-      Events.log(clickEvent);
+      // Events.log(clickEvent); // Sidebar only: don't log event
       return Posts.update(post._id, { $inc: { clickCount: 1 }});
     }
   } else {
@@ -112,4 +112,14 @@ function PostsClickTracking(post, ip) {
 // note: this event is not sent to segment cause we cannot access the current user 
 // in our server-side route /out -> sending an event would create a new anonymous 
 // user: the free limit of 1,000 unique users per month would be reached quickly
-addCallback('posts.click.async', PostsClickTracking);
\ No newline at end of file
+addCallback('posts.click.async', PostsClickTracking);
+
+//////////////////////////////////////////////////////
+// posts.approve.sync                              //
+//////////////////////////////////////////////////////
+
+function PostsApprovedSetPostedAt (modifier, post) {
+  modifier.postedAt = new Date();
+  return modifier;
+}
+addCallback('posts.approve.sync', PostsApprovedSetPostedAt);
diff --git a/packages/vulcan-core/lib/modules/default_mutations.js b/packages/vulcan-core/lib/modules/default_mutations.js
index 8aa451e47..ebee4bf45 100644
--- a/packages/vulcan-core/lib/modules/default_mutations.js
+++ b/packages/vulcan-core/lib/modules/default_mutations.js
@@ -165,28 +165,28 @@ const registerCollectionCallbacks = collectionName => {
 
   registerCallback({
     name: `${collectionName}.edit.validate`, 
-    arguments: [{modifier: 'The MongoDB modifier'}, {document: 'The document being inserted'}, {currentUser: 'The current user'}, {validationErrors: 'An object that can be used to accumulate validation errors'}], 
+    arguments: [{modifier: 'The MongoDB modifier'}, {document: 'The document being edited'}, {currentUser: 'The current user'}, {validationErrors: 'An object that can be used to accumulate validation errors'}], 
     runs: 'sync', 
     returns: 'modifier',
     description: `Validate a document before update (can be skipped when updating directly on server).`
   });
   registerCallback({
     name: `${collectionName}.edit.before`, 
-    arguments: [{modifier: 'The MongoDB modifier'}, {document: 'The document being inserted'}, {currentUser: 'The current user'}], 
+    arguments: [{modifier: 'The MongoDB modifier'}, {document: 'The document being edited'}, {currentUser: 'The current user'}], 
     runs: 'sync', 
     returns: 'modifier',
     description: `Perform operations on a document before it's updated in the database.`
   });
   registerCallback({
     name: `${collectionName}.edit.after`, 
-    arguments: [{document: 'The document being inserted'}, {currentUser: 'The current user'}], 
+    arguments: [{modifier: 'The MongoDB modifier'}, {document: 'The document being edited'}, {currentUser: 'The current user'}], 
     runs: 'sync', 
     returns: 'document',
     description: `Perform operations on a document after it's updated in the database but *before* the mutation returns it.`
   });
   registerCallback({
     name: `${collectionName}.edit.async`, 
-    arguments: [{document: 'The document being updated'}, {currentUser: 'The current user'}, {collection: 'The collection the document belongs to'}], 
+    arguments: [{newDocument: 'The document after the edit', document: 'The document before the edit'}, {currentUser: 'The current user'}, {collection: 'The collection the document belongs to'}], 
     runs: 'async', 
     returns: null,
     description: `Perform operations on a document after it's updated in the database asynchronously.`
@@ -207,7 +207,7 @@ const registerCollectionCallbacks = collectionName => {
     description: `Perform operations on a document before it's removed from the database.`
   });
   registerCallback({
-    name: `${collectionName}.new.async`, 
+    name: `${collectionName}.remove.async`, 
     arguments: [{document: 'The document being removed'}, {currentUser: 'The current user'}, {collection: 'The collection the document belongs to'}], 
     runs: 'async', 
     returns: null,
diff --git a/packages/vulcan-lib/lib/modules/validation.js b/packages/vulcan-lib/lib/modules/validation.js
index d516b6ee0..09dd3e175 100644
--- a/packages/vulcan-lib/lib/modules/validation.js
+++ b/packages/vulcan-lib/lib/modules/validation.js
@@ -47,7 +47,6 @@ export const validateDocument = (document, collection, context) => {
 
     const fieldSchema = schema[fieldName];
 
-    
     if ((fieldSchema.required || !fieldSchema.optional) && typeof document[fieldName] === 'undefined') {
       validationErrors.push({
         id: 'app.required_field_missing', 
@@ -56,7 +55,7 @@ export const validateDocument = (document, collection, context) => {
     }
 
   });
-
+  
   // 5. still run SS validation for now for backwards compatibility
   try {
     collection.simpleSchema().validate(document);
@@ -123,19 +122,20 @@ export const validateModifier = (modifier, document, collection, context) => {
   });
 
   // 4. check that required fields have a value
-  // note: maybe required fields don't make sense for edit operation?
-  // _.keys(schema).forEach(fieldName => {
+  // when editing, we only want to require fields that are actually part of the form
+  // so we make sure required keys are present in the $unset object
+  _.keys(schema).forEach(fieldName => {
 
-  //   const fieldSchema = schema[fieldName];
+    const fieldSchema = schema[fieldName];
 
-  //   if ((fieldSchema.required || !fieldSchema.optional) && typeof set[fieldName] === 'undefined') {
-  //     validationErrors.push({
-  //       id: 'app.required_field_missing', 
-  //       data: {fieldName}
-  //     });
-  //   }
+    if (unset[fieldName] && (fieldSchema.required || !fieldSchema.optional) && typeof set[fieldName] === 'undefined') {
+      validationErrors.push({
+        id: 'app.required_field_missing', 
+        data: {fieldName}
+      });
+    }
 
-  // });
+  });
 
   // 5. still run SS validation for now for backwards compatibility
   try {
diff --git a/packages/vulcan-lib/lib/server/mutations.js b/packages/vulcan-lib/lib/server/mutations.js
index 9c3acd816..2e499a74d 100644
--- a/packages/vulcan-lib/lib/server/mutations.js
+++ b/packages/vulcan-lib/lib/server/mutations.js
@@ -123,9 +123,9 @@ export const editMutation = async ({ collection, documentId, set = {}, unset = {
   debug('// editMutation');
   debug('// collectionName: ', collection._name);
   debug('// documentId: ', documentId);
-  debug('// set: ', set);
-  debug('// unset: ', unset);
-  debug('// document: ', document);
+  // debug('// set: ', set);
+  // debug('// unset: ', unset);
+  // debug('// document: ', document);
 
   if (validate) {
 
@@ -134,6 +134,8 @@ export const editMutation = async ({ collection, documentId, set = {}, unset = {
     modifier = runCallbacks(`${collectionName}.edit.validate`, modifier, document, currentUser, validationErrors);
 
     if (validationErrors.length) {
+      console.log('// validationErrors')
+      console.log(validationErrors)
       const EditDocumentValidationError = createError('app.validation_error', {message: 'app.edit_document_validation_error'});
       throw new EditDocumentValidationError({data: {break: true, errors: validationErrors}});
     }
@@ -189,7 +191,7 @@ export const editMutation = async ({ collection, documentId, set = {}, unset = {
 
   debug('// edit mutation finished')
   debug('// modifier: ', modifier)
-  debug('// newDocument: ', newDocument)
+  debug('// edited document: ', newDocument)
   debug('//------------------------------------//');
 
   return newDocument;

From aec4c0ae69158dff7307ca41cebdf3c36b1c9cd2 Mon Sep 17 00:00:00 2001
From: SachaG <sacha@Sachas-MacBook-Pro-2.local>
Date: Thu, 9 Nov 2017 10:00:56 +0900
Subject: [PATCH 39/69] Add Datatable emptyState prop

---
 .../lib/modules/components/Datatable.jsx      | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/packages/vulcan-core/lib/modules/components/Datatable.jsx b/packages/vulcan-core/lib/modules/components/Datatable.jsx
index 664d016d9..f9481b289 100644
--- a/packages/vulcan-core/lib/modules/components/Datatable.jsx
+++ b/packages/vulcan-core/lib/modules/components/Datatable.jsx
@@ -112,10 +112,12 @@ DatatableContents Component
 */
 
 const DatatableContents = (props) => {
-  const {collection, columns, results, loading, loadMore, count, totalCount, networkStatus, showEdit, currentUser} = props;
+  const {collection, columns, results, loading, loadMore, count, totalCount, networkStatus, showEdit, currentUser, emptyState} = props;
   
   if (loading) {
     return <Components.Loading />;
+  } else if (!results.length) {
+    return emptyState || null;
   }
 
   const isLoadingMore = networkStatus === 2;
@@ -123,26 +125,26 @@ const DatatableContents = (props) => {
 
   return (
     <div className="datatable-list">
-      <table className="table">
-        <thead>
-          <tr>
-            {_.sortBy(columns, column => column.order).map((column, index) => <Components.DatatableHeader key={index} collection={collection} column={column}/>)}
-            {showEdit ? <th><FormattedMessage id="datatable.edit"/></th> : null}
-          </tr>
-        </thead>
-        <tbody>
-          {results.map((document, index) => <Components.DatatableRow collection={collection} columns={columns} document={document} key={index} showEdit={showEdit} currentUser={currentUser}/>)}
-        </tbody>
-      </table>
-      <div className="admin-users-load-more">
-        {hasMore ? 
-          isLoadingMore ? 
-            <Components.Loading/> 
-            : <Button bsStyle="primary" onClick={e => {e.preventDefault(); loadMore();}}>Load More ({count}/{totalCount})</Button> 
-          : null
-        }
+        <table className="table">
+          <thead>
+            <tr>
+              {_.sortBy(columns, column => column.order).map((column, index) => <Components.DatatableHeader key={index} collection={collection} column={column}/>)}
+              {showEdit ? <th><FormattedMessage id="datatable.edit"/></th> : null}
+            </tr>
+          </thead>
+          <tbody>
+            {results.map((document, index) => <Components.DatatableRow collection={collection} columns={columns} document={document} key={index} showEdit={showEdit} currentUser={currentUser}/>)}
+          </tbody>
+        </table>
+        <div className="admin-users-load-more">
+          {hasMore ? 
+            isLoadingMore ? 
+              <Components.Loading/> 
+              : <Button bsStyle="primary" onClick={e => {e.preventDefault(); loadMore();}}>Load More ({count}/{totalCount})</Button> 
+            : null
+          }
+        </div>
       </div>
-    </div>
   )
 }
 registerComponent('DatatableContents', DatatableContents);

From 9e959b96c6db7bd0248d4d460bfe3a110550ba60 Mon Sep 17 00:00:00 2001
From: SachaG <sacha@Sachas-MacBook-Pro-2.local>
Date: Thu, 9 Nov 2017 10:01:22 +0900
Subject: [PATCH 40/69] Add repeatErrors prop to Forms

---
 packages/vulcan-forms/lib/components/Form.jsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx
index 1309d706d..98c941fe3 100644
--- a/packages/vulcan-forms/lib/components/Form.jsx
+++ b/packages/vulcan-forms/lib/components/Form.jsx
@@ -619,9 +619,13 @@ class Form extends Component {
           disabled={this.state.disabled}
           ref="form"
         >
+
           {this.renderErrors()}
+        
           {fieldGroups.map(group => <Components.FormGroup key={group.name} {...group} updateCurrentValues={this.updateCurrentValues} />)}
-  
+    
+          {this.props.repeatErrors && this.renderErrors()}
+
           <Components.FormSubmit submitLabel={this.props.submitLabel}
                                  cancelLabel={this.props.cancelLabel}
                                  cancelCallback={this.props.cancelCallback}
@@ -661,6 +665,7 @@ Form.propTypes = {
   showRemove: PropTypes.bool,
   submitLabel: PropTypes.string,
   cancelLabel: PropTypes.string,
+  repeatErrors: PropTypes.bool,
 
   // callbacks
   submitCallback: PropTypes.func,
@@ -674,7 +679,8 @@ Form.propTypes = {
 }
 
 Form.defaultProps = {
-  layout: "horizontal",
+  layout: 'horizontal',
+  repeatErrors: false,
 }
 
 Form.contextTypes = {

From 41b585adfa045f3902a41259c13f9a478743bb72 Mon Sep 17 00:00:00 2001
From: SachaG <sacha@Sachas-MacBook-Pro-2.local>
Date: Thu, 9 Nov 2017 10:01:51 +0900
Subject: [PATCH 41/69] Move form's wrapped component instantiation to
 constructor

---
 .../lib/components/FormWrapper.jsx            | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/vulcan-forms/lib/components/FormWrapper.jsx b/packages/vulcan-forms/lib/components/FormWrapper.jsx
index 206d2585b..dacb192bf 100644
--- a/packages/vulcan-forms/lib/components/FormWrapper.jsx
+++ b/packages/vulcan-forms/lib/components/FormWrapper.jsx
@@ -35,6 +35,13 @@ import { withDocument } from 'meteor/vulcan:core';
 
 class FormWrapper extends PureComponent {
 
+  constructor(props) {
+    super(props);
+    // instantiate the wrapped component in constructor, not in render
+    // see https://reactjs.org/docs/higher-order-components.html#dont-use-hocs-inside-the-render-method
+    this.FormComponent = this.getComponent();
+  }
+
   // return the current schema based on either the schema or collection prop
   getSchema() {
     return this.props.schema ? this.props.schema : Utils.stripTelescopeNamespace(this.props.collection.simpleSchema()._schema);
@@ -108,13 +115,7 @@ class FormWrapper extends PureComponent {
     };
   }
 
-  shouldComponentUpdate(nextProps) {
-    // prevent extra re-renderings for unknown reasons
-    // re-render only if the document selector changes
-    return nextProps.slug !== this.props.slug || nextProps.documentId !== this.props.documentId;
-  }
-
-  render() {
+  getComponent() {
 
     // console.log(this)
 
@@ -181,6 +182,16 @@ class FormWrapper extends PureComponent {
     
     }
   }
+
+  shouldComponentUpdate(nextProps) {
+    // prevent extra re-renderings for unknown reasons
+    // re-render only if the document selector changes
+    return nextProps.slug !== this.props.slug || nextProps.documentId !== this.props.documentId;
+  }
+
+  render() {
+    return this.FormComponent;
+  }
 }
 
 FormWrapper.propTypes = {

From f52aae1afcc06d09c321648f2ec505523e43eab9 Mon Sep 17 00:00:00 2001
From: SachaG <sacha@Sachas-MacBook-Pro-2.local>
Date: Thu, 9 Nov 2017 10:02:00 +0900
Subject: [PATCH 42/69] Get oAuth config using getSetting

---
 packages/vulcan-lib/lib/server/oauth_config.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/vulcan-lib/lib/server/oauth_config.js b/packages/vulcan-lib/lib/server/oauth_config.js
index d0693b0e7..cf3c42f54 100644
--- a/packages/vulcan-lib/lib/server/oauth_config.js
+++ b/packages/vulcan-lib/lib/server/oauth_config.js
@@ -1,4 +1,6 @@
-const services = Meteor.settings.oAuth;
+import { getSetting } from '../modules/settings.js';
+
+const services = getSetting('oAuth');
 
 if (services) {
   _.keys(services).forEach(serviceName => {

From 296a363c13fe355e2ae1a40c2810f59e6791f0d2 Mon Sep 17 00:00:00 2001
From: Martin Bramwell <martinhbramwell@gmail.com>
Date: Fri, 10 Nov 2017 11:05:31 -0500
Subject: [PATCH 43/69] Bug (#1770): Corrects the invocation of PicsNewForm
 component

Signed-off-by: Martin Bramwell <martinhbramwell@gmail.com>
---
 packages/example-instagram/lib/components/common/Header.jsx | 6 +++---
 .../example-membership/lib/components/common/Header.jsx     | 6 +++---
 .../example-permissions/lib/components/common/Header.jsx    | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/example-instagram/lib/components/common/Header.jsx b/packages/example-instagram/lib/components/common/Header.jsx
index 09f4c49ce..da2883252 100644
--- a/packages/example-instagram/lib/components/common/Header.jsx
+++ b/packages/example-instagram/lib/components/common/Header.jsx
@@ -11,7 +11,7 @@ component (if the "component" prop is specified).
 import React from 'react';
 import { registerComponent, Components, withCurrentUser } from 'meteor/vulcan:core';
 import Users from 'meteor/vulcan:users';
-import PicsNewForm from '../pics/PicsNewForm';
+// import PicsNewForm from '../pics/PicsNewForm';
 
 // navigation bar component when the user is logged in
 
@@ -33,7 +33,7 @@ const NavLoggedIn = ({currentUser}) =>
       </div>
 
       <Components.ModalTrigger label="Upload">
-        <PicsNewForm />
+        <Components.PicsNewForm />
       </Components.ModalTrigger>
 
   </div>
@@ -71,4 +71,4 @@ const Header = ({currentUser}) =>
 
   </div>
 
-registerComponent('Header', Header, withCurrentUser);
\ No newline at end of file
+registerComponent('Header', Header, withCurrentUser);
diff --git a/packages/example-membership/lib/components/common/Header.jsx b/packages/example-membership/lib/components/common/Header.jsx
index 09f4c49ce..da2883252 100644
--- a/packages/example-membership/lib/components/common/Header.jsx
+++ b/packages/example-membership/lib/components/common/Header.jsx
@@ -11,7 +11,7 @@ component (if the "component" prop is specified).
 import React from 'react';
 import { registerComponent, Components, withCurrentUser } from 'meteor/vulcan:core';
 import Users from 'meteor/vulcan:users';
-import PicsNewForm from '../pics/PicsNewForm';
+// import PicsNewForm from '../pics/PicsNewForm';
 
 // navigation bar component when the user is logged in
 
@@ -33,7 +33,7 @@ const NavLoggedIn = ({currentUser}) =>
       </div>
 
       <Components.ModalTrigger label="Upload">
-        <PicsNewForm />
+        <Components.PicsNewForm />
       </Components.ModalTrigger>
 
   </div>
@@ -71,4 +71,4 @@ const Header = ({currentUser}) =>
 
   </div>
 
-registerComponent('Header', Header, withCurrentUser);
\ No newline at end of file
+registerComponent('Header', Header, withCurrentUser);
diff --git a/packages/example-permissions/lib/components/common/Header.jsx b/packages/example-permissions/lib/components/common/Header.jsx
index 881876f54..647db5063 100644
--- a/packages/example-permissions/lib/components/common/Header.jsx
+++ b/packages/example-permissions/lib/components/common/Header.jsx
@@ -11,7 +11,7 @@ component (if the "component" prop is specified).
 import React from 'react';
 import { registerComponent, Components, withCurrentUser } from 'meteor/vulcan:core';
 import Users from 'meteor/vulcan:users';
-import PicsNewForm from '../pics/PicsNewForm';
+// import PicsNewForm from '../pics/PicsNewForm';
 
 // navigation bar component when the user is logged in
 
@@ -34,7 +34,7 @@ const NavLoggedIn = ({currentUser}) =>
 
       {Users.canDo(currentUser, 'pics.new') ?
         <Components.ModalTrigger label="Upload">
-          <PicsNewForm />
+          <Components.PicsNewForm />
         </Components.ModalTrigger>
         : null
       }

From e9acedd00a761aadca0c943f17312ee7ad3df03b Mon Sep 17 00:00:00 2001
From: Erik Schannen <erikschannen@gmail.com>
Date: Fri, 10 Nov 2017 15:35:01 -0500
Subject: [PATCH 44/69] - Pass all properties of fieldSchema.form on to the
 form component - Restore missing delete link

---
 packages/vulcan-forms/lib/components/Form.jsx    | 16 +++++++++-------
 .../vulcan-forms/lib/components/FormSubmit.jsx   | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx
index 98c941fe3..713a8667d 100644
--- a/packages/vulcan-forms/lib/components/Form.jsx
+++ b/packages/vulcan-forms/lib/components/Form.jsx
@@ -170,13 +170,15 @@ class Form extends Component {
           field.value = _.where(field.options, {checked: true}).map(option => option.value);
         }
       }
-
-      if (fieldSchema.form && fieldSchema.form.disabled) {
-        field.disabled = typeof fieldSchema.form.disabled === "function" ? fieldSchema.form.disabled.call(fieldSchema) : fieldSchema.form.disabled;
-      }
-
-      if (fieldSchema.form && fieldSchema.form.help) {
-        field.help = typeof fieldSchema.form.help === "function" ? fieldSchema.form.help.call(fieldSchema) : fieldSchema.form.help;
+      
+      if (fieldSchema.form) {
+        for (const prop in fieldSchema.form) {
+          if (prop !== 'prefill' && prop !== 'options' && fieldSchema.form.hasOwnProperty(prop)) {
+            field[prop] = typeof fieldSchema.form[prop] === "function" ?
+              fieldSchema.form[prop].call(fieldSchema) :
+              fieldSchema.form[prop];
+          }
+        }
       }
 
       // add limit
diff --git a/packages/vulcan-forms/lib/components/FormSubmit.jsx b/packages/vulcan-forms/lib/components/FormSubmit.jsx
index 58aac8de3..ac0ae3e5f 100644
--- a/packages/vulcan-forms/lib/components/FormSubmit.jsx
+++ b/packages/vulcan-forms/lib/components/FormSubmit.jsx
@@ -33,6 +33,20 @@ const FormSubmit = ({
         null
     }
     
+    {
+      deleteDocument
+        ?
+        <div>
+          <hr/>
+          <a href="javascript:void()" onClick={deleteDocument}
+             className={`delete-link ${collectionName}-delete-link`}>
+            <Components.Icon name="close"/> <FormattedMessage id="forms.delete"/>
+          </a>
+        </div>
+        :
+        null
+    }
+  
   </div>
 );
 

From 1a33e91554699f9511d2e9c71be11eb1d8bdcc76 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Tue, 14 Nov 2017 10:49:13 +0900
Subject: [PATCH 45/69] Fix time component

---
 packages/vulcan-forms/lib/components/bootstrap/Time.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vulcan-forms/lib/components/bootstrap/Time.jsx b/packages/vulcan-forms/lib/components/bootstrap/Time.jsx
index 8051c4dbf..b06ca6e89 100644
--- a/packages/vulcan-forms/lib/components/bootstrap/Time.jsx
+++ b/packages/vulcan-forms/lib/components/bootstrap/Time.jsx
@@ -13,7 +13,7 @@ class Time extends PureComponent {
   // when the datetime picker has mounted, SmartForm will catch the date value (no formsy mixin in this component)
   componentDidMount() {
     if (this.props.value) {
-      this.updateDate(this.props.value);
+      this.context.updateCurrentValues({[this.props.name]: this.props.value});
     }
   }
 

From 319fbb914bb9edd4e3f892623d1fb771d5a20472 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Tue, 21 Nov 2017 10:03:11 +0900
Subject: [PATCH 46/69] Enable Apollo Engine integration (add
 'apolloEngine.apiKey' in settings.json)

---
 package-lock.json                             | 482 +++++++++++++++++-
 package.json                                  |   4 +-
 .../vulcan-lib/lib/server/apollo_server.js    |  21 +-
 3 files changed, 504 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e796d2df2..2117ba403 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,9 +1,224 @@
 {
   "name": "Vulcan",
-  "version": "1.2.0",
+  "version": "1.8.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "accepts": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
+      "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
+      "requires": {
+        "mime-types": "2.1.17",
+        "negotiator": "0.6.1"
+      }
+    },
+    "ajv": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.4.0.tgz",
+      "integrity": "sha1-MtHPCNvIDEMvQm8S4QslEfa0ZHQ=",
+      "requires": {
+        "co": "4.6.0",
+        "fast-deep-equal": "1.0.0",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
+      }
+    },
+    "apollo-engine": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/apollo-engine/-/apollo-engine-0.5.4.tgz",
+      "integrity": "sha512-91yqiM1fB33fjvcsIBICy8BUHh2cG9FAIrteCh9QaL7UwJ6aQMV5DSfjNhgP95DEZcPMggKQGLhbW156A7G0mg==",
+      "requires": {
+        "apollo-engine-binary-darwin": "0.2017.11-84-gb299b9188",
+        "apollo-engine-binary-linux": "0.2017.11-84-gb299b9188",
+        "apollo-engine-binary-windows": "0.2017.11-84-gb299b9188",
+        "request": "2.83.0",
+        "stream-line-wrapper": "0.1.1"
+      }
+    },
+    "apollo-engine-binary-darwin": {
+      "version": "0.2017.11-84-gb299b9188",
+      "resolved": "https://registry.npmjs.org/apollo-engine-binary-darwin/-/apollo-engine-binary-darwin-0.2017.11-84-gb299b9188.tgz",
+      "integrity": "sha512-8zKIFo6ldSwT1npHU4gjHMDEJQuN/CG3MCnx5xY5MGSSkqlqNZZ8njYgXe4qLEjewLMwRTXapcnCw7E2+H1RYQ==",
+      "optional": true
+    },
+    "apollo-engine-binary-linux": {
+      "version": "0.2017.11-84-gb299b9188",
+      "resolved": "https://registry.npmjs.org/apollo-engine-binary-linux/-/apollo-engine-binary-linux-0.2017.11-84-gb299b9188.tgz",
+      "integrity": "sha512-Y+DYYoR24yi73+Kt03Nr7IXNoMJw6faEgdUpysMdnkIdmqaFfcKj3KH0auzVBhPyVcJo+iRTKqXdnMzjnQxrsg==",
+      "optional": true
+    },
+    "apollo-engine-binary-windows": {
+      "version": "0.2017.11-84-gb299b9188",
+      "resolved": "https://registry.npmjs.org/apollo-engine-binary-windows/-/apollo-engine-binary-windows-0.2017.11-84-gb299b9188.tgz",
+      "integrity": "sha512-ecpP1HrlP+eb5mNQuz7ObzMWtGJA78UrPlzGRes1KiKJ/c8e1UrrAWI/wuI0Ry7fIKYA6dUzxJ4fHR5TEnMAVA==",
+      "optional": true
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "boom": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+      "requires": {
+        "hoek": "4.2.0"
+      }
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "compressible": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz",
+      "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=",
+      "requires": {
+        "mime-db": "1.30.0"
+      }
+    },
+    "compression": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz",
+      "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=",
+      "requires": {
+        "accepts": "1.3.4",
+        "bytes": "3.0.0",
+        "compressible": "2.0.12",
+        "debug": "2.6.9",
+        "on-headers": "1.0.1",
+        "safe-buffer": "5.1.1",
+        "vary": "1.1.2"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cryptiles": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+      "requires": {
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "1.0.0"
+      }
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
     "flat": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/flat/-/flat-4.0.0.tgz",
@@ -12,10 +227,275 @@
         "is-buffer": "1.1.5"
       }
     },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "1.0.0"
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "requires": {
+        "ajv": "5.4.0",
+        "har-schema": "2.0.0"
+      }
+    },
+    "hawk": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+      "requires": {
+        "boom": "4.3.1",
+        "cryptiles": "3.1.2",
+        "hoek": "4.2.0",
+        "sntp": "2.1.0"
+      }
+    },
+    "hoek": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.13.1"
+      }
+    },
     "is-buffer": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
       "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw="
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "mime-db": {
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
+    },
+    "mime-types": {
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+      "requires": {
+        "mime-db": "1.30.0"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+    },
+    "on-headers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+    },
+    "qs": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+    },
+    "request": {
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+      "requires": {
+        "aws-sign2": "0.7.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.1",
+        "har-validator": "5.0.3",
+        "hawk": "6.0.2",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.17",
+        "oauth-sign": "0.8.2",
+        "performance-now": "2.1.0",
+        "qs": "6.5.1",
+        "safe-buffer": "5.1.1",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.1.0"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+    },
+    "sntp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
+      "requires": {
+        "hoek": "4.2.0"
+      }
+    },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "stream-line-wrapper": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/stream-line-wrapper/-/stream-line-wrapper-0.1.1.tgz",
+      "integrity": "sha1-Pivh02jGNW+Qru9keGaD8+7j7qc=",
+      "requires": {
+        "async": "0.2.10"
+      }
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+    },
+    "tough-cookie": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "optional": true
+    },
+    "uuid": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 8818e9eb8..b46541c90 100644
--- a/package.json
+++ b/package.json
@@ -10,14 +10,16 @@
     "lint": "eslint --cache --ext .jsx,js packages"
   },
   "dependencies": {
-    "chalk": "2.2.0",    
     "analytics-node": "^2.1.1",
     "apollo-client": "^1.2.2",
+    "apollo-engine": "^0.5.4",
     "apollo-errors": "^1.4.0",
     "babel-runtime": "^6.18.0",
     "bcrypt": "^0.8.7",
     "body-parser": "^1.18.2",
+    "chalk": "2.2.0",
     "classnames": "^2.2.3",
+    "compression": "^1.7.1",
     "cookie-parser": "^1.4.3",
     "cross-fetch": "^0.0.8",
     "crypto-js": "^3.1.9-1",
diff --git a/packages/vulcan-lib/lib/server/apollo_server.js b/packages/vulcan-lib/lib/server/apollo_server.js
index adca0336d..d72089a5f 100644
--- a/packages/vulcan-lib/lib/server/apollo_server.js
+++ b/packages/vulcan-lib/lib/server/apollo_server.js
@@ -6,21 +6,30 @@ import deepmerge from 'deepmerge';
 import OpticsAgent from 'optics-agent'
 import DataLoader from 'dataloader';
 import { formatError } from 'apollo-errors';
-
+import compression from 'compression';
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
+import { Engine } from 'apollo-engine';
 
 import { GraphQLSchema } from '../modules/graphql.js';
 import { Utils } from '../modules/utils.js';
 import { webAppConnectHandlersUse } from './meteor_patch.js';
 
+import { getSetting } from '../modules/settings.js';
 import { Collections } from '../modules/collections.js';
 import findByIds from '../modules/findbyids.js';
 import { runCallbacks } from '../modules/callbacks.js';
 
 export let executableSchema;
 
+const engineApiKey = getSetting('apolloEngine.apiKey');
+let engine;
+if (engineApiKey) {
+  engine = new Engine({ engineConfig: { apiKey: engineApiKey } });
+  engine.start();
+}
+
 // defaults
 const defaultConfig = {
   path: '/graphql',
@@ -60,6 +69,14 @@ const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
     graphQLServer.use(OpticsAgent.middleware());
   }
 
+  // Use Engine middleware
+  if (engineApiKey) {
+    graphQLServer.use(engine.expressMiddleware());
+  }
+
+  // compression
+  graphQLServer.use(compression());
+
   // GraphQL endpoint
   graphQLServer.use(config.path, bodyParser.json(), graphqlExpress(async (req) => {
     let options;
@@ -83,6 +100,8 @@ const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
     // Add Optics to GraphQL context object
     if (process.env.OPTICS_API_KEY) {
       options.context.opticsContext = OpticsAgent.context(req);
+      options.tracing = true;
+      options.cacheControl = true;
     }
 
     // Get the token from the header

From 4b862db660388aafe9ef8da713a5db54873e9427 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Tue, 21 Nov 2017 18:33:52 +0900
Subject: [PATCH 47/69] graphql-server-express -> apollo-server-express; remove
 Optics integration

---
 package-lock.json                             | 67 +++++++++++++++++++
 package.json                                  |  2 +-
 .../vulcan-lib/lib/server/apollo_server.js    | 21 ++----
 3 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2117ba403..8bfffae00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,14 @@
         "json-schema-traverse": "0.3.1"
       }
     },
+    "apollo-cache-control": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.0.7.tgz",
+      "integrity": "sha512-DoMTr3uTC5Cx9ukSO63wlzHD15C37FwZuoOZEu+m/UTzVFKQ4PnlBKzwZ0H2+iIwcdSulV0xte6Z3wBe9lHAOA==",
+      "requires": {
+        "graphql-extensions": "0.0.5"
+      }
+    },
     "apollo-engine": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/apollo-engine/-/apollo-engine-0.5.4.tgz",
@@ -54,6 +62,38 @@
       "integrity": "sha512-ecpP1HrlP+eb5mNQuz7ObzMWtGJA78UrPlzGRes1KiKJ/c8e1UrrAWI/wuI0Ry7fIKYA6dUzxJ4fHR5TEnMAVA==",
       "optional": true
     },
+    "apollo-server-core": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-1.2.0.tgz",
+      "integrity": "sha1-6FHEdESZG2+J+IUpI3B2uD4B6O4=",
+      "requires": {
+        "apollo-cache-control": "0.0.7",
+        "apollo-tracing": "0.1.1",
+        "graphql-extensions": "0.0.5"
+      }
+    },
+    "apollo-server-express": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-1.2.0.tgz",
+      "integrity": "sha1-AmsStFO47KxgRLIFtqhf5Zb7X54=",
+      "requires": {
+        "apollo-server-core": "1.2.0",
+        "apollo-server-module-graphiql": "1.2.0"
+      }
+    },
+    "apollo-server-module-graphiql": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.2.0.tgz",
+      "integrity": "sha1-iZ2E87dHeV27/INUqlFiLvA4FRw="
+    },
+    "apollo-tracing": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.1.1.tgz",
+      "integrity": "sha512-OrL0SYpmwNs6R339y7Is6PppOkyooMB1iLSN+HAp1FdBycQ88SqVV5Dqjxb4Du+TrMyyJLHfR5BAENZSFQyWGQ==",
+      "requires": {
+        "graphql-extensions": "0.0.5"
+      }
+    },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -146,6 +186,11 @@
         "vary": "1.1.2"
       }
     },
+    "core-js": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
+    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -250,6 +295,15 @@
         "assert-plus": "1.0.0"
       }
     },
+    "graphql-extensions": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.0.5.tgz",
+      "integrity": "sha512-IbgYhKIyI60Nio/uJjkkiXaOZ2fI8ynAyzcA/okD0iuKzBdWX4Tn6tidMLgd16Bf2v3TtNnyXnN0F2BJDs6e4A==",
+      "requires": {
+        "core-js": "2.5.1",
+        "source-map-support": "0.5.0"
+      }
+    },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -427,6 +481,19 @@
         "hoek": "4.2.0"
       }
     },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+    },
+    "source-map-support": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz",
+      "integrity": "sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q==",
+      "requires": {
+        "source-map": "0.6.1"
+      }
+    },
     "sshpk": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
diff --git a/package.json b/package.json
index b46541c90..d01f35d87 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "apollo-client": "^1.2.2",
     "apollo-engine": "^0.5.4",
     "apollo-errors": "^1.4.0",
+    "apollo-server-express": "^1.2.0",
     "babel-runtime": "^6.18.0",
     "bcrypt": "^0.8.7",
     "body-parser": "^1.18.2",
@@ -33,7 +34,6 @@
     "graphql": "^0.9.6",
     "graphql-anywhere": "^3.0.1",
     "graphql-date": "^1.0.2",
-    "graphql-server-express": "^0.6.0",
     "graphql-tag": "^2.0.0",
     "graphql-tools": "^0.10.1",
     "graphql-type-json": "^0.1.4",
diff --git a/packages/vulcan-lib/lib/server/apollo_server.js b/packages/vulcan-lib/lib/server/apollo_server.js
index d72089a5f..13cf89e26 100644
--- a/packages/vulcan-lib/lib/server/apollo_server.js
+++ b/packages/vulcan-lib/lib/server/apollo_server.js
@@ -1,9 +1,8 @@
-import { graphqlExpress, graphiqlExpress } from 'graphql-server-express';
+import { graphqlExpress, graphiqlExpress } from 'apollo-server-express';
 import bodyParser from 'body-parser';
 import express from 'express';
 import { makeExecutableSchema } from 'graphql-tools';
 import deepmerge from 'deepmerge';
-import OpticsAgent from 'optics-agent'
 import DataLoader from 'dataloader';
 import { formatError } from 'apollo-errors';
 import compression from 'compression';
@@ -64,11 +63,6 @@ const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
 
   config.configServer(graphQLServer);
 
-  // Use Optics middleware
-  if (process.env.OPTICS_API_KEY) {
-    graphQLServer.use(OpticsAgent.middleware());
-  }
-
   // Use Engine middleware
   if (engineApiKey) {
     graphQLServer.use(engine.expressMiddleware());
@@ -97,12 +91,9 @@ const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
       options.context = {};
     }
 
-    // Add Optics to GraphQL context object
-    if (process.env.OPTICS_API_KEY) {
-      options.context.opticsContext = OpticsAgent.context(req);
-      options.tracing = true;
-      options.cacheControl = true;
-    }
+    // enable tracing and caching
+    options.tracing = true;
+    options.cacheControl = true;
 
     // Get the token from the header
     if (req.headers.authorization) {
@@ -186,10 +177,6 @@ Meteor.startup(() => {
     resolvers: GraphQLSchema.resolvers,
   });
 
-  if (process.env.OPTICS_API_KEY) {
-    OpticsAgent.instrumentSchema(executableSchema)
-  }
-
   createApolloServer({
     schema: executableSchema,
   });

From 036ef645de0dc484e4132792997621e36065d471 Mon Sep 17 00:00:00 2001
From: Dimitar Nikolov <dimitar@doonloo.com>
Date: Wed, 22 Nov 2017 16:39:00 +0200
Subject: [PATCH 48/69] Add pre-validate callback on new user creation

---
 packages/vulcan-users/lib/server/on_create_user.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/vulcan-users/lib/server/on_create_user.js b/packages/vulcan-users/lib/server/on_create_user.js
index 7de77241d..fc964c82a 100644
--- a/packages/vulcan-users/lib/server/on_create_user.js
+++ b/packages/vulcan-users/lib/server/on_create_user.js
@@ -8,6 +8,8 @@ function onCreateUserCallback (options, user) {
   delete options.password; // we don't need to store the password digest
   delete options.username; // username is already in user object
 
+  options = runCallbacks(`users.new.pre_validate`, options);
+
   // validate options since they can't be trusted
   Users.simpleSchema().validate(options);
 

From 9e23b826a8cfaa35765233c918ed3e99c235dd02 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Fri, 24 Nov 2017 10:02:06 +0900
Subject: [PATCH 49/69] Meteor 1.6

---
 .meteor/release                            |  2 +-
 packages/_boilerplate-generator/package.js |  4 ++--
 packages/vulcan-lib/package.js             | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.meteor/release b/.meteor/release
index 099d5b9c0..0fa8d22dd 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.2.2
+METEOR@1.6
diff --git a/packages/_boilerplate-generator/package.js b/packages/_boilerplate-generator/package.js
index 8b1a607a7..51171b585 100644
--- a/packages/_boilerplate-generator/package.js
+++ b/packages/_boilerplate-generator/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "boilerplate-generator",
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.2.0'
+  version: '1.3.0'
 });
 
 Package.onUse(api => {
@@ -11,4 +11,4 @@ Package.onUse(api => {
   ], 'server');
   api.mainModule('generator.js', 'server');
   api.export('Boilerplate', 'server');
-});
+});
\ No newline at end of file
diff --git a/packages/vulcan-lib/package.js b/packages/vulcan-lib/package.js
index 285af9c01..782e669ce 100644
--- a/packages/vulcan-lib/package.js
+++ b/packages/vulcan-lib/package.js
@@ -7,7 +7,7 @@ Package.describe({
 
 Package.onUse(function (api) {
 
-  api.versionsFrom('METEOR@1.5.2');
+  api.versionsFrom('METEOR@1.6');
 
   var packages = [
 
@@ -15,20 +15,20 @@ Package.onUse(function (api) {
 
     // Meteor packages
 
-    'meteor-base@1.1.0',
+    'meteor-base',
     'mongo',
     'tracker',
     'service-configuration',
-    'standard-minifiers@1.1.0',
-    'modules@0.9.2',
+    'standard-minifiers',
+    'modules',
     'accounts-base',
     'check',
     'http',
     'email',
     'random',
-    'ecmascript@0.8.2',
+    'ecmascript',
     'service-configuration',
-    'shell-server@0.2.4',
+    'shell-server',
 
     // Third-party packages
 

From 68351674dac4435a5da9d5ad31ca2febbf7e2cff Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Thu, 30 Nov 2017 23:08:27 +0900
Subject: [PATCH 50/69] Work on adding caching option to default resolvers; add
 loadingMore prop to withList

---
 .../lib/modules/containers/withList.js        |   7 +-
 .../lib/modules/default_resolvers.js          | 167 ++++++++++--------
 .../vulcan-debug/lib/components/Emails.jsx    |   2 +-
 packages/vulcan-email/lib/server/email.js     |   6 +-
 packages/vulcan-email/lib/server/routes.js    |  13 +-
 .../vulcan-lib/lib/server/apollo_server.js    |  44 ++++-
 packages/vulcan-lib/lib/server/site.js        |   7 +-
 7 files changed, 160 insertions(+), 86 deletions(-)

diff --git a/packages/vulcan-core/lib/modules/containers/withList.js b/packages/vulcan-core/lib/modules/containers/withList.js
index 732839e20..395e76d96 100644
--- a/packages/vulcan-core/lib/modules/containers/withList.js
+++ b/packages/vulcan-core/lib/modules/containers/withList.js
@@ -131,12 +131,14 @@ const withList = (options) => {
         // define props returned by graphql HoC
         props(props) {
 
+          // see https://github.com/apollographql/apollo-client/blob/master/packages/apollo-client/src/core/networkStatus.ts
           const refetch = props.data.refetch,
                 // results = Utils.convertDates(collection, props.data[listResolverName]),
                 results = props.data[listResolverName],
                 totalCount = props.data[totalResolverName],
                 networkStatus = props.data.networkStatus,
-                loading = props.data.loading,
+                loading = props.data.networkStatus === 1,
+                loadingMore = props.data.networkStatus === 2,
                 error = props.data.error,
                 propertyName = options.propertyName || 'results';
 
@@ -147,7 +149,8 @@ const withList = (options) => {
           return {
             // see https://github.com/apollostack/apollo-client/blob/master/src/queries/store.ts#L28-L36
             // note: loading will propably change soon https://github.com/apollostack/apollo-client/issues/831
-            loading: networkStatus === 1,
+            loading,
+            loadingMore,
             [ propertyName ]: results,
             totalCount,
             refetch,
diff --git a/packages/vulcan-core/lib/modules/default_resolvers.js b/packages/vulcan-core/lib/modules/default_resolvers.js
index 045ea24b7..058cf9921 100644
--- a/packages/vulcan-core/lib/modules/default_resolvers.js
+++ b/packages/vulcan-core/lib/modules/default_resolvers.js
@@ -6,98 +6,119 @@ Default list, single, and total resolvers
 
 import { Utils, debug } from 'meteor/vulcan:core';
 
-export const getDefaultResolvers = collectionName => ({
+const defaultOptions = {
+  enableCache: false,
+  cacheMaxAge: 300
+}
 
-  // resolver for returning a list of documents based on a set of query terms
+export const getDefaultResolvers = (collectionName, resolverOptions = defaultOptions) => {
 
-  list: {
+  return {
 
-    name: `${collectionName}List`,
+    // resolver for returning a list of documents based on a set of query terms
 
-    async resolver(root, {terms = {}}, context, info) {
+    list: {
 
-      debug(`//--------------- start ${collectionName} list resolver ---------------//`);
-      debug(terms);
+      name: `${collectionName}List`,
 
-      // get currentUser and Users collection from context
-      const { currentUser, Users } = context;
+      async resolver(root, {terms = {}}, context, { cacheControl }) {
 
-      // get collection based on collectionName argument
-      const collection = context[collectionName];
+        debug(`//--------------- start ${collectionName} list resolver ---------------//`);
+        debug(terms);
 
-      // get selector and options from terms and perform Mongo query
-      let {selector, options} = await collection.getParameters(terms, {}, context);
-      options.skip = terms.offset;
+        if (cacheControl && resolverOptions.enableCache) {
+          cacheControl.setCacheHint({ maxAge: resolverOptions.cacheMaxAge });
+        }
 
-      debug({ selector, options });
+        // get currentUser and Users collection from context
+        const { currentUser, Users } = context;
 
-      const docs = collection.find(selector, options).fetch();
+        // get collection based on collectionName argument
+        const collection = context[collectionName];
 
-      // if collection has a checkAccess function defined, remove any documents that doesn't pass the check
-      const viewableDocs = collection.checkAccess ? _.filter(docs, doc => collection.checkAccess(currentUser, doc)) : docs;
+        // get selector and options from terms and perform Mongo query
+        let {selector, options} = await collection.getParameters(terms, {}, context);
+        options.skip = terms.offset;
+
+        debug({ selector, options });
+
+        const docs = collection.find(selector, options).fetch();
+
+        // if collection has a checkAccess function defined, remove any documents that doesn't pass the check
+        const viewableDocs = collection.checkAccess ? _.filter(docs, doc => collection.checkAccess(currentUser, doc)) : docs;
+        
+        // take the remaining documents and remove any fields that shouldn't be accessible
+        const restrictedDocs = Users.restrictViewableFields(currentUser, collection, viewableDocs);
+
+        // prime the cache
+        restrictedDocs.forEach(doc => collection.loader.prime(doc._id, doc));
+
+        debug(`// ${restrictedDocs.length} documents returned`);
+        debug(`//--------------- end ${collectionName} list resolver ---------------//`);
+
+        // return results
+        return restrictedDocs;
+      },
+
+    },
+
+    // resolver for returning a single document queried based on id or slug
+
+    single: {
       
-      // take the remaining documents and remove any fields that shouldn't be accessible
-      const restrictedDocs = Users.restrictViewableFields(currentUser, collection, viewableDocs);
+      name: `${collectionName}Single`,
 
-      // prime the cache
-      restrictedDocs.forEach(doc => collection.loader.prime(doc._id, doc));
+      async resolver(root, {documentId, slug}, context, { cacheControl }) {
 
-      debug(`// ${restrictedDocs.length} documents returned`);
-      debug(`//--------------- end ${collectionName} list resolver ---------------//`);
+        debug(`//--------------- start ${collectionName} single resolver ---------------//`);
+        debug(documentId);
 
-      // return results
-      return restrictedDocs;
+        if (cacheControl && resolverOptions.enableCache) {
+          cacheControl.setCacheHint({ maxAge: resolverOptions.cacheMaxAge });
+        }
+
+        const { currentUser, Users } = context;
+        const collection = context[collectionName];
+
+        // don't use Dataloader if doc is selected by slug
+        const doc = documentId ? await collection.loader.load(documentId) : (slug ? collection.findOne({slug}) : collection.findOne());
+
+        // if collection has a checkAccess function defined, use it to perform a check on the current document
+        // (will throw an error if check doesn't pass)
+        if (collection.checkAccess) {
+          Utils.performCheck(collection.checkAccess, currentUser, doc, collection, documentId);
+        }
+
+        const restrictedDoc = Users.restrictViewableFields(currentUser, collection, doc);
+
+        debug(`//--------------- end ${collectionName} single resolver ---------------//`);
+
+        // filter out disallowed properties and return resulting document
+        return restrictedDoc;
+      },
+    
     },
 
-  },
+    // resolver for returning the total number of documents matching a set of query terms
 
-  // resolver for returning a single document queried based on id or slug
-
-  single: {
-    
-    name: `${collectionName}Single`,
-
-    async resolver(root, {documentId, slug}, context) {
-
-      debug(`//--------------- start ${collectionName} single resolver ---------------//`);
-      debug(documentId);
-
-      const { currentUser, Users } = context;
-      const collection = context[collectionName];
-
-      // don't use Dataloader if doc is selected by slug
-      const doc = documentId ? await collection.loader.load(documentId) : (slug ? collection.findOne({slug}) : collection.findOne());
-
-      // if collection has a checkAccess function defined, use it to perform a check on the current document
-      // (will throw an error if check doesn't pass)
-      if (collection.checkAccess) {
-        Utils.performCheck(collection.checkAccess, currentUser, doc, collection, documentId);
-      }
-
-      const restrictedDoc = Users.restrictViewableFields(currentUser, collection, doc);
-
-      debug(`//--------------- end ${collectionName} single resolver ---------------//`);
-
-      // filter out disallowed properties and return resulting document
-      return restrictedDoc;
-    },
-  
-  },
-
-  // resolver for returning the total number of documents matching a set of query terms
-
-  total: {
-    
-    name: `${collectionName}Total`,
-    
-    async resolver(root, {terms}, context) {
+    total: {
       
-      const collection = context[collectionName];
+      name: `${collectionName}Total`,
+      
+      async resolver(root, {terms}, context, { cacheControl }) {
+        
+        if (cacheControl && resolverOptions.enableCache) {
+          cacheControl.setCacheHint({ maxAge: resolverOptions.cacheMaxAge });
+        }
 
-      const {selector} = await collection.getParameters(terms, {}, context);
+        const collection = context[collectionName];
 
-      return collection.find(selector).count();
-    },
-  
+        const {selector} = await collection.getParameters(terms, {}, context);
+
+        return collection.find(selector).count();
+      },
+    
+    }
   }
-});
+
+};
diff --git a/packages/vulcan-debug/lib/components/Emails.jsx b/packages/vulcan-debug/lib/components/Emails.jsx
index 395ce4c6a..8747c09d1 100644
--- a/packages/vulcan-debug/lib/components/Emails.jsx
+++ b/packages/vulcan-debug/lib/components/Emails.jsx
@@ -37,7 +37,7 @@ class Email extends PureComponent {
         <td>{name}</td>
         <td><a href={"/email/template/"+email.template} target="_blank">{email.template}</a></td>
         <td>{typeof email.subject === 'function' ? email.subject({}) : email.subject}</td>
-        <td><a href={email.path.replace(':_id?', '')} target="_blank">{email.path}</a></td>
+        <td><a href={email.path.replace(':_id?', '').replace(':documentId?', '')} target="_blank">{email.path}</a></td>
         <td>
           <div className={this.state.loading ? "test-email loading" : "test-email"}>
             <Button disabled={this.state.loading} onClick={this.sendTest} bsStyle="primary">Send Test</Button>
diff --git a/packages/vulcan-email/lib/server/email.js b/packages/vulcan-email/lib/server/email.js
index 3d3d90d99..8161799c0 100644
--- a/packages/vulcan-email/lib/server/email.js
+++ b/packages/vulcan-email/lib/server/email.js
@@ -24,7 +24,7 @@ VulcanEmail.addTemplates = templates => {
 
 VulcanEmail.getTemplate = templateName => Handlebars.compile(
   VulcanEmail.templates[templateName], 
-  { noEscape: true}
+  { noEscape: true, strict: true}
 );
 
 VulcanEmail.buildTemplate = (htmlContent, optionalProperties = {}) => {
@@ -46,9 +46,7 @@ VulcanEmail.buildTemplate = (htmlContent, optionalProperties = {}) => {
   };
 
   const emailHTML = VulcanEmail.getTemplate("wrapper")(emailProperties);
-
   const inlinedHTML = Juice(emailHTML, {preserveMediaQueries: true});
-
   const doctype = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
 
   return doctype+inlinedHTML;
@@ -122,7 +120,7 @@ VulcanEmail.build = async ({ emailName, variables }) => {
 
   const subject = typeof email.subject === 'function' ? email.subject(data) : email.subject;
   
-  const html = VulcanEmail.buildTemplate(VulcanEmail.getTemplate(email.template)(data));
+  const html = VulcanEmail.buildTemplate(VulcanEmail.getTemplate(email.template)(data), data);
 
   return { data, subject, html };
 }
diff --git a/packages/vulcan-email/lib/server/routes.js b/packages/vulcan-email/lib/server/routes.js
index 5f3db6158..844906160 100644
--- a/packages/vulcan-email/lib/server/routes.js
+++ b/packages/vulcan-email/lib/server/routes.js
@@ -10,7 +10,6 @@ Meteor.startup(function () {
     Picker.route(email.path, async (params, req, res) => {
 
       let html;
-
       // if email has a custom way of generating test HTML, use it
       if (typeof email.getTestHTML !== "undefined") {
 
@@ -20,14 +19,20 @@ Meteor.startup(function () {
 
         // else get test object (sample post, comment, user, etc.)
         const testVariables = (typeof email.testVariables === 'function' ? email.testVariables() : email.testVariables) || {};
-        const result = email.query ? await runQuery(email.query, testVariables) : {data: {}};
+        // merge test variables with params from URL
+        const variables = {...testVariables, ...params};
+
+        const result = email.query ? await runQuery(email.query, variables) : {data: {}};
 
         // if email has a data() function, merge it with results of query
-        const emailTestData = email.data ? {...result.data, ...email.data(testVariables)} : result.data;
+        const emailTestData = email.data ? {...result.data, ...email.data(variables)} : result.data;
         const subject = typeof email.subject === 'function' ? email.subject(emailTestData) : email.subject;
 
+        const template = VulcanEmail.getTemplate(email.template);
+        const htmlContent = template(emailTestData)
+
         // then apply email template to properties, and wrap it with buildTemplate
-        html = VulcanEmail.buildTemplate(VulcanEmail.getTemplate(email.template)(emailTestData));
+        html = VulcanEmail.buildTemplate(htmlContent, emailTestData);
 
         html += `
           <h4 style="margin: 20px;"><code>Subject: ${subject}</code></h4>
diff --git a/packages/vulcan-lib/lib/server/apollo_server.js b/packages/vulcan-lib/lib/server/apollo_server.js
index 13cf89e26..1e8733eb8 100644
--- a/packages/vulcan-lib/lib/server/apollo_server.js
+++ b/packages/vulcan-lib/lib/server/apollo_server.js
@@ -22,10 +22,52 @@ import { runCallbacks } from '../modules/callbacks.js';
 
 export let executableSchema;
 
+// see https://github.com/apollographql/apollo-cache-control
+
 const engineApiKey = getSetting('apolloEngine.apiKey');
+const engineConfig = { 
+  apiKey: engineApiKey,
+  // "origins": [
+  //   {
+  //     "http": {
+  //       "url": "http://localhost:3000/graphql"
+  //     }
+  //   }
+  // ],
+  // "stores": [
+  //   {
+  //     "name": "embeddedCache",
+  //     "inMemory": {
+  //       "cacheSize": 10485760
+  //     }
+  //   }
+  // ],
+  // "sessionAuth": {
+  //   "store": "embeddedCache",
+  //   "header": "Authorization"
+  // },
+  // "frontends": [
+  //   {
+  //     "host": "127.0.0.1",
+  //     "port": 3000,
+  //     "endpoint": "/graphql"
+  //   }
+  // ],
+  // "queryCache": {
+  //   "publicFullQueryStore": "embeddedCache",
+  //   "privateFullQueryStore": "embeddedCache"
+  // },
+  // "reporting": {
+  //   "endpointUrl": "https://engine-report.apollographql.com",
+  //   "debugReports": true
+  // },
+  // "logging": {
+  //   "level": "DEBUG"
+  // }
+};
 let engine;
 if (engineApiKey) {
-  engine = new Engine({ engineConfig: { apiKey: engineApiKey } });
+  engine = new Engine({ engineConfig });
   engine.start();
 }
 
diff --git a/packages/vulcan-lib/lib/server/site.js b/packages/vulcan-lib/lib/server/site.js
index f0465691c..d7e9b8367 100644
--- a/packages/vulcan-lib/lib/server/site.js
+++ b/packages/vulcan-lib/lib/server/site.js
@@ -5,6 +5,7 @@ const siteSchema = `
   type Site {
     title: String
     url: String
+    logoUrl: String
   }
 `;
 addGraphQLSchema(siteSchema);
@@ -12,7 +13,11 @@ addGraphQLSchema(siteSchema);
 const siteResolvers = {
   Query: {
     SiteData(root, args, context) {
-      return {title: getSetting('title'), url: getSetting('siteUrl', Meteor.absoluteUrl())}
+      return {
+      	title: getSetting('title'), 
+      	url: getSetting('siteUrl', Meteor.absoluteUrl()),
+      	logoUrl: getSetting('logoUrl'),
+      }
     }
   }
 };

From 574f08c4496008c6e09155bf3054fc9fcfc8cf17 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Fri, 8 Dec 2017 20:54:23 +0900
Subject: [PATCH 51/69] Enable Engine caching

---
 .../lib/modules/default_resolvers.js          | 10 +++++--
 .../vulcan-lib/lib/server/apollo_server.js    | 29 ++++++++++---------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/packages/vulcan-core/lib/modules/default_resolvers.js b/packages/vulcan-core/lib/modules/default_resolvers.js
index 058cf9921..e21e9a346 100644
--- a/packages/vulcan-core/lib/modules/default_resolvers.js
+++ b/packages/vulcan-core/lib/modules/default_resolvers.js
@@ -24,10 +24,12 @@ export const getDefaultResolvers = (collectionName, resolverOptions = defaultOpt
       async resolver(root, {terms = {}}, context, { cacheControl }) {
 
         debug(`//--------------- start ${collectionName} list resolver ---------------//`);
+        debug(resolverOptions);
         debug(terms);
 
         if (cacheControl && resolverOptions.enableCache) {
-          cacheControl.setCacheHint({ maxAge: resolverOptions.cacheMaxAge });
+          const maxAge = resolverOptions.cacheMaxAge || defaultOptions.cacheMaxAge;
+          cacheControl.setCacheHint({ maxAge });
         }
 
         // get currentUser and Users collection from context
@@ -74,7 +76,8 @@ export const getDefaultResolvers = (collectionName, resolverOptions = defaultOpt
         debug(documentId);
 
         if (cacheControl && resolverOptions.enableCache) {
-          cacheControl.setCacheHint({ maxAge: resolverOptions.cacheMaxAge });
+          const maxAge = resolverOptions.cacheMaxAge || defaultOptions.cacheMaxAge;
+          cacheControl.setCacheHint({ maxAge });
         }
 
         const { currentUser, Users } = context;
@@ -108,7 +111,8 @@ export const getDefaultResolvers = (collectionName, resolverOptions = defaultOpt
       async resolver(root, {terms}, context, { cacheControl }) {
         
         if (cacheControl && resolverOptions.enableCache) {
-          cacheControl.setCacheHint({ maxAge: resolverOptions.cacheMaxAge });
+          const maxAge = resolverOptions.cacheMaxAge || defaultOptions.cacheMaxAge;
+          cacheControl.setCacheHint({ maxAge });
         }
 
         const collection = context[collectionName];
diff --git a/packages/vulcan-lib/lib/server/apollo_server.js b/packages/vulcan-lib/lib/server/apollo_server.js
index 1e8733eb8..c6863335e 100644
--- a/packages/vulcan-lib/lib/server/apollo_server.js
+++ b/packages/vulcan-lib/lib/server/apollo_server.js
@@ -34,14 +34,14 @@ const engineConfig = {
   //     }
   //   }
   // ],
-  // "stores": [
-  //   {
-  //     "name": "embeddedCache",
-  //     "inMemory": {
-  //       "cacheSize": 10485760
-  //     }
-  //   }
-  // ],
+  "stores": [
+    {
+      "name": "vulcanCache",
+      "inMemory": {
+        "cacheSize": 20000000
+      }
+    }
+  ],
   // "sessionAuth": {
   //   "store": "embeddedCache",
   //   "header": "Authorization"
@@ -50,13 +50,16 @@ const engineConfig = {
   //   {
   //     "host": "127.0.0.1",
   //     "port": 3000,
-  //     "endpoint": "/graphql"
+  //     "endpoint": "/graphql",
+  //     "extensions": {
+  //       "strip": []
+  //     }
   //   }
   // ],
-  // "queryCache": {
-  //   "publicFullQueryStore": "embeddedCache",
-  //   "privateFullQueryStore": "embeddedCache"
-  // },
+  "queryCache": {
+    "publicFullQueryStore": "vulcanCache",
+    "privateFullQueryStore": "vulcanCache"
+  },
   // "reporting": {
   //   "endpointUrl": "https://engine-report.apollographql.com",
   //   "debugReports": true

From 0cbb904f2d31f9ffc5baaee1d6171a2d5cd3206d Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Wed, 13 Dec 2017 18:39:19 +0900
Subject: [PATCH 52/69] Set enableCache when defining HoC rather than when
 defining resolvers for more granularity

---
 .../lib/modules/containers/withDocument.js         |  8 ++++----
 .../vulcan-core/lib/modules/containers/withList.js |  9 +++++----
 .../vulcan-core/lib/modules/default_resolvers.js   | 14 +++++++-------
 .../vulcan-forms/lib/components/FormWrapper.jsx    |  9 +++++----
 packages/vulcan-lib/lib/modules/collections.js     |  6 +++---
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/packages/vulcan-core/lib/modules/containers/withDocument.js b/packages/vulcan-core/lib/modules/containers/withDocument.js
index b1d67833a..3d4ac3969 100644
--- a/packages/vulcan-core/lib/modules/containers/withDocument.js
+++ b/packages/vulcan-core/lib/modules/containers/withDocument.js
@@ -5,7 +5,7 @@ import { getSetting, getFragment, getFragmentName } from 'meteor/vulcan:core';
 
 export default function withDocument (options) {
   
-  const { collection, pollInterval = getSetting('pollInterval', 20000) } = options,
+  const { collection, pollInterval = getSetting('pollInterval', 20000), enableCache = false } = options,
         queryName = options.queryName || `${collection.options.collectionName}SingleQuery`,
         singleResolverName = collection.options.resolvers.single && collection.options.resolvers.single.name;
 
@@ -22,8 +22,8 @@ export default function withDocument (options) {
   const fragmentName = getFragmentName(fragment);
 
   return graphql(gql`
-    query ${queryName}($documentId: String, $slug: String) {
-      ${singleResolverName}(documentId: $documentId, slug: $slug) {
+    query ${queryName}($documentId: String, $slug: String, $enableCache: Boolean) {
+      ${singleResolverName}(documentId: $documentId, slug: $slug, enableCache: $enableCache) {
         __typename
         ...${fragmentName}
       }
@@ -34,7 +34,7 @@ export default function withDocument (options) {
     
     options(ownProps) {
       const graphQLOptions = {
-        variables: { documentId: ownProps.documentId, slug: ownProps.slug },
+        variables: { documentId: ownProps.documentId, slug: ownProps.slug, enableCache },
         pollInterval, // note: pollInterval can be set to 0 to disable polling (20s by default)
       };
 
diff --git a/packages/vulcan-core/lib/modules/containers/withList.js b/packages/vulcan-core/lib/modules/containers/withList.js
index 395e76d96..98abeceb8 100644
--- a/packages/vulcan-core/lib/modules/containers/withList.js
+++ b/packages/vulcan-core/lib/modules/containers/withList.js
@@ -47,7 +47,7 @@ const withList = (options) => {
 
   // console.log(options)
   
-  const { collection, limit = 10, pollInterval = getSetting('pollInterval', 20000), totalResolver = true } = options,
+  const { collection, limit = 10, pollInterval = getSetting('pollInterval', 20000), totalResolver = true, enableCache = false } = options,
         queryName = options.queryName || `${collection.options.collectionName}ListQuery`,
         listResolverName = collection.options.resolvers.list && collection.options.resolvers.list.name,
         totalResolverName = collection.options.resolvers.total && collection.options.resolvers.total.name;
@@ -66,9 +66,9 @@ const withList = (options) => {
 
   // build graphql query from options
   const query = gql`
-    query ${queryName}($terms: JSON) {
-      ${totalResolver ? `${totalResolverName}(terms: $terms)` : ``}
-      ${listResolverName}(terms: $terms) {
+    query ${queryName}($terms: JSON, $enableCache: Boolean) {
+      ${totalResolver ? `${totalResolverName}(terms: $terms, enableCache: $enableCache)` : ``}
+      ${listResolverName}(terms: $terms, enableCache: $enableCache) {
         __typename
         ...${fragmentName}
       }
@@ -110,6 +110,7 @@ const withList = (options) => {
           const graphQLOptions = {
             variables: {
               terms: mergedTerms,
+              enableCache,
             },
             // note: pollInterval can be set to 0 to disable polling (20s by default)
             pollInterval,
diff --git a/packages/vulcan-core/lib/modules/default_resolvers.js b/packages/vulcan-core/lib/modules/default_resolvers.js
index e21e9a346..edea44e80 100644
--- a/packages/vulcan-core/lib/modules/default_resolvers.js
+++ b/packages/vulcan-core/lib/modules/default_resolvers.js
@@ -7,7 +7,6 @@ Default list, single, and total resolvers
 import { Utils, debug } from 'meteor/vulcan:core';
 
 const defaultOptions = {
-  enableCache: false,
   cacheMaxAge: 300
 }
 
@@ -21,13 +20,13 @@ export const getDefaultResolvers = (collectionName, resolverOptions = defaultOpt
 
       name: `${collectionName}List`,
 
-      async resolver(root, {terms = {}}, context, { cacheControl }) {
+      async resolver(root, {terms = {}, enableCache = false}, context, { cacheControl }) {
 
         debug(`//--------------- start ${collectionName} list resolver ---------------//`);
         debug(resolverOptions);
         debug(terms);
 
-        if (cacheControl && resolverOptions.enableCache) {
+        if (cacheControl && enableCache) {
           const maxAge = resolverOptions.cacheMaxAge || defaultOptions.cacheMaxAge;
           cacheControl.setCacheHint({ maxAge });
         }
@@ -70,12 +69,13 @@ export const getDefaultResolvers = (collectionName, resolverOptions = defaultOpt
       
       name: `${collectionName}Single`,
 
-      async resolver(root, {documentId, slug}, context, { cacheControl }) {
+      async resolver(root, {documentId, slug, enableCache = false}, context, { cacheControl }) {
 
         debug(`//--------------- start ${collectionName} single resolver ---------------//`);
+        debug(resolverOptions);
         debug(documentId);
 
-        if (cacheControl && resolverOptions.enableCache) {
+        if (cacheControl && enableCache) {
           const maxAge = resolverOptions.cacheMaxAge || defaultOptions.cacheMaxAge;
           cacheControl.setCacheHint({ maxAge });
         }
@@ -108,9 +108,9 @@ export const getDefaultResolvers = (collectionName, resolverOptions = defaultOpt
       
       name: `${collectionName}Total`,
       
-      async resolver(root, {terms}, context, { cacheControl }) {
+      async resolver(root, {terms, enableCache}, context, { cacheControl }) {
         
-        if (cacheControl && resolverOptions.enableCache) {
+        if (cacheControl && enableCache) {
           const maxAge = resolverOptions.cacheMaxAge || defaultOptions.cacheMaxAge;
           cacheControl.setCacheHint({ maxAge });
         }
diff --git a/packages/vulcan-forms/lib/components/FormWrapper.jsx b/packages/vulcan-forms/lib/components/FormWrapper.jsx
index dacb192bf..09ff6b348 100644
--- a/packages/vulcan-forms/lib/components/FormWrapper.jsx
+++ b/packages/vulcan-forms/lib/components/FormWrapper.jsx
@@ -76,7 +76,7 @@ class FormWrapper extends PureComponent {
       mutationFields = _.intersection(mutationFields, fields);
     }
 
-    // resolve any array field with resolveAs as fieldName{_id}
+    // resolve any array field with resolveAs as fieldName{_id} -> why?
     /* 
     - string field with no resolver -> fieldName
     - string field with a resolver  -> fieldName
@@ -84,9 +84,9 @@ class FormWrapper extends PureComponent {
     - array field with a resolver   -> fieldName{_id}
     */
     const mapFieldNameToField = fieldName => {
-      const field = this.getSchema()[fieldName]
+      const field = this.getSchema()[fieldName];
       return field.resolveAs && field.type.definitions[0].type === Array
-        ? `${fieldName}{_id}` // if it's a custom resolver, add a basic query to its _id
+        ? `${fieldName}` // if it's a custom resolver, add a basic query to its _id
         : fieldName; // else just ask for the field name
     }
     queryFields = queryFields.map(mapFieldNameToField);
@@ -137,7 +137,8 @@ class FormWrapper extends PureComponent {
       queryName: `${prefix}FormQuery`,
       collection: this.props.collection,
       fragment: this.getFragments().queryFragment,
-      fetchPolicy: 'network-only' // we always want to load a fresh copy of the document
+      fetchPolicy: 'network-only', // we always want to load a fresh copy of the document
+      enableCache: false,    
     };
 
     // options for withNew, withEdit, and withRemove HoCs
diff --git a/packages/vulcan-lib/lib/modules/collections.js b/packages/vulcan-lib/lib/modules/collections.js
index 38df3817c..5c079f7c8 100644
--- a/packages/vulcan-lib/lib/modules/collections.js
+++ b/packages/vulcan-lib/lib/modules/collections.js
@@ -135,17 +135,17 @@ export const createCollection = options => {
       const queryResolvers = {};
       // list
       if (resolvers.list) { // e.g. ""
-        addGraphQLQuery(`${resolvers.list.name}(terms: JSON, offset: Int, limit: Int): [${typeName}]`);
+        addGraphQLQuery(`${resolvers.list.name}(terms: JSON, offset: Int, limit: Int, enableCache: Boolean): [${typeName}]`);
         queryResolvers[resolvers.list.name] = resolvers.list.resolver.bind(resolvers.list);
       }
       // single
       if (resolvers.single) {
-        addGraphQLQuery(`${resolvers.single.name}(documentId: String, slug: String): ${typeName}`);
+        addGraphQLQuery(`${resolvers.single.name}(documentId: String, slug: String, enableCache: Boolean): ${typeName}`);
         queryResolvers[resolvers.single.name] = resolvers.single.resolver.bind(resolvers.single);
       }
       // total
       if (resolvers.total) {
-        addGraphQLQuery(`${resolvers.total.name}(terms: JSON): Int`);
+        addGraphQLQuery(`${resolvers.total.name}(terms: JSON, enableCache: Boolean): Int`);
         queryResolvers[resolvers.total.name] = resolvers.total.resolver;
       }
       addGraphQLResolvers({ Query: { ...queryResolvers } });

From 983c08d52ff0f166d5361e609a3a63115a915086 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Sun, 17 Dec 2017 17:42:06 +0900
Subject: [PATCH 53/69] Pass current route to `router.onUpdate` hook; trigger
 `router.onUpdate` from new RouterHook component; Add new `event.identify`
 hook; refactor events package, add new events-ga and events-segment packages

---
 .eslintrc                                     |   7 +-
 packages/vulcan-core/lib/modules/callbacks.js |   2 +-
 .../lib/modules/components/App.jsx            |  54 +++++++--
 .../lib/modules/components/HeadTags.jsx       |   8 +-
 .../lib/modules/components/RouterHook.jsx     |  24 ++++
 packages/vulcan-core/lib/modules/index.js     |   1 +
 packages/vulcan-events-ga/README.md           |   1 +
 packages/vulcan-events-ga/lib/client/ga.js    |  62 ++++++++++
 packages/vulcan-events-ga/lib/client/main.js  |   2 +
 .../vulcan-events-ga/lib/modules/index.js     |   3 +
 packages/vulcan-events-ga/lib/server/main.js  |   1 +
 packages/vulcan-events-ga/package.js          |  19 +++
 .../vulcan-events-segment/lib/client/main.js  |   3 +
 .../lib/client/segment-client.js              | 110 ++++++++++++++++++
 .../lib/modules/index.js                      |   4 +
 .../vulcan-events-segment/lib/server/main.js  |   3 +
 .../lib/server/segment-server.js              |   5 +
 packages/vulcan-events-segment/package.js     |  19 +++
 packages/vulcan-events/lib/callbacks.js       |   5 -
 packages/vulcan-events/lib/client.js          |   8 --
 packages/vulcan-events/lib/client/main.js     |   1 +
 packages/vulcan-events/lib/collection.js      |  33 ------
 packages/vulcan-events/lib/helpers.js         |  60 ----------
 .../vulcan-events/lib/modules/collection.js   |  16 +++
 packages/vulcan-events/lib/modules/events.js  |  29 +++++
 packages/vulcan-events/lib/modules/index.js   |   2 +
 packages/vulcan-events/lib/modules/schema.js  |  28 +++++
 packages/vulcan-events/lib/mutations.js       |  18 ---
 packages/vulcan-events/lib/server.js          |   5 -
 packages/vulcan-events/lib/server/main.js     |   1 +
 packages/vulcan-events/package.js             |   4 +-
 .../vulcan-routing/lib/client/routing.jsx     |   2 +-
 32 files changed, 391 insertions(+), 149 deletions(-)
 create mode 100644 packages/vulcan-core/lib/modules/components/RouterHook.jsx
 create mode 100644 packages/vulcan-events-ga/README.md
 create mode 100644 packages/vulcan-events-ga/lib/client/ga.js
 create mode 100644 packages/vulcan-events-ga/lib/client/main.js
 create mode 100644 packages/vulcan-events-ga/lib/modules/index.js
 create mode 100644 packages/vulcan-events-ga/lib/server/main.js
 create mode 100644 packages/vulcan-events-ga/package.js
 create mode 100644 packages/vulcan-events-segment/lib/client/main.js
 create mode 100644 packages/vulcan-events-segment/lib/client/segment-client.js
 create mode 100644 packages/vulcan-events-segment/lib/modules/index.js
 create mode 100644 packages/vulcan-events-segment/lib/server/main.js
 create mode 100644 packages/vulcan-events-segment/lib/server/segment-server.js
 create mode 100644 packages/vulcan-events-segment/package.js
 delete mode 100644 packages/vulcan-events/lib/callbacks.js
 delete mode 100644 packages/vulcan-events/lib/client.js
 create mode 100644 packages/vulcan-events/lib/client/main.js
 delete mode 100644 packages/vulcan-events/lib/collection.js
 delete mode 100644 packages/vulcan-events/lib/helpers.js
 create mode 100644 packages/vulcan-events/lib/modules/collection.js
 create mode 100644 packages/vulcan-events/lib/modules/events.js
 create mode 100644 packages/vulcan-events/lib/modules/index.js
 create mode 100644 packages/vulcan-events/lib/modules/schema.js
 delete mode 100644 packages/vulcan-events/lib/mutations.js
 delete mode 100644 packages/vulcan-events/lib/server.js
 create mode 100644 packages/vulcan-events/lib/server/main.js

diff --git a/.eslintrc b/.eslintrc
index 203d9ea36..07b33cf5a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -50,10 +50,15 @@
     "meteor": true,
     "node": true
   },
+  "ecmaFeatures": {
+    "modules": true,
+    "jsx": true
+  },
   "plugins": [
     "babel",
     "meteor",
-    "react"
+    "react",
+    "prettier"
   ],
   "settings": {
     "import/resolver": "meteor"
diff --git a/packages/vulcan-core/lib/modules/callbacks.js b/packages/vulcan-core/lib/modules/callbacks.js
index e70209aab..f9feda082 100644
--- a/packages/vulcan-core/lib/modules/callbacks.js
+++ b/packages/vulcan-core/lib/modules/callbacks.js
@@ -12,7 +12,7 @@ import { addCallback, getActions } from 'meteor/vulcan:lib';
  * @param {Object} Redux store reference instantiated on the current connected client
  * @param {Object} Apollo Client reference instantiated on the current connected client
  */
-function RouterClearMessages(unusedItem, store, apolloClient) {
+function RouterClearMessages(unusedItem, nextRoute, store, apolloClient) {
   store.dispatch(getActions().messages.clearSeen());
   
   return unusedItem;
diff --git a/packages/vulcan-core/lib/modules/components/App.jsx b/packages/vulcan-core/lib/modules/components/App.jsx
index 803b89d35..6d39edca4 100644
--- a/packages/vulcan-core/lib/modules/components/App.jsx
+++ b/packages/vulcan-core/lib/modules/components/App.jsx
@@ -1,36 +1,68 @@
-import { Components, registerComponent, registerSetting, getSetting, Strings } from 'meteor/vulcan:lib';
+import {
+  Components,
+  registerComponent,
+  registerSetting,
+  getSetting,
+  Strings,
+  runCallbacks,
+} from 'meteor/vulcan:lib';
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { IntlProvider, intlShape} from 'meteor/vulcan:i18n';
+import { IntlProvider, intlShape } from 'meteor/vulcan:i18n';
 import withCurrentUser from '../containers/withCurrentUser.js';
 
 class App extends PureComponent {
+  constructor(props) {
+    super(props);
+    if (props.currentUser) {
+      runCallbacks('events.identify', props.currentUser);
+    }
+  }
 
   getLocale() {
     return getSetting('locale', 'en');
   }
 
   getChildContext() {
-    
     const messages = Strings[this.getLocale()] || {};
-    const intlProvider = new IntlProvider({locale: this.getLocale()}, messages);
+    const intlProvider = new IntlProvider(
+      { locale: this.getLocale() },
+      messages
+    );
     const { intl } = intlProvider.getChildContext();
     return {
-      intl: intl
+      intl: intl,
     };
   }
 
+  componentWillUpdate(nextProps) {
+    if (nextProps.currentUser) {
+      runCallbacks('events.identify', nextProps.currentUser);
+    }
+  }
+
   render() {
-    
     const currentRoute = _.last(this.props.routes);
-    const LayoutComponent = currentRoute.layoutName ? Components[currentRoute.layoutName] : Components.Layout;
+    const LayoutComponent = currentRoute.layoutName
+      ? Components[currentRoute.layoutName]
+      : Components.Layout;
 
     return (
-      <IntlProvider locale={this.getLocale()} messages={Strings[this.getLocale()]}>
+      <IntlProvider
+        locale={this.getLocale()}
+        messages={Strings[this.getLocale()]}
+      >
         <div>
           <Components.HeadTags />
+          <Components.RouterHook currentRoute={currentRoute} />
           <LayoutComponent {...this.props} currentRoute={currentRoute}>
-            { this.props.currentUserLoading ? <Components.Loading /> : (this.props.children ? this.props.children : <Components.Welcome />) }
+            {this.props.currentUserLoading ? (
+              <Components.Loading />
+            ) : this.props.children ? (
+              this.props.children
+            ) : (
+              <Components.Welcome />
+            )}
           </LayoutComponent>
         </div>
       </IntlProvider>
@@ -40,11 +72,11 @@ class App extends PureComponent {
 
 App.propTypes = {
   currentUserLoading: PropTypes.bool,
-}
+};
 
 App.childContextTypes = {
   intl: intlShape,
-}
+};
 
 App.displayName = 'App';
 
diff --git a/packages/vulcan-core/lib/modules/components/HeadTags.jsx b/packages/vulcan-core/lib/modules/components/HeadTags.jsx
index 431e44c95..82a331894 100644
--- a/packages/vulcan-core/lib/modules/components/HeadTags.jsx
+++ b/packages/vulcan-core/lib/modules/components/HeadTags.jsx
@@ -14,9 +14,9 @@ registerSetting('faviconUrl', '/img/favicon.ico', 'Favicon absolute URL');
 class HeadTags extends PureComponent {
   render() {
 
-    const url = !!this.props.url ? this.props.url : Utils.getSiteUrl();
-    const title = !!this.props.title ? this.props.title : getSetting('title', 'My App');
-    const description = !!this.props.description ? this.props.description : getSetting('tagline') || getSetting('description');
+    const url = this.props.url || Utils.getSiteUrl();
+    const title = this.props.title || getSetting('title', 'My App');
+    const description = this.props.description || getSetting('tagline') || getSetting('description');
 
     // default image meta: logo url, else site image defined in settings
     let image = !!getSetting('siteImage') ? getSetting('siteImage'): getSetting('logoUrl');
@@ -59,7 +59,7 @@ class HeadTags extends PureComponent {
 
           {Head.meta.map((tag, index) => <meta key={index} {...tag}/>)}
           {Head.link.map((tag, index) => <link key={index} {...tag}/>)}
-          {Head.script.map((tag, index) => <script key={index} {...tag}/>)}
+          {Head.script.map((tag, index) => <script key={index} {...tag}>{contents}</script>)}
 
         </Helmet>
 
diff --git a/packages/vulcan-core/lib/modules/components/RouterHook.jsx b/packages/vulcan-core/lib/modules/components/RouterHook.jsx
new file mode 100644
index 000000000..97964915e
--- /dev/null
+++ b/packages/vulcan-core/lib/modules/components/RouterHook.jsx
@@ -0,0 +1,24 @@
+import React, { PureComponent } from 'react';
+import { registerComponent, runCallbacks } from 'meteor/vulcan:lib';
+import { withApollo } from 'react-apollo';
+
+class RouterHook extends PureComponent {
+  constructor(props) {
+    super(props);
+    const { currentRoute, client } = props;
+    console.log(props)
+    // the first argument is an item to iterate on, needed by vulcan:lib/callbacks
+    // note: this item is not used in this specific callback: router.onUpdate
+    runCallbacks('router.onUpdate', {}, currentRoute, client.store, client);
+  }
+  componentWillReceiveProps(nextProps) {
+    const { currentRoute, client } = nextProps;
+    // the first argument is an item to iterate on, needed by vulcan:lib/callbacks
+    // note: this item is not used in this specific callback: router.onUpdate
+    runCallbacks('router.onUpdate', {}, currentRoute, client.store, client);
+  }
+  render() {
+    return null;
+  }
+}
+registerComponent('RouterHook', RouterHook, withApollo);
diff --git a/packages/vulcan-core/lib/modules/index.js b/packages/vulcan-core/lib/modules/index.js
index ae49d8996..e98cb2d3c 100644
--- a/packages/vulcan-core/lib/modules/index.js
+++ b/packages/vulcan-core/lib/modules/index.js
@@ -22,6 +22,7 @@ export { default as Datatable } from './components/Datatable.jsx';
 export { default as Flash } from './components/Flash.jsx';
 export { default as HelloWorld } from './components/HelloWorld.jsx';
 export { default as Welcome } from './components/Welcome.jsx';
+export { default as RouterHook } from './components/RouterHook.jsx';
 
 export { default as withMessages } from "./containers/withMessages.js";
 export { default as withList } from './containers/withList.js';
diff --git a/packages/vulcan-events-ga/README.md b/packages/vulcan-events-ga/README.md
new file mode 100644
index 000000000..70247b7e5
--- /dev/null
+++ b/packages/vulcan-events-ga/README.md
@@ -0,0 +1 @@
+Vulcan events package, used internally. 
\ No newline at end of file
diff --git a/packages/vulcan-events-ga/lib/client/ga.js b/packages/vulcan-events-ga/lib/client/ga.js
new file mode 100644
index 000000000..6eb126937
--- /dev/null
+++ b/packages/vulcan-events-ga/lib/client/ga.js
@@ -0,0 +1,62 @@
+import { getSetting } from 'meteor/vulcan:core';
+import { addPageFunction, addInitFunction } from 'meteor/vulcan:events';
+
+/*
+
+  We provide a special support for Google Analytics.
+  
+  If you want to enable GA page viewing / tracking, go to
+  your settings file and update the 'public > googleAnalytics > apiKey' 
+  field with your GA unique identifier (UA-xxx...).
+
+*/
+
+function googleAnaticsTrackPage() {
+  if (window && window.ga) {
+    window.ga('send', 'pageview', {
+      page: window.location.pathname,
+    });
+  }
+  return {};
+}
+
+// add client-side callback: log a ga request on page view
+addPageFunction(googleAnaticsTrackPage);
+
+function googleAnalyticsInit() {
+  // get the google analytics id from the settings
+  const googleAnalyticsId = getSetting('googleAnalytics.apiKey');
+
+  // the google analytics id exists & isn't the placeholder from sample_settings.json
+  if (googleAnalyticsId && googleAnalyticsId !== 'foo123') {
+    (function(i, s, o, g, r, a, m) {
+      i['GoogleAnalyticsObject'] = r;
+      (i[r] =
+        i[r] ||
+        function() {
+          (i[r].q = i[r].q || []).push(arguments);
+        }),
+        (i[r].l = 1 * new Date());
+      (a = s.createElement(o)), (m = s.getElementsByTagName(o)[0]);
+      a.async = 1;
+      a.src = g;
+      m.parentNode.insertBefore(a, m);
+    })(
+      window,
+      document,
+      'script',
+      '//www.google-analytics.com/analytics.js',
+      'ga'
+    );
+
+    const cookieDomain = document.domain === 'localhost' ? 'none' : 'auto';
+
+    window.ga('create', googleAnalyticsId, cookieDomain);
+
+    // trigger first request once analytics are initialized
+    googleAnaticsTrackPage();
+  }
+}
+
+// init google analytics on the client module
+addInitFunction(googleAnalyticsInit);
diff --git a/packages/vulcan-events-ga/lib/client/main.js b/packages/vulcan-events-ga/lib/client/main.js
new file mode 100644
index 000000000..bd90865fc
--- /dev/null
+++ b/packages/vulcan-events-ga/lib/client/main.js
@@ -0,0 +1,2 @@
+import './ga.js';
+export * from '../modules/index.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-ga/lib/modules/index.js b/packages/vulcan-events-ga/lib/modules/index.js
new file mode 100644
index 000000000..29ed8aee7
--- /dev/null
+++ b/packages/vulcan-events-ga/lib/modules/index.js
@@ -0,0 +1,3 @@
+import { registerSetting } from 'meteor/vulcan:core';
+
+registerSetting('googleAnalytics.apiKey', null, 'Google Analytics ID');
diff --git a/packages/vulcan-events-ga/lib/server/main.js b/packages/vulcan-events-ga/lib/server/main.js
new file mode 100644
index 000000000..094a9a675
--- /dev/null
+++ b/packages/vulcan-events-ga/lib/server/main.js
@@ -0,0 +1 @@
+export * from '../modules/index.js';
diff --git a/packages/vulcan-events-ga/package.js b/packages/vulcan-events-ga/package.js
new file mode 100644
index 000000000..5fab99d7d
--- /dev/null
+++ b/packages/vulcan-events-ga/package.js
@@ -0,0 +1,19 @@
+Package.describe({
+  name: "vulcan:events-ga",
+  summary: "Vulcan Google Analytics event tracking package",
+  version: '1.8.0',
+  git: "https://github.com/VulcanJS/Vulcan.git"
+});
+
+Package.onUse(function(api) {
+
+  api.versionsFrom('METEOR@1.5.2');
+  
+  api.use([
+    'vulcan:core@1.8.0',
+  ]);
+
+  api.mainModule("lib/server/main.js", "server");
+  api.mainModule('lib/client/main.js', 'client');
+
+});
diff --git a/packages/vulcan-events-segment/lib/client/main.js b/packages/vulcan-events-segment/lib/client/main.js
new file mode 100644
index 000000000..288be2607
--- /dev/null
+++ b/packages/vulcan-events-segment/lib/client/main.js
@@ -0,0 +1,3 @@
+export * from '../modules/index';
+
+import './segment-client.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-segment/lib/client/segment-client.js b/packages/vulcan-events-segment/lib/client/segment-client.js
new file mode 100644
index 000000000..7c656e397
--- /dev/null
+++ b/packages/vulcan-events-segment/lib/client/segment-client.js
@@ -0,0 +1,110 @@
+import { getSetting, addCallback, Utils } from 'meteor/vulcan:core';
+import {
+  addPageFunction,
+  addInitFunction,
+  addIdentifyFunction,
+  addTrackFunction,
+} from 'meteor/vulcan:events';
+
+/*
+
+Track Page
+
+*/
+function segmentTrackPage(empty, route) {
+  const { name, path } = route;
+  const properties = {
+    url: Utils.getSiteUrl().slice(0, -1) + path,
+    path,
+  };
+  window.analytics.page(null, name, properties);
+  return {};
+}
+addPageFunction(segmentTrackPage);
+
+/*
+
+Identify User
+
+*/
+function segmentIdentify(currentUser) {
+  window.analytics.identify(currentUser.userId, {
+    email: currentUser.email,
+    pageUrl: currentUser.pageUrl,
+  });
+}
+addIdentifyFunction(segmentIdentify);
+
+/*
+
+Track Event
+
+*/
+function segmentTrack(eventName, eventProperties) {
+  analytics.track(eventName, eventProperties);
+}
+addTrackFunction(segmentTrack);
+
+/*
+
+Init Snippet
+
+*/
+function segmentInit() {
+  !(function() {
+    var analytics = (window.analytics = window.analytics || []);
+    if (!analytics.initialize)
+      if (analytics.invoked)
+        window.console &&
+          console.error &&
+          console.error('Segment snippet included twice.');
+      else {
+        analytics.invoked = !0;
+        analytics.methods = [
+          'trackSubmit',
+          'trackClick',
+          'trackLink',
+          'trackForm',
+          'pageview',
+          'identify',
+          'reset',
+          'group',
+          'track',
+          'ready',
+          'alias',
+          'debug',
+          'page',
+          'once',
+          'off',
+          'on',
+        ];
+        analytics.factory = function(t) {
+          return function() {
+            var e = Array.prototype.slice.call(arguments);
+            e.unshift(t);
+            analytics.push(e);
+            return analytics;
+          };
+        };
+        for (var t = 0; t < analytics.methods.length; t++) {
+          var e = analytics.methods[t];
+          analytics[e] = analytics.factory(e);
+        }
+        analytics.load = function(t) {
+          var e = document.createElement('script');
+          e.type = 'text/javascript';
+          e.async = !0;
+          e.src =
+            ('https:' === document.location.protocol ? 'https://' : 'http://') +
+            'cdn.segment.com/analytics.js/v1/' +
+            t +
+            '/analytics.min.js';
+          var n = document.getElementsByTagName('script')[0];
+          n.parentNode.insertBefore(e, n);
+        };
+        analytics.SNIPPET_VERSION = '4.0.0';
+        analytics.load(getSetting('segment.clientKey'));
+      }
+  })();
+}
+addInitFunction(segmentInit);
\ No newline at end of file
diff --git a/packages/vulcan-events-segment/lib/modules/index.js b/packages/vulcan-events-segment/lib/modules/index.js
new file mode 100644
index 000000000..f04e7c61d
--- /dev/null
+++ b/packages/vulcan-events-segment/lib/modules/index.js
@@ -0,0 +1,4 @@
+import { registerSetting } from 'meteor/vulcan:core';
+
+registerSetting('segment.clientKey', null, 'Segment client-side API key');
+registerSetting('segment.serverKey', null, 'Segment server-side API key');
diff --git a/packages/vulcan-events-segment/lib/server/main.js b/packages/vulcan-events-segment/lib/server/main.js
new file mode 100644
index 000000000..132be3f68
--- /dev/null
+++ b/packages/vulcan-events-segment/lib/server/main.js
@@ -0,0 +1,3 @@
+// export * from '../modules/index';
+
+export * from './segment-server.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-segment/lib/server/segment-server.js b/packages/vulcan-events-segment/lib/server/segment-server.js
new file mode 100644
index 000000000..fa4fb9e49
--- /dev/null
+++ b/packages/vulcan-events-segment/lib/server/segment-server.js
@@ -0,0 +1,5 @@
+import Analytics from 'analytics-node';
+import { getSetting } from 'meteor/vulcan:core';
+const analytics = new Analytics(getSetting('segment.serverKey'));
+
+export default analytics;
\ No newline at end of file
diff --git a/packages/vulcan-events-segment/package.js b/packages/vulcan-events-segment/package.js
new file mode 100644
index 000000000..9718a7444
--- /dev/null
+++ b/packages/vulcan-events-segment/package.js
@@ -0,0 +1,19 @@
+Package.describe({
+  name: "vulcan:events-segment",
+  summary: "Vulcan Segment",
+  version: '1.8.0',
+  git: "https://github.com/VulcanJS/Vulcan.git"
+});
+
+Package.onUse(function (api) {
+
+  api.versionsFrom('METEOR@1.5.2');
+
+  api.use([
+    'vulcan:core@1.8.0',
+  ]);
+
+  api.mainModule('lib/server/main.js', 'server');
+  api.mainModule('lib/client/main.js', 'client');
+
+});
diff --git a/packages/vulcan-events/lib/callbacks.js b/packages/vulcan-events/lib/callbacks.js
deleted file mode 100644
index 75d594d60..000000000
--- a/packages/vulcan-events/lib/callbacks.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { addCallback } from 'meteor/vulcan:core';
-import { sendGoogleAnalyticsRequest } from './helpers';
-
-// add client-side callback: log a ga request on page view
-addCallback('router.onUpdate', sendGoogleAnalyticsRequest);
\ No newline at end of file
diff --git a/packages/vulcan-events/lib/client.js b/packages/vulcan-events/lib/client.js
deleted file mode 100644
index 5f5e7d985..000000000
--- a/packages/vulcan-events/lib/client.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Events from './collection.js';
-import { initGoogleAnalytics } from './helpers.js';
-import './callbacks.js';
-
-// init google analytics on the client module
-initGoogleAnalytics();
-
-export default Events;
diff --git a/packages/vulcan-events/lib/client/main.js b/packages/vulcan-events/lib/client/main.js
new file mode 100644
index 000000000..67d11275b
--- /dev/null
+++ b/packages/vulcan-events/lib/client/main.js
@@ -0,0 +1 @@
+export * from '../modules/index.js';
\ No newline at end of file
diff --git a/packages/vulcan-events/lib/collection.js b/packages/vulcan-events/lib/collection.js
deleted file mode 100644
index 031492f08..000000000
--- a/packages/vulcan-events/lib/collection.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import SimpleSchema from 'simpl-schema';
-
-const Events = new Mongo.Collection('events');
-
-Events.schema = new SimpleSchema({
-  createdAt: {
-    type: Date
-  },
-  name: {
-    type: String
-  },
-  description: {
-    type: String,
-    optional: true
-  },
-  unique: {
-    type: Boolean,
-    optional: true
-  },
-  important: { // marking an event as important means it should never be erased
-    type: Boolean,
-    optional: true
-  },
-  properties: {
-    type: Object,
-    optional: true,
-    blackbox: true
-  }
-});
-
-Events.attachSchema(Events.schema);
-
-export default Events;
diff --git a/packages/vulcan-events/lib/helpers.js b/packages/vulcan-events/lib/helpers.js
deleted file mode 100644
index b3355c05c..000000000
--- a/packages/vulcan-events/lib/helpers.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { getSetting, registerSetting } from 'meteor/vulcan:core';
-import Events from './collection.js';
-
-registerSetting('googleAnalyticsId', null, 'Google Analytics ID');
-
-/*
-
-  We provide a special support for Google Analytics.
-  
-  If you want to enable GA page viewing / tracking, go to
-  your settings file and update the 'public > googleAnalyticsId' 
-  field with your GA unique identifier (UA-xxx...).
-
-*/
-
-export function sendGoogleAnalyticsRequest () {
-  if (window && window.ga) {
-    window.ga('send', 'pageview', {
-      'page': window.location.pathname
-    });
-  }
-  return {}
-}
-
-export const initGoogleAnalytics = () => {
-
-  // get the google analytics id from the settings
-  const googleAnalyticsId = getSetting('googleAnalyticsId');
-  
-  // the google analytics id exists & isn't the placeholder from sample_settings.json
-  if (googleAnalyticsId && googleAnalyticsId !== 'foo123') {
-
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    const cookieDomain = document.domain === 'localhost' ? 'none' : 'auto';
-
-    window.ga('create', googleAnalyticsId, cookieDomain);
-
-    // trigger first request once analytics are initialized
-    sendGoogleAnalyticsRequest();
-  }
-};
-
-
-// collection based logging
-Events.log = function (event) {
-
-  // if event is supposed to be unique, check if it has already been logged
-  if (!!event.unique && !!Events.findOne({name: event.name})) {
-    return;
-  }
-
-  event.createdAt = new Date();
-
-  Events.insert(event);
-
-};
diff --git a/packages/vulcan-events/lib/modules/collection.js b/packages/vulcan-events/lib/modules/collection.js
new file mode 100644
index 000000000..6204e9ea1
--- /dev/null
+++ b/packages/vulcan-events/lib/modules/collection.js
@@ -0,0 +1,16 @@
+import { createCollection, getDefaultResolvers } from 'meteor/vulcan:core';
+import schema from './schema.js';
+
+const Events = createCollection({
+
+  collectionName: 'Events',
+
+  typeName: 'Event',
+
+  schema,
+
+  resolvers: getDefaultResolvers('Events'),
+
+});
+
+export default Events;
diff --git a/packages/vulcan-events/lib/modules/events.js b/packages/vulcan-events/lib/modules/events.js
new file mode 100644
index 000000000..a06acbb00
--- /dev/null
+++ b/packages/vulcan-events/lib/modules/events.js
@@ -0,0 +1,29 @@
+import { addCallback } from 'meteor/vulcan:core';
+
+export const initFunctions = [];
+
+export const trackFunctions = [];
+
+export const addInitFunction = func => {
+  initFunctions.push(func);
+  // execute init function as soon as possible
+  func();  
+};
+
+export const addTrackFunction = func => {
+  trackFunctions.push(func);
+};
+
+export const track = (eventName, eventProperties) => {
+  trackFunctions.forEach(f => {
+    f(eventName, eventProperties);
+  });
+}
+
+export const addIdentifyFunction = func => {
+  addCallback('events.identify', func);
+};
+
+export const addPageFunction = func => {
+  addCallback('router.onUpdate', func);
+};
diff --git a/packages/vulcan-events/lib/modules/index.js b/packages/vulcan-events/lib/modules/index.js
new file mode 100644
index 000000000..51a9f4c86
--- /dev/null
+++ b/packages/vulcan-events/lib/modules/index.js
@@ -0,0 +1,2 @@
+export * from './collection.js';
+export * from './events';
\ No newline at end of file
diff --git a/packages/vulcan-events/lib/modules/schema.js b/packages/vulcan-events/lib/modules/schema.js
new file mode 100644
index 000000000..f2ed665a4
--- /dev/null
+++ b/packages/vulcan-events/lib/modules/schema.js
@@ -0,0 +1,28 @@
+const schema = {
+  createdAt: {
+    type: Date,
+  },
+  name: {
+    type: String,
+  },
+  description: {
+    type: String,
+    optional: true,
+  },
+  unique: {
+    type: Boolean,
+    optional: true,
+  },
+  important: {
+    // marking an event as important means it should never be erased
+    type: Boolean,
+    optional: true,
+  },
+  properties: {
+    type: Object,
+    optional: true,
+    blackbox: true,
+  },
+};
+
+export default schema;
\ No newline at end of file
diff --git a/packages/vulcan-events/lib/mutations.js b/packages/vulcan-events/lib/mutations.js
deleted file mode 100644
index 17a92a1aa..000000000
--- a/packages/vulcan-events/lib/mutations.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// import { GraphQLSchema } from 'meteor/vulcan:core';
-// // import Events from './collection.js';
-// import { requestAnalyticsAsync } from './helpers.js';
-
-// GraphQLSchema.addMutation('eventTrack(eventName: String, properties: JSON): JSON');
-
-// const resolvers = {
-//   Mutation: {
-//     eventTrack: (root, { eventName, properties }, context) => {
-//       const user = context.currentUser || {_id: 'anonymous'};
-      
-      
-//       return properties;
-//     },
-//   },
-// };
-
-// GraphQLSchema.addResolvers(resolvers);
diff --git a/packages/vulcan-events/lib/server.js b/packages/vulcan-events/lib/server.js
deleted file mode 100644
index 523fea258..000000000
--- a/packages/vulcan-events/lib/server.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Events from './collection.js';
-import './callbacks.js';
-// import './mutations.js';
-
-export default Events;
diff --git a/packages/vulcan-events/lib/server/main.js b/packages/vulcan-events/lib/server/main.js
new file mode 100644
index 000000000..67d11275b
--- /dev/null
+++ b/packages/vulcan-events/lib/server/main.js
@@ -0,0 +1 @@
+export * from '../modules/index.js';
\ No newline at end of file
diff --git a/packages/vulcan-events/package.js b/packages/vulcan-events/package.js
index 2d14c24b3..fb723f257 100644
--- a/packages/vulcan-events/package.js
+++ b/packages/vulcan-events/package.js
@@ -13,7 +13,7 @@ Package.onUse(function(api) {
     'vulcan:core@1.8.0',
   ]);
 
-  api.mainModule("lib/server.js", "server");
-  api.mainModule("lib/client.js", "client");
+  api.mainModule("lib/server/main.js", "server");
+  api.mainModule('lib/client/main.js', 'client');
 
 });
diff --git a/packages/vulcan-routing/lib/client/routing.jsx b/packages/vulcan-routing/lib/client/routing.jsx
index 98d8166c2..135e07075 100644
--- a/packages/vulcan-routing/lib/client/routing.jsx
+++ b/packages/vulcan-routing/lib/client/routing.jsx
@@ -64,7 +64,7 @@ Meteor.startup(() => {
         onUpdate: () => {
           // the first argument is an item to iterate on, needed by vulcan:lib/callbacks
           // note: this item is not used in this specific callback: router.onUpdate
-          runCallbacks('router.onUpdate', {}, store, apolloClient);
+          // runCallbacks('router.onUpdate', {}, store, apolloClient);
         },
         render: applyRouterMiddleware(useScroll((prevRouterProps, nextRouterProps) => {
           // if the action is REPLACE, return false so that we don't jump back to top of page

From 4d55c2f7883132157037c8d5074e821673c7e537 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Sun, 17 Dec 2017 18:00:48 +0900
Subject: [PATCH 54/69] Small fixes

---
 packages/vulcan-core/lib/modules/components/App.jsx         | 2 +-
 packages/vulcan-events-segment/lib/client/segment-client.js | 2 +-
 packages/vulcan-events/lib/modules/events.js                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/vulcan-core/lib/modules/components/App.jsx b/packages/vulcan-core/lib/modules/components/App.jsx
index 6d39edca4..e47fd659d 100644
--- a/packages/vulcan-core/lib/modules/components/App.jsx
+++ b/packages/vulcan-core/lib/modules/components/App.jsx
@@ -36,7 +36,7 @@ class App extends PureComponent {
   }
 
   componentWillUpdate(nextProps) {
-    if (nextProps.currentUser) {
+    if (!this.props.currentUser && nextProps.currentUser) {
       runCallbacks('events.identify', nextProps.currentUser);
     }
   }
diff --git a/packages/vulcan-events-segment/lib/client/segment-client.js b/packages/vulcan-events-segment/lib/client/segment-client.js
index 7c656e397..da80fc866 100644
--- a/packages/vulcan-events-segment/lib/client/segment-client.js
+++ b/packages/vulcan-events-segment/lib/client/segment-client.js
@@ -11,7 +11,7 @@ import {
 Track Page
 
 */
-function segmentTrackPage(empty, route) {
+function segmentTrackPage(route) {
   const { name, path } = route;
   const properties = {
     url: Utils.getSiteUrl().slice(0, -1) + path,
diff --git a/packages/vulcan-events/lib/modules/events.js b/packages/vulcan-events/lib/modules/events.js
index a06acbb00..eb321994c 100644
--- a/packages/vulcan-events/lib/modules/events.js
+++ b/packages/vulcan-events/lib/modules/events.js
@@ -25,5 +25,5 @@ export const addIdentifyFunction = func => {
 };
 
 export const addPageFunction = func => {
-  addCallback('router.onUpdate', func);
+  addCallback('router.onUpdate', (empty, route) => func(route));
 };

From 104b6304489a22a1c2aaa771dda9a76dad56732b Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Sun, 17 Dec 2017 20:59:26 +0900
Subject: [PATCH 55/69] Create new events-internal package to hold internal
 Mongo event tracking code

---
 .../lib/modules/components/RouterHook.jsx     | 16 +++++++-----
 packages/vulcan-events-internal/README.md     |  1 +
 .../lib/client/internal.js                    | 12 +++++++++
 .../vulcan-events-internal/lib/client/main.js |  3 +++
 .../lib/modules/collection.js                 |  0
 .../lib/modules/index.js                      |  1 +
 .../lib/modules/schema.js                     |  0
 .../vulcan-events-internal/lib/server/main.js |  1 +
 .../lib/server/mutations.js                   |  0
 packages/vulcan-events-internal/package.js    | 19 ++++++++++++++
 packages/vulcan-events/lib/modules/events.js  | 26 ++++++++++++-------
 packages/vulcan-events/lib/modules/index.js   |  1 -
 packages/vulcan-lib/lib/modules/callbacks.js  |  2 +-
 13 files changed, 64 insertions(+), 18 deletions(-)
 create mode 100644 packages/vulcan-events-internal/README.md
 create mode 100644 packages/vulcan-events-internal/lib/client/internal.js
 create mode 100644 packages/vulcan-events-internal/lib/client/main.js
 rename packages/{vulcan-events => vulcan-events-internal}/lib/modules/collection.js (100%)
 create mode 100644 packages/vulcan-events-internal/lib/modules/index.js
 rename packages/{vulcan-events => vulcan-events-internal}/lib/modules/schema.js (100%)
 create mode 100644 packages/vulcan-events-internal/lib/server/main.js
 create mode 100644 packages/vulcan-events-internal/lib/server/mutations.js
 create mode 100644 packages/vulcan-events-internal/package.js

diff --git a/packages/vulcan-core/lib/modules/components/RouterHook.jsx b/packages/vulcan-core/lib/modules/components/RouterHook.jsx
index 97964915e..9b9254043 100644
--- a/packages/vulcan-core/lib/modules/components/RouterHook.jsx
+++ b/packages/vulcan-core/lib/modules/components/RouterHook.jsx
@@ -5,18 +5,20 @@ import { withApollo } from 'react-apollo';
 class RouterHook extends PureComponent {
   constructor(props) {
     super(props);
-    const { currentRoute, client } = props;
-    console.log(props)
-    // the first argument is an item to iterate on, needed by vulcan:lib/callbacks
-    // note: this item is not used in this specific callback: router.onUpdate
-    runCallbacks('router.onUpdate', {}, currentRoute, client.store, client);
+    this.runOnUpdateCallback(props);
   }
+
   componentWillReceiveProps(nextProps) {
-    const { currentRoute, client } = nextProps;
+    this.runOnUpdateCallback(nextProps);
+  }
+
+  runOnUpdateCallback = props => {
+    const { currentRoute, client } = props;
     // the first argument is an item to iterate on, needed by vulcan:lib/callbacks
     // note: this item is not used in this specific callback: router.onUpdate
     runCallbacks('router.onUpdate', {}, currentRoute, client.store, client);
-  }
+  };
+
   render() {
     return null;
   }
diff --git a/packages/vulcan-events-internal/README.md b/packages/vulcan-events-internal/README.md
new file mode 100644
index 000000000..70247b7e5
--- /dev/null
+++ b/packages/vulcan-events-internal/README.md
@@ -0,0 +1 @@
+Vulcan events package, used internally. 
\ No newline at end of file
diff --git a/packages/vulcan-events-internal/lib/client/internal.js b/packages/vulcan-events-internal/lib/client/internal.js
new file mode 100644
index 000000000..0ef3cce46
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/client/internal.js
@@ -0,0 +1,12 @@
+import { addTrackFunction } from 'meteor/vulcan:events';
+import { ApolloClient } from 'apollo-client';
+import { getRenderContext } from 'meteor/vulcan:lib';
+import gql from 'graphql-tag';
+
+function trackInternal() {
+  const { apolloClient, store } = getRenderContext();
+  console.log(apolloClient)
+  apolloClient.query({ query: gql`{ hello }` }).then(console.log);
+}
+
+addTrackFunction(trackInternal);
diff --git a/packages/vulcan-events-internal/lib/client/main.js b/packages/vulcan-events-internal/lib/client/main.js
new file mode 100644
index 000000000..f6d2a5738
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/client/main.js
@@ -0,0 +1,3 @@
+export * from '../modules/index.js';
+
+import './internal.js';
\ No newline at end of file
diff --git a/packages/vulcan-events/lib/modules/collection.js b/packages/vulcan-events-internal/lib/modules/collection.js
similarity index 100%
rename from packages/vulcan-events/lib/modules/collection.js
rename to packages/vulcan-events-internal/lib/modules/collection.js
diff --git a/packages/vulcan-events-internal/lib/modules/index.js b/packages/vulcan-events-internal/lib/modules/index.js
new file mode 100644
index 000000000..d193f1a60
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/modules/index.js
@@ -0,0 +1 @@
+export * from './collection.js';
\ No newline at end of file
diff --git a/packages/vulcan-events/lib/modules/schema.js b/packages/vulcan-events-internal/lib/modules/schema.js
similarity index 100%
rename from packages/vulcan-events/lib/modules/schema.js
rename to packages/vulcan-events-internal/lib/modules/schema.js
diff --git a/packages/vulcan-events-internal/lib/server/main.js b/packages/vulcan-events-internal/lib/server/main.js
new file mode 100644
index 000000000..67d11275b
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/server/main.js
@@ -0,0 +1 @@
+export * from '../modules/index.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-internal/lib/server/mutations.js b/packages/vulcan-events-internal/lib/server/mutations.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/vulcan-events-internal/package.js b/packages/vulcan-events-internal/package.js
new file mode 100644
index 000000000..8fa110f8e
--- /dev/null
+++ b/packages/vulcan-events-internal/package.js
@@ -0,0 +1,19 @@
+Package.describe({
+  name: "vulcan:events-internal",
+  summary: "Vulcan internal event tracking package",
+  version: '1.8.0',
+  git: "https://github.com/VulcanJS/Vulcan.git"
+});
+
+Package.onUse(function(api) {
+
+  api.versionsFrom('METEOR@1.5.2');
+  
+  api.use([
+    'vulcan:core@1.8.0',
+  ]);
+
+  api.mainModule("lib/server/main.js", "server");
+  api.mainModule('lib/client/main.js', 'client');
+
+});
diff --git a/packages/vulcan-events/lib/modules/events.js b/packages/vulcan-events/lib/modules/events.js
index eb321994c..4ac73e92f 100644
--- a/packages/vulcan-events/lib/modules/events.js
+++ b/packages/vulcan-events/lib/modules/events.js
@@ -4,14 +4,14 @@ export const initFunctions = [];
 
 export const trackFunctions = [];
 
-export const addInitFunction = func => {
-  initFunctions.push(func);
+export const addInitFunction = f => {
+  initFunctions.push(f);
   // execute init function as soon as possible
-  func();  
+  f();  
 };
 
-export const addTrackFunction = func => {
-  trackFunctions.push(func);
+export const addTrackFunction = f => {
+  trackFunctions.push(f);
 };
 
 export const track = (eventName, eventProperties) => {
@@ -20,10 +20,18 @@ export const track = (eventName, eventProperties) => {
   });
 }
 
-export const addIdentifyFunction = func => {
-  addCallback('events.identify', func);
+export const addIdentifyFunction = f => {
+  addCallback('events.identify', f);
 };
 
-export const addPageFunction = func => {
-  addCallback('router.onUpdate', (empty, route) => func(route));
+export const addPageFunction = f => {
+  const f2 = (empty, route) => f(route);
+
+  // rename f2 to same name as f
+  // see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
+  const descriptor = Object.create(null); // no inherited properties
+  descriptor.value = f.name;
+  Object.defineProperty(f2, 'name', descriptor)
+
+  addCallback('router.onUpdate', f2);
 };
diff --git a/packages/vulcan-events/lib/modules/index.js b/packages/vulcan-events/lib/modules/index.js
index 51a9f4c86..099399ac2 100644
--- a/packages/vulcan-events/lib/modules/index.js
+++ b/packages/vulcan-events/lib/modules/index.js
@@ -1,2 +1 @@
-export * from './collection.js';
 export * from './events';
\ No newline at end of file
diff --git a/packages/vulcan-lib/lib/modules/callbacks.js b/packages/vulcan-lib/lib/modules/callbacks.js
index 26ba1a71a..0360efdc3 100644
--- a/packages/vulcan-lib/lib/modules/callbacks.js
+++ b/packages/vulcan-lib/lib/modules/callbacks.js
@@ -87,7 +87,7 @@ export const runCallbacks = function () {
 
         if (typeof result === 'undefined') {
           // if result of current iteration is undefined, don't pass it on
-          console.log(`// Warning: Sync callback [${callback.name}] in hook [${hook}] didn't return a result!`)
+          debug(`// Warning: Sync callback [${callback.name}] in hook [${hook}] didn't return a result!`)
           return accumulator
         } else {
           return result;

From 84c9442ed1f61415edb885551135af15e252d922 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Mon, 18 Dec 2017 09:01:24 +0900
Subject: [PATCH 56/69] Enable inserting events in MongoDB via track()

---
 .../lib/client/internal.js                    | 19 ++++++++++++++++---
 .../lib/modules/collection.js                 | 13 ++++++++++++-
 .../lib/modules/schema.js                     | 10 ++++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/packages/vulcan-events-internal/lib/client/internal.js b/packages/vulcan-events-internal/lib/client/internal.js
index 0ef3cce46..3651371b9 100644
--- a/packages/vulcan-events-internal/lib/client/internal.js
+++ b/packages/vulcan-events-internal/lib/client/internal.js
@@ -3,10 +3,23 @@ import { ApolloClient } from 'apollo-client';
 import { getRenderContext } from 'meteor/vulcan:lib';
 import gql from 'graphql-tag';
 
-function trackInternal() {
+function trackInternal(eventName, eventProperties) {
   const { apolloClient, store } = getRenderContext();
-  console.log(apolloClient)
-  apolloClient.query({ query: gql`{ hello }` }).then(console.log);
+  const mutation = gql`
+    mutation EventsNew($document: EventsInput) {
+      EventsNew(document: $document) {
+        name
+        createdAt
+      }
+    }
+  `;
+  const variables = {
+    document: {
+      name: eventName,
+      properties: eventProperties,
+    },
+  };
+  apolloClient.mutate({ mutation, variables });
 }
 
 addTrackFunction(trackInternal);
diff --git a/packages/vulcan-events-internal/lib/modules/collection.js b/packages/vulcan-events-internal/lib/modules/collection.js
index 6204e9ea1..b8ba51bd6 100644
--- a/packages/vulcan-events-internal/lib/modules/collection.js
+++ b/packages/vulcan-events-internal/lib/modules/collection.js
@@ -1,5 +1,6 @@
-import { createCollection, getDefaultResolvers } from 'meteor/vulcan:core';
+import { createCollection, getDefaultResolvers, getDefaultMutations } from 'meteor/vulcan:core';
 import schema from './schema.js';
+import Users from 'meteor/vulcan:users';
 
 const Events = createCollection({
 
@@ -11,6 +12,16 @@ const Events = createCollection({
 
   resolvers: getDefaultResolvers('Events'),
 
+  mutations: getDefaultMutations('Events', {
+    newCheck: () => true,
+    editCheck: () => false,
+    removeCheck: () => false
+  })
+
 });
 
+Events.checkAccess = (currentUser, doc) => {
+  return Users.isAdmin(currentUser);
+}
+
 export default Events;
diff --git a/packages/vulcan-events-internal/lib/modules/schema.js b/packages/vulcan-events-internal/lib/modules/schema.js
index f2ed665a4..6f216bb50 100644
--- a/packages/vulcan-events-internal/lib/modules/schema.js
+++ b/packages/vulcan-events-internal/lib/modules/schema.js
@@ -1,9 +1,18 @@
 const schema = {
   createdAt: {
     type: Date,
+    optional: true,
+    onInsert: () => {
+      return new Date()
+    }
   },
   name: {
     type: String,
+    insertableBy: ['guests'],
+  },
+  userId: {
+    type: String,
+    optional: true,
   },
   description: {
     type: String,
@@ -22,6 +31,7 @@ const schema = {
     type: Object,
     optional: true,
     blackbox: true,
+    insertableBy: ['guests'],
   },
 };
 

From 010fff2e2160280c26c74e446232766409f238f9 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Mon, 18 Dec 2017 09:57:17 +0900
Subject: [PATCH 57/69] Implement server-side internal event tracking

---
 .../lib/modules/default_mutations.js          |  2 +-
 .../lib/modules/callbacks/schema.js           | 14 ++++----------
 .../{internal.js => internal-client.js}       |  0
 .../vulcan-events-internal/lib/client/main.js |  2 +-
 .../lib/server/internal-server.js             | 19 +++++++++++++++++++
 .../vulcan-events-internal/lib/server/main.js |  4 +++-
 .../lib/server/mutations.js                   |  0
 packages/vulcan-events/lib/modules/events.js  | 14 +++++++-------
 packages/vulcan-lib/lib/server/mutations.js   |  6 +++---
 9 files changed, 38 insertions(+), 23 deletions(-)
 rename packages/vulcan-events-internal/lib/client/{internal.js => internal-client.js} (100%)
 create mode 100644 packages/vulcan-events-internal/lib/server/internal-server.js
 delete mode 100644 packages/vulcan-events-internal/lib/server/mutations.js

diff --git a/packages/vulcan-core/lib/modules/default_mutations.js b/packages/vulcan-core/lib/modules/default_mutations.js
index ebee4bf45..76bde3cfc 100644
--- a/packages/vulcan-core/lib/modules/default_mutations.js
+++ b/packages/vulcan-core/lib/modules/default_mutations.js
@@ -186,7 +186,7 @@ const registerCollectionCallbacks = collectionName => {
   });
   registerCallback({
     name: `${collectionName}.edit.async`, 
-    arguments: [{newDocument: 'The document after the edit', document: 'The document before the edit'}, {currentUser: 'The current user'}, {collection: 'The collection the document belongs to'}], 
+    arguments: [{newDocument: 'The document after the edit'}, {document: 'The document before the edit'}, {currentUser: 'The current user'}, {collection: 'The collection the document belongs to'}], 
     runs: 'async', 
     returns: null,
     description: `Perform operations on a document after it's updated in the database asynchronously.`
diff --git a/packages/vulcan-debug/lib/modules/callbacks/schema.js b/packages/vulcan-debug/lib/modules/callbacks/schema.js
index 86cc28bbe..52643074c 100644
--- a/packages/vulcan-debug/lib/modules/callbacks/schema.js
+++ b/packages/vulcan-debug/lib/modules/callbacks/schema.js
@@ -1,7 +1,6 @@
 import { Callbacks } from 'meteor/vulcan:lib';
 
 const schema = {
-
   name: {
     label: 'Name',
     type: String,
@@ -43,21 +42,16 @@ const schema = {
     viewableBy: ['admins'],
     resolveAs: {
       type: '[String]',
-      resolver: (callback) => {
-        console.log('// callback')
-        console.log(callback)
-        console.log(Callbacks[callback.name])
+      resolver: callback => {
         if (Callbacks[callback.name]) {
           const callbacks = Callbacks[callback.name].map(f => f.name);
-          console.log(callbacks)
           return callbacks;
         } else {
           return [];
         }
-      }
-    }
-  }
-
+      },
+    },
+  },
 };
 
 export default schema;
diff --git a/packages/vulcan-events-internal/lib/client/internal.js b/packages/vulcan-events-internal/lib/client/internal-client.js
similarity index 100%
rename from packages/vulcan-events-internal/lib/client/internal.js
rename to packages/vulcan-events-internal/lib/client/internal-client.js
diff --git a/packages/vulcan-events-internal/lib/client/main.js b/packages/vulcan-events-internal/lib/client/main.js
index f6d2a5738..c24f47e84 100644
--- a/packages/vulcan-events-internal/lib/client/main.js
+++ b/packages/vulcan-events-internal/lib/client/main.js
@@ -1,3 +1,3 @@
 export * from '../modules/index.js';
 
-import './internal.js';
\ No newline at end of file
+import './internal-client.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-internal/lib/server/internal-server.js b/packages/vulcan-events-internal/lib/server/internal-server.js
new file mode 100644
index 000000000..b966fe0b1
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/server/internal-server.js
@@ -0,0 +1,19 @@
+import { addTrackFunction } from 'meteor/vulcan:events';
+import { newMutation } from 'meteor/vulcan:lib';
+import Events from '../modules/collection';
+
+async function trackInternalServer(eventName, eventProperties, currentUser) {
+  const document = {
+    name: eventName,
+    properties: eventProperties,
+  };
+  return await newMutation({
+    collection: Events,
+    document,
+    currentUser,
+    validate: false,
+    context: {},
+  });
+}
+
+addTrackFunction(trackInternalServer);
diff --git a/packages/vulcan-events-internal/lib/server/main.js b/packages/vulcan-events-internal/lib/server/main.js
index 67d11275b..e9da5ae82 100644
--- a/packages/vulcan-events-internal/lib/server/main.js
+++ b/packages/vulcan-events-internal/lib/server/main.js
@@ -1 +1,3 @@
-export * from '../modules/index.js';
\ No newline at end of file
+export * from '../modules/index.js';
+
+import './internal-server';
diff --git a/packages/vulcan-events-internal/lib/server/mutations.js b/packages/vulcan-events-internal/lib/server/mutations.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/vulcan-events/lib/modules/events.js b/packages/vulcan-events/lib/modules/events.js
index 4ac73e92f..2ebc21eed 100644
--- a/packages/vulcan-events/lib/modules/events.js
+++ b/packages/vulcan-events/lib/modules/events.js
@@ -7,18 +7,18 @@ export const trackFunctions = [];
 export const addInitFunction = f => {
   initFunctions.push(f);
   // execute init function as soon as possible
-  f();  
+  f();
 };
 
 export const addTrackFunction = f => {
   trackFunctions.push(f);
 };
 
-export const track = (eventName, eventProperties) => {
-  trackFunctions.forEach(f => {
-    f(eventName, eventProperties);
-  });
-}
+export const track = async (eventName, eventProperties, currentUser) => {
+  for (let f of trackFunctions) {
+    await f(eventName, eventProperties, currentUser);
+  }
+};
 
 export const addIdentifyFunction = f => {
   addCallback('events.identify', f);
@@ -31,7 +31,7 @@ export const addPageFunction = f => {
   // see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
   const descriptor = Object.create(null); // no inherited properties
   descriptor.value = f.name;
-  Object.defineProperty(f2, 'name', descriptor)
+  Object.defineProperty(f2, 'name', descriptor);
 
   addCallback('router.onUpdate', f2);
 };
diff --git a/packages/vulcan-lib/lib/server/mutations.js b/packages/vulcan-lib/lib/server/mutations.js
index 2e499a74d..99e90b83d 100644
--- a/packages/vulcan-lib/lib/server/mutations.js
+++ b/packages/vulcan-lib/lib/server/mutations.js
@@ -98,7 +98,7 @@ export const newMutation = async ({ collection, document, currentUser, validate,
 
   // run async callbacks
   // note: query for document to get fresh document with collection-hooks effects applied
-  runCallbacksAsync(`${collectionName}.new.async`, insertedDocument, currentUser, collection);
+  await runCallbacksAsync(`${collectionName}.new.async`, insertedDocument, currentUser, collection);
 
   debug('// new mutation finished:');
   debug(newDocument);
@@ -187,7 +187,7 @@ export const editMutation = async ({ collection, documentId, set = {}, unset = {
   newDocument = await runCallbacks(`${collectionName}.edit.after`, newDocument, document, currentUser);
 
   // run async callbacks
-  runCallbacksAsync(`${collectionName}.edit.async`, newDocument, document, currentUser, collection);
+  await runCallbacksAsync(`${collectionName}.edit.async`, newDocument, document, currentUser, collection);
 
   debug('// edit mutation finished')
   debug('// modifier: ', modifier)
@@ -232,7 +232,7 @@ export const removeMutation = async ({ collection, documentId, currentUser, vali
     collection.loader.clear(documentId);
   }
 
-  runCallbacksAsync(`${collectionName}.remove.async`, document, currentUser, collection);
+  await runCallbacksAsync(`${collectionName}.remove.async`, document, currentUser, collection);
 
   return document;
 }

From f05c2bcab57a23aef97fcc7edb2b56b8f49744d4 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Mon, 18 Dec 2017 10:13:17 +0900
Subject: [PATCH 58/69] Implement server-side tracking for Segment; add
 server-side 'events.identify' hook

---
 .../lib/server/segment-server.js              | 34 +++++++++++++++++--
 .../vulcan-lib/lib/server/apollo_server.js    |  4 +++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/packages/vulcan-events-segment/lib/server/segment-server.js b/packages/vulcan-events-segment/lib/server/segment-server.js
index fa4fb9e49..e49c1c0d0 100644
--- a/packages/vulcan-events-segment/lib/server/segment-server.js
+++ b/packages/vulcan-events-segment/lib/server/segment-server.js
@@ -1,5 +1,35 @@
 import Analytics from 'analytics-node';
-import { getSetting } from 'meteor/vulcan:core';
+import { getSetting, addCallback, Utils } from 'meteor/vulcan:core';
+import { addPageFunction, addInitFunction, addIdentifyFunction, addTrackFunction } from 'meteor/vulcan:events';
+
 const analytics = new Analytics(getSetting('segment.serverKey'));
 
-export default analytics;
\ No newline at end of file
+/*
+
+Identify User
+
+*/
+function segmentIdentifyServer(currentUser) {
+  analytics.identify({
+    userId: currentUser._id,
+    traits: {
+      email: currentUser.email,
+      pageUrl: currentUser.pageUrl,
+    },
+  });
+}
+addIdentifyFunction(segmentIdentifyServer);
+
+/*
+
+Track Event
+
+*/
+function segmentTrackServer(eventName, eventProperties, currentUser) {
+  analytics.track({
+    event: eventName,
+    properties: eventProperties,
+    userId: currentUser && currentUser._id,
+  });
+}
+addTrackFunction(segmentTrackServer);
diff --git a/packages/vulcan-lib/lib/server/apollo_server.js b/packages/vulcan-lib/lib/server/apollo_server.js
index c6863335e..ee29eb4b2 100644
--- a/packages/vulcan-lib/lib/server/apollo_server.js
+++ b/packages/vulcan-lib/lib/server/apollo_server.js
@@ -152,6 +152,10 @@ const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
       );
 
       if (user) {
+
+        // identify user to any server-side analytics providers
+        runCallbacks('events.identify', user);
+
         const loginToken = Utils.findWhere(user.services.resume.loginTokens, { hashedToken });
         const expiresAt = Accounts._tokenExpiration(loginToken.when);
         const isExpired = expiresAt < new Date();

From 0a7500ac66fff539b6918a80a730c42796b7c7e7 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Wed, 20 Dec 2017 09:43:00 +0900
Subject: [PATCH 59/69] Fix double slashes in site image path

---
 packages/vulcan-core/lib/modules/components/HeadTags.jsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/vulcan-core/lib/modules/components/HeadTags.jsx b/packages/vulcan-core/lib/modules/components/HeadTags.jsx
index 82a331894..da9b49a4b 100644
--- a/packages/vulcan-core/lib/modules/components/HeadTags.jsx
+++ b/packages/vulcan-core/lib/modules/components/HeadTags.jsx
@@ -28,6 +28,10 @@ class HeadTags extends PureComponent {
 
     // add site url base if the image is stored locally
     if (!!image && image.indexOf('//') === -1) {
+      // remove starting slash from image path if needed
+      if (image.charAt(0) === '/') {
+        image = image.slice(1);
+      }
       image = Utils.getSiteUrl() + image;
     }
 

From 5ed20fe7f5f4782108e89edffd9f0e99c7cb4b94 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Wed, 20 Dec 2017 09:43:13 +0900
Subject: [PATCH 60/69] More work on events stuff

---
 packages/vulcan-events-ga/package.js          |  1 +
 packages/vulcan-events-internal/package.js    |  1 +
 .../lib/server/segment-server.js              | 59 ++++++++++---------
 packages/vulcan-events-segment/package.js     |  1 +
 4 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/packages/vulcan-events-ga/package.js b/packages/vulcan-events-ga/package.js
index 5fab99d7d..98f68b942 100644
--- a/packages/vulcan-events-ga/package.js
+++ b/packages/vulcan-events-ga/package.js
@@ -11,6 +11,7 @@ Package.onUse(function(api) {
   
   api.use([
     'vulcan:core@1.8.0',
+    'vulcan:events@1.8.0',
   ]);
 
   api.mainModule("lib/server/main.js", "server");
diff --git a/packages/vulcan-events-internal/package.js b/packages/vulcan-events-internal/package.js
index 8fa110f8e..8277bb01c 100644
--- a/packages/vulcan-events-internal/package.js
+++ b/packages/vulcan-events-internal/package.js
@@ -11,6 +11,7 @@ Package.onUse(function(api) {
   
   api.use([
     'vulcan:core@1.8.0',
+    'vulcan:events@1.8.0',
   ]);
 
   api.mainModule("lib/server/main.js", "server");
diff --git a/packages/vulcan-events-segment/lib/server/segment-server.js b/packages/vulcan-events-segment/lib/server/segment-server.js
index e49c1c0d0..6d19e9a6b 100644
--- a/packages/vulcan-events-segment/lib/server/segment-server.js
+++ b/packages/vulcan-events-segment/lib/server/segment-server.js
@@ -2,34 +2,39 @@ import Analytics from 'analytics-node';
 import { getSetting, addCallback, Utils } from 'meteor/vulcan:core';
 import { addPageFunction, addInitFunction, addIdentifyFunction, addTrackFunction } from 'meteor/vulcan:events';
 
-const analytics = new Analytics(getSetting('segment.serverKey'));
+const segmentWriteKey = getSetting('segment.serverKey');
 
-/*
+if (segmentWriteKey) {
 
-Identify User
+  const analytics = new Analytics(segmentWriteKey);
 
-*/
-function segmentIdentifyServer(currentUser) {
-  analytics.identify({
-    userId: currentUser._id,
-    traits: {
-      email: currentUser.email,
-      pageUrl: currentUser.pageUrl,
-    },
-  });
+  /*
+
+  Identify User
+
+  */
+  function segmentIdentifyServer(currentUser) {
+    analytics.identify({
+      userId: currentUser._id,
+      traits: {
+        email: currentUser.email,
+        pageUrl: currentUser.pageUrl,
+      },
+    });
+  }
+  addIdentifyFunction(segmentIdentifyServer);
+
+  /*
+
+  Track Event
+
+  */
+  function segmentTrackServer(eventName, eventProperties, currentUser) {
+    analytics.track({
+      event: eventName,
+      properties: eventProperties,
+      userId: currentUser && currentUser._id,
+    });
+  }
+  addTrackFunction(segmentTrackServer);
 }
-addIdentifyFunction(segmentIdentifyServer);
-
-/*
-
-Track Event
-
-*/
-function segmentTrackServer(eventName, eventProperties, currentUser) {
-  analytics.track({
-    event: eventName,
-    properties: eventProperties,
-    userId: currentUser && currentUser._id,
-  });
-}
-addTrackFunction(segmentTrackServer);
diff --git a/packages/vulcan-events-segment/package.js b/packages/vulcan-events-segment/package.js
index 9718a7444..837a63839 100644
--- a/packages/vulcan-events-segment/package.js
+++ b/packages/vulcan-events-segment/package.js
@@ -11,6 +11,7 @@ Package.onUse(function (api) {
 
   api.use([
     'vulcan:core@1.8.0',
+    'vulcan:events@1.8.0',
   ]);
 
   api.mainModule('lib/server/main.js', 'server');

From 3f07f024c817bc2355ebaad9dc22814fa5f61e05 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Wed, 20 Dec 2017 09:43:30 +0900
Subject: [PATCH 61/69] Rename users.new.validate.before callback

---
 packages/vulcan-users/lib/server/on_create_user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vulcan-users/lib/server/on_create_user.js b/packages/vulcan-users/lib/server/on_create_user.js
index fc964c82a..929ccd957 100644
--- a/packages/vulcan-users/lib/server/on_create_user.js
+++ b/packages/vulcan-users/lib/server/on_create_user.js
@@ -8,7 +8,7 @@ function onCreateUserCallback (options, user) {
   delete options.password; // we don't need to store the password digest
   delete options.username; // username is already in user object
 
-  options = runCallbacks(`users.new.pre_validate`, options);
+  options = runCallbacks(`users.new.validate.before`, options);
 
   // validate options since they can't be trusted
   Users.simpleSchema().validate(options);

From 0fb118b5347d60a83abf4b69d97174e92707c3fb Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Wed, 20 Dec 2017 09:43:42 +0900
Subject: [PATCH 62/69] Pass on error data to flash component to help with
 #1787

---
 packages/vulcan-forms/lib/components/Form.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx
index 713a8667d..f8527995c 100644
--- a/packages/vulcan-forms/lib/components/Form.jsx
+++ b/packages/vulcan-forms/lib/components/Form.jsx
@@ -361,7 +361,8 @@ class Form extends Component {
 
             message = error.data.errors.map(error => {
               return {
-                content: this.getErrorMessage(error)
+                content: this.getErrorMessage(error),
+                data: error.data,
               }
             });
 

From 16412207b95dca9639a082559af40130a1409911 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Wed, 20 Dec 2017 13:46:03 +0900
Subject: [PATCH 63/69] Use full URL for logoUrl resolver

---
 packages/vulcan-lib/lib/modules/utils.js |  3 ++-
 packages/vulcan-lib/lib/server/site.js   | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/vulcan-lib/lib/modules/utils.js b/packages/vulcan-lib/lib/modules/utils.js
index 7e8ad604b..e5afc4da7 100644
--- a/packages/vulcan-lib/lib/modules/utils.js
+++ b/packages/vulcan-lib/lib/modules/utils.js
@@ -11,6 +11,7 @@ import sanitizeHtml from 'sanitize-html';
 import getSlug from 'speakingurl';
 import { getSetting, registerSetting } from './settings.js';
 import { Routes } from './routes.js';
+import { isAbsolute } from 'path';
 
 registerSetting('debug', false, 'Enable debug mode (more verbose logging)');
 
@@ -288,7 +289,7 @@ Utils.getFieldLabel = (fieldName, collection) => {
 
 Utils.getLogoUrl = () => {
   const logoUrl = getSetting('logoUrl');
-  if (!!logoUrl) {
+  if (logoUrl) {
     const prefix = Utils.getSiteUrl().slice(0,-1);
     // the logo may be hosted on another website
     return logoUrl.indexOf('://') > -1 ? logoUrl : prefix + logoUrl;
diff --git a/packages/vulcan-lib/lib/server/site.js b/packages/vulcan-lib/lib/server/site.js
index d7e9b8367..b4eece7b9 100644
--- a/packages/vulcan-lib/lib/server/site.js
+++ b/packages/vulcan-lib/lib/server/site.js
@@ -1,4 +1,5 @@
 import { addGraphQLSchema, addGraphQLResolvers, addGraphQLQuery } from '../modules/graphql.js';
+import { Utils } from '../modules/utils';
 import { getSetting, registerSetting } from '../modules/settings.js';
 
 const siteSchema = `
@@ -14,12 +15,12 @@ const siteResolvers = {
   Query: {
     SiteData(root, args, context) {
       return {
-      	title: getSetting('title'), 
-      	url: getSetting('siteUrl', Meteor.absoluteUrl()),
-      	logoUrl: getSetting('logoUrl'),
-      }
-    }
-  }
+        title: getSetting('title'),
+        url: getSetting('siteUrl', Meteor.absoluteUrl()),
+        logoUrl: Utils.getLogoUrl(),
+      };
+    },
+  },
 };
 
 addGraphQLResolvers(siteResolvers);

From a8526f8505705e725fe631d008cc5c6bc6893f92 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Thu, 21 Dec 2017 10:04:16 +0900
Subject: [PATCH 64/69] Fix image deletion bug (see #1788)

---
 packages/vulcan-forms-upload/lib/Upload.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vulcan-forms-upload/lib/Upload.jsx b/packages/vulcan-forms-upload/lib/Upload.jsx
index 14f17c7e1..bc0030af2 100755
--- a/packages/vulcan-forms-upload/lib/Upload.jsx
+++ b/packages/vulcan-forms-upload/lib/Upload.jsx
@@ -169,15 +169,15 @@ class Upload extends PureComponent {
     const newValue = this.enableMultiple() ? removeNthItem(this.state.value, index): '';
     this.context.addToAutofilledValues({[this.props.name]: newValue});
     this.setState({
-      preview: newValue,
+      preview: null,
       value: newValue,
     });
   }
 
   render() {
     const { uploading, preview, value } = this.state;
+    
     // show the actual uploaded image or the preview
-
     const imageData = this.enableMultiple() ? (preview ? value.concat(preview) : value) : value || preview;
 
     return (

From 3aeb21165330a41b1b751d225f867779fe86fc25 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Mon, 25 Dec 2017 15:39:22 +0900
Subject: [PATCH 65/69] Enable anonymous insert mutations (for event tracking)

---
 packages/vulcan-lib/lib/server/mutations.js | 14 ++++++++++----
 packages/vulcan-users/lib/permissions.js    |  4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/vulcan-lib/lib/server/mutations.js b/packages/vulcan-lib/lib/server/mutations.js
index 99e90b83d..27de03a87 100644
--- a/packages/vulcan-lib/lib/server/mutations.js
+++ b/packages/vulcan-lib/lib/server/mutations.js
@@ -60,10 +60,12 @@ export const newMutation = async ({ collection, document, currentUser, validate,
 
   }
   
-  // check if userId field is in the schema and add it to document if needed
-  const userIdInSchema = Object.keys(schema).find(key => key === 'userId');
-  if (!!userIdInSchema && !newDocument.userId) newDocument.userId = currentUser._id;
-
+  // if user is logged in, check if userId field is in the schema and add it to document if needed
+  if (currentUser) {
+    const userIdInSchema = Object.keys(schema).find(key => key === 'userId');
+    if (!!userIdInSchema && !newDocument.userId) newDocument.userId = currentUser._id;
+  }
+  
   // run onInsert step
   // note: cannot use forEach with async/await. 
   // See https://stackoverflow.com/a/37576787/649299
@@ -236,3 +238,7 @@ export const removeMutation = async ({ collection, documentId, currentUser, vali
 
   return document;
 }
+
+export const newMutator = newMutation;
+export const editMutator = editMutation;
+export const removeMutator = removeMutation;
\ No newline at end of file
diff --git a/packages/vulcan-users/lib/permissions.js b/packages/vulcan-users/lib/permissions.js
index c76c9e7ff..0022f1a62 100644
--- a/packages/vulcan-users/lib/permissions.js
+++ b/packages/vulcan-users/lib/permissions.js
@@ -251,7 +251,7 @@ Users.restrictViewableFields = function (user, collection, docOrDocs) {
  * @param {Object} field - The field being edited or inserted
  */
 Users.canInsertField = function (user, field) {
-  if (user && field.insertableBy) {
+  if (field.insertableBy) {
     return typeof field.insertableBy === 'function' ? field.insertableBy(user) : Users.isMemberOf(user, field.insertableBy)
   }
   return false;
@@ -263,7 +263,7 @@ Users.canInsertField = function (user, field) {
  * @param {Object} field - The field being edited or inserted
  */
 Users.canEditField = function (user, field, document) {
-  if (user && field.editableBy) {
+  if (field.editableBy) {
     return typeof field.editableBy === 'function' ? field.editableBy(user, document) : Users.isMemberOf(user, field.editableBy)
   }
   return false;

From 38b1df1fe47e0b51b8a718109bfab538dd5c0f27 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Tue, 26 Dec 2017 11:16:49 +0900
Subject: [PATCH 66/69] vulcan-intercom -> vulcan-events-intercom

---
 .../README.md                                 |   0
 .../lib/client/intercom-client.js             | 103 ++++++++++++++++++
 .../vulcan-events-intercom/lib/client/main.js |   3 +
 .../lib/modules/index.js                      |   0
 .../lib/server/intercom-server.js             |  49 +++++++++
 .../lib/server/main.js                        |   0
 .../package.js                                |   5 +-
 packages/vulcan-intercom/lib/client/main.js   |   1 -
 .../lib/components/IntercomWrapper.js         |  23 ----
 packages/vulcan-intercom/lib/modules/index.js |   1 -
 10 files changed, 158 insertions(+), 27 deletions(-)
 rename packages/{vulcan-intercom => vulcan-events-intercom}/README.md (100%)
 create mode 100644 packages/vulcan-events-intercom/lib/client/intercom-client.js
 create mode 100644 packages/vulcan-events-intercom/lib/client/main.js
 create mode 100644 packages/vulcan-events-intercom/lib/modules/index.js
 create mode 100644 packages/vulcan-events-intercom/lib/server/intercom-server.js
 rename packages/{vulcan-intercom => vulcan-events-intercom}/lib/server/main.js (100%)
 rename packages/{vulcan-intercom => vulcan-events-intercom}/package.js (79%)
 delete mode 100644 packages/vulcan-intercom/lib/client/main.js
 delete mode 100644 packages/vulcan-intercom/lib/components/IntercomWrapper.js
 delete mode 100644 packages/vulcan-intercom/lib/modules/index.js

diff --git a/packages/vulcan-intercom/README.md b/packages/vulcan-events-intercom/README.md
similarity index 100%
rename from packages/vulcan-intercom/README.md
rename to packages/vulcan-events-intercom/README.md
diff --git a/packages/vulcan-events-intercom/lib/client/intercom-client.js b/packages/vulcan-events-intercom/lib/client/intercom-client.js
new file mode 100644
index 000000000..5767b30f1
--- /dev/null
+++ b/packages/vulcan-events-intercom/lib/client/intercom-client.js
@@ -0,0 +1,103 @@
+import { getSetting, addCallback, Utils } from 'meteor/vulcan:core';
+import { addPageFunction, addInitFunction, addIdentifyFunction, addTrackFunction } from 'meteor/vulcan:events';
+
+/*
+
+Identify User
+
+*/
+function intercomIdentify(currentUser) {
+  intercomSettings = {
+    app_id: getSetting('intercom.appId'),
+    name: currentUser.displayName,
+    email: currentUser.email,
+    created_at: currentUser.createdAt,
+    _id: currentUser._id,
+    pageUrl: currentUser.pageUrl,
+  };
+  (function() {
+    var w = window;
+    var ic = w.Intercom;
+    if (typeof ic === 'function') {
+      ic('reattach_activator');
+      ic('update', intercomSettings);
+    } else {
+      var d = document;
+      var i = function() {
+        i.c(arguments);
+      };
+      i.q = [];
+      i.c = function(args) {
+        i.q.push(args);
+      };
+      w.Intercom = i;
+      function l() {
+        var s = d.createElement('script');
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'https://widget.intercom.io/widget/icygo7se';
+        var x = d.getElementsByTagName('script')[0];
+        x.parentNode.insertBefore(s, x);
+      }
+      if (w.attachEvent) {
+        w.attachEvent('onload', l);
+      } else {
+        w.addEventListener('load', l, false);
+      }
+    }
+  })();
+}
+addIdentifyFunction(intercomIdentify);
+
+/*
+
+Track Event
+
+*/
+// function segmentTrack(eventName, eventProperties) {
+//   analytics.track(eventName, eventProperties);
+// }
+// addTrackFunction(segmentTrack);
+
+/*
+
+Init Snippet
+
+*/
+function intercomInit() {
+  window.intercomSettings = {
+    app_id: getSetting('intercom.appId'),
+  };
+  (function() {
+    var w = window;
+    var ic = w.Intercom;
+    if (typeof ic === 'function') {
+      ic('reattach_activator');
+      ic('update', intercomSettings);
+    } else {
+      var d = document;
+      var i = function() {
+        i.c(arguments);
+      };
+      i.q = [];
+      i.c = function(args) {
+        i.q.push(args);
+      };
+      w.Intercom = i;
+      function l() {
+        var s = d.createElement('script');
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'https://widget.intercom.io/widget/icygo7se';
+        var x = d.getElementsByTagName('script')[0];
+        x.parentNode.insertBefore(s, x);
+      }
+      if (w.attachEvent) {
+        w.attachEvent('onload', l);
+      } else {
+        w.addEventListener('load', l, false);
+      }
+    }
+  })();
+}
+addInitFunction(intercomInit);
diff --git a/packages/vulcan-events-intercom/lib/client/main.js b/packages/vulcan-events-intercom/lib/client/main.js
new file mode 100644
index 000000000..e3113bcb6
--- /dev/null
+++ b/packages/vulcan-events-intercom/lib/client/main.js
@@ -0,0 +1,3 @@
+import './intercom-client.js';
+
+export * from '../modules/index.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-intercom/lib/modules/index.js b/packages/vulcan-events-intercom/lib/modules/index.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/vulcan-events-intercom/lib/server/intercom-server.js b/packages/vulcan-events-intercom/lib/server/intercom-server.js
new file mode 100644
index 000000000..cc15444f9
--- /dev/null
+++ b/packages/vulcan-events-intercom/lib/server/intercom-server.js
@@ -0,0 +1,49 @@
+import Intercom from 'intercom-client';
+import { getSetting, addCallback, Utils } from 'meteor/vulcan:core';
+import { addPageFunction, addUserFunction, addInitFunction, addIdentifyFunction, addTrackFunction } from 'meteor/vulcan:events';
+
+const token = getSetting('intercom.accessToken');
+
+if (!token) {
+  throw new Error('Please add your Intercom access token in settings.json');
+} else {
+
+  const intercomClient = new Intercom.Client({ token });
+
+  const getDate = () => new Date().valueOf().toString().substr(0,10);
+
+  /*
+
+  New User
+
+  */
+  function intercomNewUser(user) {
+    intercomClient.users.create({
+      email: user.email,
+      custom_attributes: {
+        name: user.displayName,
+        profileUrl: Users.getProfileUrl(user, true),
+        _id: user._id,
+      }
+    });
+  }
+  addUserFunction(intercomNewUser);
+
+  /*
+
+  Track Event
+
+  */
+  function intercomTrackServer(eventName, eventProperties, currentUser) {
+    intercomClient.events.create({
+      event_name: eventName,
+      created_at: getDate(),
+      email: currentUser.email,
+      metadata: {
+        ...eventProperties
+      }
+    });
+  }
+  addTrackFunction(intercomTrackServer);
+  
+}
diff --git a/packages/vulcan-intercom/lib/server/main.js b/packages/vulcan-events-intercom/lib/server/main.js
similarity index 100%
rename from packages/vulcan-intercom/lib/server/main.js
rename to packages/vulcan-events-intercom/lib/server/main.js
diff --git a/packages/vulcan-intercom/package.js b/packages/vulcan-events-intercom/package.js
similarity index 79%
rename from packages/vulcan-intercom/package.js
rename to packages/vulcan-events-intercom/package.js
index fdce11f9a..98bd40188 100644
--- a/packages/vulcan-intercom/package.js
+++ b/packages/vulcan-events-intercom/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  name: 'vulcan:intercom',
+  name: 'vulcan:events-intercom',
   summary: 'Vulcan Intercom integration package.',
   version: '1.8.0',
   git: "https://github.com/VulcanJS/Vulcan.git"
@@ -10,7 +10,8 @@ Package.onUse(function (api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:core@1.8.0'
+    'vulcan:core@1.8.0',
+    'vulcan:events@1.8.0'
   ]);
 
   api.mainModule("lib/client/main.js", "client");
diff --git a/packages/vulcan-intercom/lib/client/main.js b/packages/vulcan-intercom/lib/client/main.js
deleted file mode 100644
index 29c383227..000000000
--- a/packages/vulcan-intercom/lib/client/main.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from '../modules/index.js'
\ No newline at end of file
diff --git a/packages/vulcan-intercom/lib/components/IntercomWrapper.js b/packages/vulcan-intercom/lib/components/IntercomWrapper.js
deleted file mode 100644
index df46d6022..000000000
--- a/packages/vulcan-intercom/lib/components/IntercomWrapper.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Components, replaceComponent, getSetting, withCurrentUser, Head } from 'meteor/vulcan:core';
-import React from 'react';
-import Intercom from 'react-intercom';
-
-const IntercomWrapper = ({ currentUser }) => {
-  const appId = getSetting('intercom.appId');
-
-  if (!appId) {
-    console.warn('Please add intercom.appId to your public settings or disable the vulcan:intercom package.');
-    return null;
-  }
-
-  return currentUser ? <Intercom 
-    appID={appId} 
-    email={currentUser.email}
-    name={currentUser.displayName}
-    _id={currentUser._id}
-    profileUrl={currentUser.pageUrl}
-  /> : null;
-
-}
-
-Head.components.push([IntercomWrapper, withCurrentUser]);
diff --git a/packages/vulcan-intercom/lib/modules/index.js b/packages/vulcan-intercom/lib/modules/index.js
deleted file mode 100644
index 97609b655..000000000
--- a/packages/vulcan-intercom/lib/modules/index.js
+++ /dev/null
@@ -1 +0,0 @@
-import '../components/IntercomWrapper.js';
\ No newline at end of file

From c75cd475cb4462ee9f5767e600ef779aca5ec52c Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Tue, 26 Dec 2017 11:17:44 +0900
Subject: [PATCH 67/69] Add new addUserFunction event function; make sure site
 url always has trailing '/'; document charge callbacks

---
 packages/vulcan-debug/lib/modules/routes.js   |  2 +-
 packages/vulcan-events/lib/modules/events.js  |  4 +++
 packages/vulcan-lib/lib/modules/utils.js      |  8 +++--
 .../lib/server/integrations/stripe.js         | 32 ++++++++++++++++---
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/packages/vulcan-debug/lib/modules/routes.js b/packages/vulcan-debug/lib/modules/routes.js
index 1517f8590..a557289eb 100644
--- a/packages/vulcan-debug/lib/modules/routes.js
+++ b/packages/vulcan-debug/lib/modules/routes.js
@@ -4,7 +4,7 @@ addRoute([
   // {name: 'cheatsheet', path: '/cheatsheet', component: import('./components/Cheatsheet.jsx')},
   {name: 'groups', path: '/groups', component: () => getDynamicComponent(import('../components/Groups.jsx'))},
   {name: 'settings', path: '/settings', componentName: 'Settings'},
-  {name: 'settings', path: '/callbacks', componentName: 'Callbacks'},
+  {name: 'callbacks', path: '/callbacks', componentName: 'Callbacks'},
   // {name: 'emails', path: '/emails', component: () => getDynamicComponent(import('./components/Emails.jsx'))},
   {name: 'emails', path: '/emails', componentName: 'Emails'},
 ]);
\ No newline at end of file
diff --git a/packages/vulcan-events/lib/modules/events.js b/packages/vulcan-events/lib/modules/events.js
index 2ebc21eed..c04a37279 100644
--- a/packages/vulcan-events/lib/modules/events.js
+++ b/packages/vulcan-events/lib/modules/events.js
@@ -20,6 +20,10 @@ export const track = async (eventName, eventProperties, currentUser) => {
   }
 };
 
+export const addUserFunction = f => {
+  addCallback('users.new.async', f);
+};
+
 export const addIdentifyFunction = f => {
   addCallback('events.identify', f);
 };
diff --git a/packages/vulcan-lib/lib/modules/utils.js b/packages/vulcan-lib/lib/modules/utils.js
index e5afc4da7..1d7e379fa 100644
--- a/packages/vulcan-lib/lib/modules/utils.js
+++ b/packages/vulcan-lib/lib/modules/utils.js
@@ -127,10 +127,14 @@ Utils.getDateRange = function(pageNumber) {
 //////////////////////////
 
 /**
- * @summary Returns the user defined site URL or Meteor.absoluteUrl
+ * @summary Returns the user defined site URL or Meteor.absoluteUrl. Add trailing '/' if missing
  */
 Utils.getSiteUrl = function () {
-  return getSetting('siteUrl', Meteor.absoluteUrl());
+  const url = getSetting('siteUrl', Meteor.absoluteUrl());
+  if (url.slice(-1) !== '/') {
+    url += '/';
+  }
+  return url;
 };
 
 /**
diff --git a/packages/vulcan-payments/lib/server/integrations/stripe.js b/packages/vulcan-payments/lib/server/integrations/stripe.js
index 41940ee19..40675b905 100644
--- a/packages/vulcan-payments/lib/server/integrations/stripe.js
+++ b/packages/vulcan-payments/lib/server/integrations/stripe.js
@@ -1,4 +1,4 @@
-import { getSetting, registerSetting, newMutation, editMutation, Collections, runCallbacks, runCallbacksAsync } from 'meteor/vulcan:core';
+import { getSetting, registerSetting, newMutation, editMutation, Collections, registerCallback, runCallbacks, runCallbacksAsync } from 'meteor/vulcan:core';
 import express from 'express';
 import Stripe from 'stripe';
 import { Picker } from 'meteor/meteorhacks:picker';
@@ -146,7 +146,7 @@ export const createCharge = async ({user, customer, product, collection, documen
   // create Stripe charge
   const charge = await stripe.charges.create(chargeData);
 
-  return processCharge({collection, document, charge, args})
+  return processCharge({collection, document, charge, args, user})
 
 }
 
@@ -155,7 +155,7 @@ export const createCharge = async ({user, customer, product, collection, documen
 Process charge on Vulcan's side
 
 */
-export const processCharge = async ({collection, document, charge, args}) => {
+export const processCharge = async ({collection, document, charge, args, user}) => {
  
   let returnDocument = {};
 
@@ -199,7 +199,7 @@ export const processCharge = async ({collection, document, charge, args}) => {
     }
 
     // run collection.charge.sync callbacks
-    modifier = runCallbacks(`${collection._name}.charge.sync`, modifier, document, chargeDoc);
+    modifier = runCallbacks(`${collection._name}.charge.sync`, modifier, document, chargeDoc, user);
 
     returnDocument = await editMutation({
       collection,
@@ -213,7 +213,7 @@ export const processCharge = async ({collection, document, charge, args}) => {
 
   }
 
-  runCallbacksAsync(`${collection._name}.charge.async`, returnDocument, chargeDoc);
+  runCallbacksAsync(`${collection._name}.charge.async`, returnDocument, chargeDoc, user);
 
   return returnDocument;
 }
@@ -431,3 +431,25 @@ webAppConnectHandlersUse(Meteor.bindEnvironment(app), {name: 'stripe_endpoint',
 //   res.end();
 
 // });
+
+Meteor.startup(() => {
+  Collections.forEach(c => {
+    collectionName = c._name.toLowerCase();
+
+    registerCallback({
+      name: `${collectionName}.charge.sync`, 
+      description: `Modify the modifier used to add charge ids to the charge's associated document.`,      
+      arguments: [{modifier: 'The modifier'}, {document: 'The associated document'}, {charge: 'The charge'}, {currentUser: 'The current user'}], 
+      runs: 'sync', 
+      returns: 'modifier',
+    });
+
+    registerCallback({
+      name: `${collectionName}.charge.sync`, 
+      description: `Perform operations after the charge has succeeded.`,      
+      arguments: [{document: 'The associated document'}, {charge: 'The charge'}, {currentUser: 'The current user'}], 
+      runs: 'async', 
+    });
+    
+  })
+})
\ No newline at end of file

From b7404f88ae41e48c215be286fc259bbe61220b9b Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Wed, 27 Dec 2017 09:55:06 +0900
Subject: [PATCH 68/69] Fix segment identify

---
 packages/vulcan-events-segment/lib/client/segment-client.js | 2 +-
 packages/vulcan-lib/lib/modules/callbacks.js                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vulcan-events-segment/lib/client/segment-client.js b/packages/vulcan-events-segment/lib/client/segment-client.js
index da80fc866..b733d1e52 100644
--- a/packages/vulcan-events-segment/lib/client/segment-client.js
+++ b/packages/vulcan-events-segment/lib/client/segment-client.js
@@ -28,7 +28,7 @@ Identify User
 
 */
 function segmentIdentify(currentUser) {
-  window.analytics.identify(currentUser.userId, {
+  window.analytics.identify(currentUser._id, {
     email: currentUser.email,
     pageUrl: currentUser.pageUrl,
   });
diff --git a/packages/vulcan-lib/lib/modules/callbacks.js b/packages/vulcan-lib/lib/modules/callbacks.js
index 0360efdc3..b390dd08a 100644
--- a/packages/vulcan-lib/lib/modules/callbacks.js
+++ b/packages/vulcan-lib/lib/modules/callbacks.js
@@ -87,7 +87,7 @@ export const runCallbacks = function () {
 
         if (typeof result === 'undefined') {
           // if result of current iteration is undefined, don't pass it on
-          debug(`// Warning: Sync callback [${callback.name}] in hook [${hook}] didn't return a result!`)
+          // debug(`// Warning: Sync callback [${callback.name}] in hook [${hook}] didn't return a result!`)
           return accumulator
         } else {
           return result;

From fc3a5d58b1c442f2af3c181c631ff353e36366dd Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Wed, 27 Dec 2017 09:56:49 +0900
Subject: [PATCH 69/69] v1.8.1

---
 package.json                               |  2 +-
 packages/example-forum/package.js          |  8 ++++----
 packages/vulcan-accounts/package.js        |  4 ++--
 packages/vulcan-admin/package.js           |  4 ++--
 packages/vulcan-cloudinary/package.js      |  4 ++--
 packages/vulcan-core/package.js            | 14 +++++++-------
 packages/vulcan-debug/package.js           |  6 +++---
 packages/vulcan-email/package.js           |  4 ++--
 packages/vulcan-embed/package.js           |  4 ++--
 packages/vulcan-events-ga/package.js       |  6 +++---
 packages/vulcan-events-intercom/package.js |  6 +++---
 packages/vulcan-events-internal/package.js |  6 +++---
 packages/vulcan-events-segment/package.js  |  6 +++---
 packages/vulcan-events/package.js          |  4 ++--
 packages/vulcan-forms-tags/package.js      |  6 +++---
 packages/vulcan-forms-upload/package.js    |  6 +++---
 packages/vulcan-forms/package.js           |  4 ++--
 packages/vulcan-i18n-en-us/package.js      |  4 ++--
 packages/vulcan-i18n/package.js            |  4 ++--
 packages/vulcan-lib/lib/modules/config.js  |  2 +-
 packages/vulcan-lib/package.js             |  2 +-
 packages/vulcan-newsletter/package.js      |  6 +++---
 packages/vulcan-payments/package.js        |  4 ++--
 packages/vulcan-routing/package.js         |  4 ++--
 packages/vulcan-subscribe/package.js       | 10 +++++-----
 packages/vulcan-users/package.js           |  4 ++--
 packages/vulcan-voting/package.js          |  6 +++---
 27 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/package.json b/package.json
index d01f35d87..89b311a70 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Vulcan",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "engines": {
     "npm": "^3.0"
   },
diff --git a/packages/example-forum/package.js b/packages/example-forum/package.js
index cfd5af0ef..1799a0bbd 100644
--- a/packages/example-forum/package.js
+++ b/packages/example-forum/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "example-forum",
   summary: "Vulcan forum package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -14,11 +14,11 @@ Package.onUse(function (api) {
     'fourseven:scss@4.5.0',
 
     // vulcan core
-    'vulcan:core@1.8.0',
+    'vulcan:core@1.8.1',
 
     // vulcan packages
-    'vulcan:voting@1.8.0',
-    'vulcan:accounts@1.8.0',
+    'vulcan:voting@1.8.1',
+    'vulcan:accounts@1.8.1',
     'vulcan:email',
     'vulcan:forms',
     'vulcan:newsletter',
diff --git a/packages/vulcan-accounts/package.js b/packages/vulcan-accounts/package.js
index 747b03fa2..78bedfb1e 100755
--- a/packages/vulcan-accounts/package.js
+++ b/packages/vulcan-accounts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'vulcan:accounts',
-  version: '1.8.0',
+  version: '1.8.1',
   summary: 'Accounts UI for React in Meteor 1.3+',
   git: 'https://github.com/studiointeract/accounts-ui',
   documentation: 'README.md'
@@ -9,7 +9,7 @@ Package.describe({
 Package.onUse(function(api) {
   api.versionsFrom('1.3');
   
-  api.use('vulcan:core@1.8.0');
+  api.use('vulcan:core@1.8.1');
 
   api.use('ecmascript');
   api.use('tracker');
diff --git a/packages/vulcan-admin/package.js b/packages/vulcan-admin/package.js
index 0d421bdef..804f55e4a 100644
--- a/packages/vulcan-admin/package.js
+++ b/packages/vulcan-admin/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:admin",
   summary: "Vulcan components package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -14,7 +14,7 @@ Package.onUse(function (api) {
     'fourseven:scss@4.5.0',
     'dynamic-import@0.1.1',
     // Vulcan packages
-    'vulcan:core@1.8.0',
+    'vulcan:core@1.8.1',
 
   ]);
 
diff --git a/packages/vulcan-cloudinary/package.js b/packages/vulcan-cloudinary/package.js
index 77522ff65..4213fd5f7 100644
--- a/packages/vulcan-cloudinary/package.js
+++ b/packages/vulcan-cloudinary/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'vulcan:cloudinary',
   summary: 'Vulcan file upload package.',
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,7 +10,7 @@ Package.onUse(function (api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:core@1.8.0'
+    'vulcan:core@1.8.1'
   ]);
 
   api.mainModule("lib/client/main.js", "client");
diff --git a/packages/vulcan-core/package.js b/packages/vulcan-core/package.js
index 6d03391ae..df0552f42 100644
--- a/packages/vulcan-core/package.js
+++ b/packages/vulcan-core/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:core",
   summary: "Vulcan core package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,15 +10,15 @@ Package.onUse(function(api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:lib@1.8.0',
-    'vulcan:i18n@1.8.0',
-    'vulcan:users@1.8.0',
-    'vulcan:routing@1.8.0',
-    'vulcan:debug@1.8.0',
+    'vulcan:lib@1.8.1',
+    'vulcan:i18n@1.8.1',
+    'vulcan:users@1.8.1',
+    'vulcan:routing@1.8.1',
+    'vulcan:debug@1.8.1',
   ]);
 
   api.imply([
-    'vulcan:lib@1.8.0'
+    'vulcan:lib@1.8.1'
   ]);
 
   api.mainModule('lib/server/main.js', 'server');
diff --git a/packages/vulcan-debug/package.js b/packages/vulcan-debug/package.js
index c14b96fc9..46b2b2abe 100644
--- a/packages/vulcan-debug/package.js
+++ b/packages/vulcan-debug/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:debug",
   summary: "Vulcan debug package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git",
   debugOnly: true
 });
@@ -17,8 +17,8 @@ Package.onUse(function (api) {
 
     // Vulcan packages
 
-    'vulcan:lib@1.8.0',
-    'vulcan:email@1.8.0',
+    'vulcan:lib@1.8.1',
+    'vulcan:email@1.8.1',
 
   ]);
 
diff --git a/packages/vulcan-email/package.js b/packages/vulcan-email/package.js
index 8dad243df..1cca49b40 100644
--- a/packages/vulcan-email/package.js
+++ b/packages/vulcan-email/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:email",
   summary: "Vulcan email package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,7 +10,7 @@ Package.onUse(function (api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:lib@1.8.0'
+    'vulcan:lib@1.8.1'
   ]);
 
   api.mainModule("lib/server.js", "server");
diff --git a/packages/vulcan-embed/package.js b/packages/vulcan-embed/package.js
index 9b881c415..3b0c2f4a7 100644
--- a/packages/vulcan-embed/package.js
+++ b/packages/vulcan-embed/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:embed",
   summary: "Vulcan Embed package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: 'https://github.com/VulcanJS/Vulcan.git'
 });
 
@@ -10,7 +10,7 @@ Package.onUse( function(api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:core@1.8.0',
+    'vulcan:core@1.8.1',
     'fourseven:scss@4.5.0'
   ]);
 
diff --git a/packages/vulcan-events-ga/package.js b/packages/vulcan-events-ga/package.js
index 98f68b942..d98194730 100644
--- a/packages/vulcan-events-ga/package.js
+++ b/packages/vulcan-events-ga/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:events-ga",
   summary: "Vulcan Google Analytics event tracking package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,8 +10,8 @@ Package.onUse(function(api) {
   api.versionsFrom('METEOR@1.5.2');
   
   api.use([
-    'vulcan:core@1.8.0',
-    'vulcan:events@1.8.0',
+    'vulcan:core@1.8.1',
+    'vulcan:events@1.8.1',
   ]);
 
   api.mainModule("lib/server/main.js", "server");
diff --git a/packages/vulcan-events-intercom/package.js b/packages/vulcan-events-intercom/package.js
index 98bd40188..d9bcd25f4 100644
--- a/packages/vulcan-events-intercom/package.js
+++ b/packages/vulcan-events-intercom/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'vulcan:events-intercom',
   summary: 'Vulcan Intercom integration package.',
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,8 +10,8 @@ Package.onUse(function (api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:core@1.8.0',
-    'vulcan:events@1.8.0'
+    'vulcan:core@1.8.1',
+    'vulcan:events@1.8.1'
   ]);
 
   api.mainModule("lib/client/main.js", "client");
diff --git a/packages/vulcan-events-internal/package.js b/packages/vulcan-events-internal/package.js
index 8277bb01c..18231cc12 100644
--- a/packages/vulcan-events-internal/package.js
+++ b/packages/vulcan-events-internal/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:events-internal",
   summary: "Vulcan internal event tracking package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,8 +10,8 @@ Package.onUse(function(api) {
   api.versionsFrom('METEOR@1.5.2');
   
   api.use([
-    'vulcan:core@1.8.0',
-    'vulcan:events@1.8.0',
+    'vulcan:core@1.8.1',
+    'vulcan:events@1.8.1',
   ]);
 
   api.mainModule("lib/server/main.js", "server");
diff --git a/packages/vulcan-events-segment/package.js b/packages/vulcan-events-segment/package.js
index 837a63839..d5544bd57 100644
--- a/packages/vulcan-events-segment/package.js
+++ b/packages/vulcan-events-segment/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:events-segment",
   summary: "Vulcan Segment",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,8 +10,8 @@ Package.onUse(function (api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:core@1.8.0',
-    'vulcan:events@1.8.0',
+    'vulcan:core@1.8.1',
+    'vulcan:events@1.8.1',
   ]);
 
   api.mainModule('lib/server/main.js', 'server');
diff --git a/packages/vulcan-events/package.js b/packages/vulcan-events/package.js
index fb723f257..96748fbf1 100644
--- a/packages/vulcan-events/package.js
+++ b/packages/vulcan-events/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:events",
   summary: "Vulcan event tracking package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,7 +10,7 @@ Package.onUse(function(api) {
   api.versionsFrom('METEOR@1.5.2');
   
   api.use([
-    'vulcan:core@1.8.0',
+    'vulcan:core@1.8.1',
   ]);
 
   api.mainModule("lib/server/main.js", "server");
diff --git a/packages/vulcan-forms-tags/package.js b/packages/vulcan-forms-tags/package.js
index e5a33244f..9872f60b4 100644
--- a/packages/vulcan-forms-tags/package.js
+++ b/packages/vulcan-forms-tags/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:forms-tags",
   summary: "Vulcan tag input package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: 'https://github.com/VulcanJS/Vulcan.git'
 });
 
@@ -10,8 +10,8 @@ Package.onUse( function(api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:core@1.8.0',
-    'vulcan:forms@1.8.0'
+    'vulcan:core@1.8.1',
+    'vulcan:forms@1.8.1'
   ]);
 
   api.mainModule("lib/export.js", ["client", "server"]);
diff --git a/packages/vulcan-forms-upload/package.js b/packages/vulcan-forms-upload/package.js
index 734df83c4..62c0d2b7b 100755
--- a/packages/vulcan-forms-upload/package.js
+++ b/packages/vulcan-forms-upload/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:forms-upload",
   summary: "Vulcan package extending vulcan:forms to upload images to Cloudinary from a drop zone.",
-  version: "1.8.0",
+  version: "1.8.1",
   git: 'https://github.com/xavcz/nova-forms-upload.git'
 });
 
@@ -10,8 +10,8 @@ Package.onUse( function(api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:core@1.8.0',
-    'vulcan:forms@1.8.0',
+    'vulcan:core@1.8.1',
+    'vulcan:forms@1.8.1',
     'fourseven:scss@4.5.0'
   ]);
 
diff --git a/packages/vulcan-forms/package.js b/packages/vulcan-forms/package.js
index 16b66720f..fc1480b8d 100644
--- a/packages/vulcan-forms/package.js
+++ b/packages/vulcan-forms/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:forms",
   summary: "Form containers for React",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/meteor-utilities/react-form-containers.git"
 });
 
@@ -10,7 +10,7 @@ Package.onUse(function(api) {
   api.versionsFrom("METEOR@1.3");
 
   api.use([
-    'vulcan:core@1.8.0',
+    'vulcan:core@1.8.1',
 
     'fourseven:scss@4.5.0'
   ]);
diff --git a/packages/vulcan-i18n-en-us/package.js b/packages/vulcan-i18n-en-us/package.js
index 73f0b25a8..7088320a4 100644
--- a/packages/vulcan-i18n-en-us/package.js
+++ b/packages/vulcan-i18n-en-us/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:i18n-en-us",
   summary: "Vulcan i18n package (en_US)",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,7 +10,7 @@ Package.onUse(function (api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:core@1.8.0'
+    'vulcan:core@1.8.1'
   ]);
 
   api.addFiles([
diff --git a/packages/vulcan-i18n/package.js b/packages/vulcan-i18n/package.js
index 74ed019af..f93ba0a78 100644
--- a/packages/vulcan-i18n/package.js
+++ b/packages/vulcan-i18n/package.js
@@ -1,14 +1,14 @@
 Package.describe({
   name: 'vulcan:i18n',
   summary: "i18n client polyfill",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan"
 });
 
 Package.onUse(function (api) {
 
   api.use([
-    'vulcan:lib@1.8.0',
+    'vulcan:lib@1.8.1',
   ]);
 
   api.mainModule('lib/server/main.js', 'server');
diff --git a/packages/vulcan-lib/lib/modules/config.js b/packages/vulcan-lib/lib/modules/config.js
index cc320363e..a4dd21c80 100644
--- a/packages/vulcan-lib/lib/modules/config.js
+++ b/packages/vulcan-lib/lib/modules/config.js
@@ -7,7 +7,7 @@ import SimpleSchema from 'simpl-schema';
 
 Vulcan = {};
 
-Vulcan.VERSION = '1.8.0';
+Vulcan.VERSION = '1.8.1';
 
 // ------------------------------------- Schemas -------------------------------- //
 
diff --git a/packages/vulcan-lib/package.js b/packages/vulcan-lib/package.js
index 782e669ce..df718f90c 100644
--- a/packages/vulcan-lib/package.js
+++ b/packages/vulcan-lib/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'vulcan:lib',
   summary: 'Vulcan libraries.',
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
diff --git a/packages/vulcan-newsletter/package.js b/packages/vulcan-newsletter/package.js
index c722fe1eb..e2b62c916 100644
--- a/packages/vulcan-newsletter/package.js
+++ b/packages/vulcan-newsletter/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:newsletter",
   summary: "Vulcan email newsletter package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,8 +10,8 @@ Package.onUse(function (api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:core@1.8.0',
-    'vulcan:email@1.8.0'
+    'vulcan:core@1.8.1',
+    'vulcan:email@1.8.1'
   ]);
 
   api.mainModule('lib/server/main.js', 'server');
diff --git a/packages/vulcan-payments/package.js b/packages/vulcan-payments/package.js
index 5e3997a1f..031bf29a6 100644
--- a/packages/vulcan-payments/package.js
+++ b/packages/vulcan-payments/package.js
@@ -1,14 +1,14 @@
 Package.describe({
   name: 'vulcan:payments',
   summary: "Vulcan payments package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
 Package.onUse(function (api) {
 
   api.use([
-    'vulcan:core@1.8.0',
+    'vulcan:core@1.8.1',
 
     'fourseven:scss@4.5.4',
   ]);
diff --git a/packages/vulcan-routing/package.js b/packages/vulcan-routing/package.js
index 423630959..96875ffa9 100644
--- a/packages/vulcan-routing/package.js
+++ b/packages/vulcan-routing/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:routing",
   summary: "Vulcan router package",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,7 +10,7 @@ Package.onUse(function (api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:lib@1.8.0',
+    'vulcan:lib@1.8.1',
   ]);
 
   api.mainModule('lib/server/main.js', 'server');
diff --git a/packages/vulcan-subscribe/package.js b/packages/vulcan-subscribe/package.js
index c99f4a8f2..249d06393 100644
--- a/packages/vulcan-subscribe/package.js
+++ b/packages/vulcan-subscribe/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:subscribe",
   summary: "Subscribe to posts, users, etc. to be notified of new activity",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -11,14 +11,14 @@ Package.onUse(function (api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:core@1.8.0',
+    'vulcan:core@1.8.1',
     // dependencies on posts, categories are done with nested imports to reduce explicit dependencies
   ]);
   
   api.use([
-    'vulcan:posts@1.8.0',
-    'vulcan:comments@1.8.0',
-    'vulcan:categories@1.8.0',
+    'vulcan:posts@1.8.1',
+    'vulcan:comments@1.8.1',
+    'vulcan:categories@1.8.1',
   ], {weak: true});
 
   api.mainModule("lib/modules.js", ["client"]);
diff --git a/packages/vulcan-users/package.js b/packages/vulcan-users/package.js
index ba8d4ff56..7876b5c07 100644
--- a/packages/vulcan-users/package.js
+++ b/packages/vulcan-users/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'vulcan:users',
   summary: 'Vulcan permissions.',
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -10,7 +10,7 @@ Package.onUse(function (api) {
   api.versionsFrom('METEOR@1.5.2');
 
   api.use([
-    'vulcan:lib@1.8.0'
+    'vulcan:lib@1.8.1'
   ]);
 
   api.mainModule("lib/server.js", "server");
diff --git a/packages/vulcan-voting/package.js b/packages/vulcan-voting/package.js
index b1590ab5d..75b77af32 100644
--- a/packages/vulcan-voting/package.js
+++ b/packages/vulcan-voting/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "vulcan:voting",
   summary: "Vulcan scoring package.",
-  version: '1.8.0',
+  version: '1.8.1',
   git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
@@ -11,8 +11,8 @@ Package.onUse(function (api) {
 
   api.use([
     'fourseven:scss@4.5.0',
-    'vulcan:core@1.8.0',
-    'vulcan:i18n@1.8.0',
+    'vulcan:core@1.8.1',
+    'vulcan:i18n@1.8.1',
   ], ['client', 'server']);
 
   api.mainModule("lib/server/main.js", "server");