Share the router configuration between the client and the server

2 files changed, 3 insertions, 5 deletions

diff --git a/client/config/router.js b/config/router.js
index ddd69db4..99d5bff6 100644
--- a/client/config/router.js
+++ b/config/router.js
@@ -113,7 +113,7 @@ const appTitle = 'Wekan';
 // that the global variable `Boards` is undefined when this file loads so we
 // wait a bit until hopefully all files are loaded. This will be fixed in a
 // clean way once Meteor will support ES6 modules -- hopefully in Meteor 1.3.
-Meteor.startup(() => {
+Meteor.isClient && Meteor.startup(() => {
   Tracker.autorun(() => {
     const currentBoard = Boards.findOne(Session.get('currentBoard'));
     const titleStack = [appTitle];
diff --git a/sandstorm.js b/sandstorm.js
index 11bafa10..def07eea 100644
--- a/sandstorm.js
+++ b/sandstorm.js
@@ -51,10 +51,8 @@ if (isSandstorm && Meteor.isServer) {
     // XXX Maybe the sandstorm http-bridge could provide some kind of "home URL"
     // in the manifest?
     const base = req.headers['x-sandstorm-base-path'];
-    // XXX If this routing scheme changes, this will break. We should generate
-    // the location URL using the router, but at the time of writing, the
-    // it is only accessible on the client.
-    const boardPath = `/b/${sandstormBoard._id}/${sandstormBoard.slug}`;
+    const { _id, slug } = sandstormBoard;
+    const boardPath = FlowRouter.path('board', { id: _id, slug });
 
     res.writeHead(301, {
       Location: base + boardPath,