From 00bdd6ff47635285a3d2388cbf552b3b3b94ecee Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian@c9.io>
Date: Thu, 24 Nov 2016 15:31:51 +0000
Subject: [PATCH 1/2] store mount id in the database

---
 plugins/c9.preview/preview.handler.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/c9.preview/preview.handler.js b/plugins/c9.preview/preview.handler.js
index 70125ee2..6e16f358 100644
--- a/plugins/c9.preview/preview.handler.js
+++ b/plugins/c9.preview/preview.handler.js
@@ -73,9 +73,6 @@ define(function(require, exports, module) {
                             wsSession.role = db.Project.ROLE_VISITOR;
                         }
                         
-                        // TODO hotfix until we have a way to know the diff dir of a docker container
-                        return next();
-                            
                         if (wsSession.type != "docker" || project.state != db.Project.STATE_READY)
                             return next();
                         
@@ -87,8 +84,8 @@ define(function(require, exports, module) {
                                 db.Container.load(meta.cid, function(err, container) {
                                     if (err) return next(err);
 
-                                    if (container.state == db.Container.STATE_RUNNING)
-                                        wsSession.proxyUrl = "http://" + meta.host + ":9000/" + meta.cid + "/home/ubuntu/workspace";
+                                    if (container.state == db.Container.STATE_RUNNING && container.mountId)
+                                        wsSession.proxyUrl = "http://" + meta.host + ":9000/" + container.mountId + "/home/ubuntu/workspace";
 
                                     next();
                                 });

From e905648144a845cb0151a547c1c712be713991e6 Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian@c9.io>
Date: Thu, 24 Nov 2016 15:50:01 +0000
Subject: [PATCH 2/2] rename getRole to initSession

---
 plugins/c9.preview/preview.handler.js | 4 ++--
 plugins/c9.preview/preview.js         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/c9.preview/preview.handler.js b/plugins/c9.preview/preview.handler.js
index 6e16f358..6cd19064 100644
--- a/plugins/c9.preview/preview.handler.js
+++ b/plugins/c9.preview/preview.handler.js
@@ -25,7 +25,7 @@ define(function(require, exports, module) {
         
         var staticPrefix = imports["connect.static"].getStaticPrefix();
         
-        function getRole(db) {
+        function initSession(db) {
             var roleCache = new Cache(10000, 10000);
             
             return function(req, res, next) {
@@ -360,7 +360,7 @@ define(function(require, exports, module) {
         
         register(null, {
             "preview.handler": {
-                getRole: getRole,
+                initSession: initSession,
                 checkRole: checkRole,
                 getProxyUrl: getProxyUrl,
                 proxyCall: proxyCall
diff --git a/plugins/c9.preview/preview.js b/plugins/c9.preview/preview.js
index 27b84391..01620ca8 100644
--- a/plugins/c9.preview/preview.js
+++ b/plugins/c9.preview/preview.js
@@ -52,7 +52,7 @@ define(function(require, exports, module) {
             requestTimeout(15*60*1000),
             require("./lib/middleware/sanitize-path-param"),
             require("./lib/middleware/block-dot-files"),
-            handler.getRole(db),
+            handler.initSession(db),
             handler.checkRole(db),
             handler.getProxyUrl(function() {
                 return getVfsServers()[0] || null;