add user-content service

node_modules/c9/object.js

@@ -0,0 +1,9 @@
+/*
+ * Swap keys and values of an object
+ */
+exports.invert = function(obj) {
+    return Object.keys(obj).reduce(function(res, key) {
+        res[obj[key]] = key;
+        return res;
+    }, {});
+};

node_modules/c9/string.js

@@ -43,5 +43,14 @@ exports.repeat = function(str, times) {
 exports.count = function(str, substr){
     return str.split(substr).length - 1;
 };
+
+exports.endsWith = function(subjectString, searchString, position) {
+    if (typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > subjectString.length) {
+        position = subjectString.length;
+    }
+    position -= searchString.length;
+    var lastIndex = subjectString.indexOf(searchString, position);
+    return lastIndex !== -1 && lastIndex === position;
+};
  
 });

plugins/c9.preview/preview.handler.js

@@ -39,7 +39,13 @@ define(function(require, exports, module) {
                     session.ws = {};
     
                 req.projectSession = session.ws[ws];
-                if (!req.projectSession || !req.projectSession.expires || req.projectSession.expires <= Date.now()) {
+                
+                if (
+                    !req.projectSession || 
+                    !req.projectSession.expires || 
+                    req.projectSession.expires <= Date.now() ||
+                    req.projectSession.uid != req.user.id
+                ) {
                     req.projectSession = session.ws[ws] = {
                         expires: Date.now() + 10000
                     };
@@ -77,6 +83,7 @@ define(function(require, exports, module) {
                         }
                         req.projectSession.role = role;
                         req.projectSession.pid = project.id;
+                        req.projectSession.uid = req.user.id;
                         
                         var type = project.scm;
                         req.projectSession.type = type;
@@ -137,8 +144,8 @@ define(function(require, exports, module) {
                 
                 var path = req.params.path;
                 var url = req.proxyUrl + path;
-                if (req.session.token)
-                    url += "?access_token=" + encodeURIComponent(req.session.token.id || req.session.token);
+                if (req.user.code)
+                    url += "?access_token=" + encodeURIComponent(req.user.code);
 
                 var parsedUrl = parseUrl(url);
                 var httpModule = parsedUrl.protocol == "https:" ? https : http;

server.js

@@ -23,15 +23,13 @@ var DEFAULT_CONFIG = "s";
 var DEFAULT_SETTINGS = getDefaultSettings();
 
 var shortcuts = {
-    "dev"  : ["ide", "preview", "vfs", "api", "sapi", "proxy", "redis", "profile", "oldclient", "homepage", "apps-proxy", "-s", "devel"],
-    "onlinedev" : ["ide", "preview", "vfs", "api", "proxy", "oldclient", "homepage", "apps-proxy", "profile", "worker", "-s", "onlinedev"],
-    "bill" : ["ide", "preview", "vfs", "api", "proxy", "oldclient", "homepage", "apps-proxy", "profile", "-s", "billing"],
-    "beta" : ["ide", "preview", "vfs", "proxy", "-s", "beta"],
-    "ci"   : ["ide", "preview", "vfs", "proxy", "-s", "ci"],
-    "s"    : ["standalone", "-s", "standalone"]
+    "dev":       ["ide", "preview", "user-content", "vfs", "api", "sapi", "proxy", "redis", "profile", "oldclient", "homepage", "apps-proxy", "-s", "devel"],
+    "onlinedev": ["ide", "preview", "user-content", "vfs", "api", "proxy", "oldclient", "homepage", "apps-proxy", "profile", "worker", "-s", "onlinedev"],
+    "beta":      ["ide", "preview", "user-content", "vfs", "proxy", "-s", "beta"],
+    "s":         ["standalone", "-s", "standalone"]
 };
 shortcuts.odev = shortcuts.onlinedev; // For backwards compatibility, if you see this in 2016 remove this line
-var delayLoadConfigs = ["preview", "api", "oldclient", "apps-proxy", "worker"];
+var delayLoadConfigs = ["preview", "user-content", "api", "oldclient", "apps-proxy", "worker"];
 
 module.exports = main;