cloudcms-server 3.3.1-beta.1 → 3.3.1-beta.10

package/middleware/stores/stores.js

@@ -28,6 +28,7 @@ var log = function(text, level)
  *   "cache"            the root of the cache
  *   "public"           the web host root (this might be public_build too)
  *   "templates"        the templates storage location (for client-side templates)
+ *   "themes"           the themes storage location (for client-side themes)
  *   "modules"          the deployed modules storage location (for client-side modules)
  *   "config"           the configuration storage location for static config (for client-side config)
  *
@@ -45,7 +46,7 @@ exports = module.exports = function()
         var engineId = storeConfiguration[storeType];
 
         var engine = ENGINES[engineId];
-
+    
         var engineType = process.configuration.storeEngines[engineId].type;
         var engineConfiguration = process.configuration.storeEngines[engineId].config;
 
@@ -208,6 +209,7 @@ exports = module.exports = function()
             // these will get overwritten in the binding methods below
             stores["config"] = buildStore("config", host, "config");
             stores["templates"] = buildStore("templates", host, "templates");
+            stores["themes"] = buildStore("themes", host, "themes");
 
             var bindWebStore = function(done) {
 
@@ -415,7 +417,7 @@ exports = module.exports = function()
                         var moduleStoreType = moduleDescriptors[i].store;
                         var modulePath = moduleDescriptors[i].path;
 
-                        // console.log("Config Store - Module Path: " + modulePath + ", type: " + moduleStoreType);
+                        //console.log("Config Store - Module Path: " + modulePath + ", type: " + moduleStoreType);
 
                         var storePath = path.join(modulePath, "config");
                         if (moduleStoreType === "modules")
@@ -423,7 +425,7 @@ exports = module.exports = function()
                             storePath = path.join("modules", storePath);
                         }
 
-                        // console.log("Config Store - Module Store: " + storePath);
+                        //console.log("Config Store - Module Store: " + storePath);
 
                         var configStore = buildStore(moduleStoreType, host, storePath);
                         configStores.push(configStore);
@@ -472,6 +474,7 @@ exports = module.exports = function()
                         var bindingStores = [];
                         for (var i = 0; i < allocatedStores.length; i++) {
                             bindingStores.push(allocatedStores[i]);
+                            //console.log("a2: " + allocatedStores[i]);
                         }
                         bindingStores.push(stores.templates);
 
@@ -481,7 +484,43 @@ exports = module.exports = function()
                         callback();
                     });
                 };
-
+    
+                var bindThemeStores = function(moduleDescriptors, callback)
+                {
+                    // all theme stores
+                    var themeStores = [];
+                    for (var i = 0; i < moduleDescriptors.length; i++)
+                    {
+                        var moduleStoreType = moduleDescriptors[i].store;
+                        var modulePath = moduleDescriptors[i].path;
+            
+                        var storePath = path.join(modulePath, "themes");
+                        if (moduleStoreType === "modules")
+                        {
+                            storePath = path.join("modules", storePath);
+                        }
+            
+                        var themeStore = buildStore(moduleStoreType, host, storePath);
+                        themeStores.push(themeStore);
+                    }
+        
+                    // trim back and only keep stores that are allocated
+                    retainAllocatedStores(themeStores, function(err, allocatedStores) {
+            
+                        // all stores to be bound in
+                        var bindingStores = [];
+                        for (var i = 0; i < allocatedStores.length; i++) {
+                            bindingStores.push(allocatedStores[i]);
+                        }
+                        bindingStores.push(stores.themes);
+            
+                        // bind into a multi-store
+                        stores["themes"] = require("./multistore")(bindingStores);
+            
+                        callback();
+                    });
+                };
+    
                 process.cache.read("module-descriptors-" + host, function(err, moduleDescriptors) {
 
                     moduleDescriptors = null;
@@ -494,7 +533,9 @@ exports = module.exports = function()
 
                             bindConfigStores(moduleDescriptors, function () {
                                 bindTemplateStores(moduleDescriptors, function() {
-                                    done();
+                                    bindThemeStores(moduleDescriptors, function() {
+                                        done();
+                                    });
                                 });
                             });
 
@@ -504,7 +545,9 @@ exports = module.exports = function()
                     {
                         bindConfigStores(moduleDescriptors, function() {
                             bindTemplateStores(moduleDescriptors, function() {
-                                done();
+                                bindThemeStores(moduleDescriptors, function() {
+                                    done();
+                                });
                             });
                         });
                     }
@@ -565,6 +608,7 @@ exports = module.exports = function()
                 req.contentStore = stores["content"];
                 req.webStore = stores["web"];
                 req.templatesStore = stores["templates"];
+                req.themesStore = stores["themes"];
                 req.modulesStore = stores["modules"];
 
                 // sort the module descriptors by id

package/middleware/themes/themes.js

@@ -0,0 +1,49 @@
+var path = require('path');
+var util = require("../../util/util");
+
+exports = module.exports = function()
+{
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    // RESULTING OBJECT
+    //
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    var r = {};
+
+    /**
+     * Retrieves themes for the application.
+     *
+     * @return {Function}
+     */
+    r.handler = function()
+    {
+        return util.createHandler("themes", function(req, res, next, stores, cache, configuration) {
+
+            var themeStore = stores.themes;
+
+            var handled = false;
+
+            if (req.method.toLowerCase() === "get") {
+
+                if (req.url.indexOf("/_themes") === 0)
+                {
+                    var filePath = req.path.substring(8);
+
+                    themeStore.sendFile(res, filePath, null, function(err) {
+                        next(err);
+                    });
+
+                    handled = true;
+                }
+            }
+
+            if (!handled)
+            {
+                next();
+            }
+        });
+    };
+
+    return r;
+}();

package/middleware/virtual-config/virtual-config.js

@@ -83,7 +83,7 @@ exports = module.exports = function()
 
                 var URL = configuration.virtualDriver.baseURL;
                 if (!URL) {
-                    URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT);
+                    URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH);
                 }
                 URL += "/virtual/driver/config";
                 var requestConfig = {
@@ -91,53 +91,49 @@ exports = module.exports = function()
                     "qs": qs
                 };
 
-                util.retryGitanaRequest(logMethod, gitana, requestConfig, 2, function(err, response, body) {
+                util.retryGitanaRequest(logMethod, gitana, requestConfig, 2, function(err, response, json) {
 
-                    if (response && response.statusCode === 200 && body)
+                    if (response && response.status === 200 && json)
                     {
-                        var config = JSON.parse(body).config;
+                        var config = json.config;
                         if (!config)
                         {
                             // nothing found
-                            callback();
+                            return callback();
                         }
-                        else
-                        {
-                            // make sure we update baseURL
-                            config.baseURL = configuration.virtualDriver.baseURL;
 
-                            // hand back
-                            callback(null, config);
-                        }
+                        // make sure we update baseURL
+                        config.baseURL = configuration.virtualDriver.baseURL;
+
+                        // hand back
+                        return callback(null, config);
                     }
-                    else
+
+                    logMethod("Load virtual driver config failed");
+                    if (response && response.status)
                     {
-                        logMethod("Load virtual driver config failed");
-                        if (response && response.statusCode)
-                        {
-                            logMethod("Response status code: " + response.statusCode);
-                        }
-                        if (err) {
-                            logMethod("Err: " + JSON.stringify(err));
-                        }
-                        if (body) {
-                            logMethod("Body: " + body);
-                        }
-                        var message = body;
-                        if (!message) {
-                            message = "Unable to load virtual driver configuration";
-                        }
+                        logMethod("Response status code: " + response.status);
+                    }
+                    if (err) {
+                        logMethod("Err: " + JSON.stringify(err));
+                    }
+                    if (json) {
+                        logMethod("Body: " + json);
+                    }
+                    var message = json;
+                    if (!message) {
+                        message = "Unable to load virtual driver configuration";
+                    }
 
-                        // force disconnect of virtual driver so that it has to log in again
-                        // this prevents the attempt to use the refresh token
-                        disconnectVirtualDriver();
+                    // force disconnect of virtual driver so that it has to log in again
+                    // this prevents the attempt to use the refresh token
+                    disconnectVirtualDriver();
 
-                        // fire callback
-                        callback({
-                            "message": message,
-                            "err": err
-                        });
-                    }
+                    // fire callback
+                    return callback({
+                        "message": message,
+                        "err": err
+                    });
                 });
             });
         }
@@ -217,7 +213,7 @@ exports = module.exports = function()
                         }
                         if (!gitanaJson.baseURL)
                         {
-                            gitanaJson.baseURL = util.cleanupURL(util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT));
+                            gitanaJson.baseURL = util.cleanupURL(util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH));
                         }
 
                         // mark as retrieved from virtual driver
@@ -340,7 +336,7 @@ exports = module.exports = function()
             // defaults
             if (!configuration.baseURL)
             {
-                configuration.baseURL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT);
+                configuration.baseURL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH);
             }
             if (!configuration.key) {
                 configuration.key = "virtual";

package/notifications/notifications.js

@@ -76,6 +76,7 @@ var handleNotificationMessages = function(items, callback) {
             return function(done) {
 
                 //logFn("WORKING ON ITEM: " + i + ", item: " + JSON.stringify(item, null, "  "));
+                console.log("WORKING ON ITEM: " + i + ", item: " + JSON.stringify(item, null, "  "));
 
                 var operation = item.operation;
 
@@ -178,6 +179,44 @@ var handleNotificationMessages = function(items, callback) {
                                             "paths": paths
                                         }, z_done);
                                     }
+                                    else if (type === "theme")
+                                    {
+                                        var platformId = obj.platformId;
+                                        var applicationId = obj.applicationId;
+                                        var themeId = obj.themeId;
+                                        var themeKey = obj.themeKey;
+
+                                        // broadcast the "invalidate_theme" event
+                                        process.broadcast.publish("invalidate_theme", {
+                                            "host": host,
+                                            "platformId": platformId,
+                                            "applicationId": applicationId,
+                                            "themeId": themeId,
+                                            "themeKey": themeKey
+                                        }, z_done);
+                                    }
+                                    else if (type === "themeAssignment")
+                                    {
+                                        var platformId = obj.platformId;
+                                        var applicationId = obj.applicationId;
+                                        var projectId = obj.projectId;
+                                        var domainId = obj.domainId;
+                                        var principalId = obj.principalId;
+                                        var themeId = obj.themeId;
+                                        var operation = obj.operation;
+    
+                                        // broadcast the "invalidate_theme_assignment" event
+                                        process.broadcast.publish("invalidate_theme_assignment", {
+                                            "host": host,
+                                            "platformId": platformId,
+                                            "applicationId": applicationId,
+                                            "projectId": projectId,
+                                            "domainId": domainId,
+                                            "principalId": principalId,
+                                            "themeId": themeId,
+                                            "operation": operation
+                                        }, z_done);
+                                    }
                                     else if (type === "tenant")
                                     {
                                         //var ref = obj.ref;
@@ -493,6 +532,40 @@ var handleNotificationMessages = function(items, callback) {
                         return done(err);
                     });
                 }
+                else if (operation === "deployments_synced")
+                {
+                    var deploymentKey = item.deploymentKey;
+                    var applicationId = item.applicationId;
+//                    var scope = item.scope;
+
+                    var host = determineHost(item);
+
+                    var deployments = item.deployments;
+                    if (deployments && deployments.length > 0)
+                    {
+                        for (var i = 0; i < deployments.length; i++)
+                        {
+                            var deployment = deployments[i];
+
+                            var message = {
+                                "applicationId": applicationId,
+                                "deploymentKey": deploymentKey,
+  //                              "scope": scope,
+                                "host": host,
+                                "deployment": deployment
+                            };
+
+                            // broadcast event
+                            process.broadcast.publish("deployment_synced", message, function(err) {
+                                if (err) {
+                                    logInfo("published deployment_synced message. err:" + err + "\nmessage: " + JSON.stringify(message,null,2));
+                                }
+                                return done(err);
+                            });
+
+                        }
+                    }
+                }
                 else
                 {
                     logInfo("Unknown notification item: " + JSON.stringify(item));
@@ -586,7 +659,7 @@ module.exports = function()
     var r = {};
 
     r.start = function(callback) {
-
+    
         var config = process.configuration;
         if (!config["notifications"])
         {
@@ -613,7 +686,7 @@ module.exports = function()
                 notifications.enabled = true;
             }
         }
-
+        
         if (notifications.enabled)
         {
             if (process.env.CLOUDCMS_NOTIFICATIONS_TYPE)

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.3.1-beta.1",
+  "version": "3.3.1-beta.10",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -16,8 +16,9 @@
     "agentkeepalive": "^4.1.3",
     "alpaca": "^1.5.27",
     "archiver": "^5.1.0",
-    "async": "^3.2.0",
-    "aws-sdk": "^2.798.0",
+    "async": "^3.2.3",
+    "aws-sdk": "^2.807.0",
+    "axios": "^0.21.0",
     "basic-auth": "^2.0.1",
     "body-parser": "^1.19.0",
     "bytes": "^3.1.0",
@@ -25,31 +26,32 @@
     "clone": "^2.1.2",
     "connect-flash": "^0.1.1",
     "connect-multiparty": "^2.2.0",
-    "connect-redis": "^5.0.0",
+    "connect-redis": "^6.1.3",
     "consolidate": "^0.16.0",
     "cookie-parser": "^1.4.5",
     "debug": "^4.3.1",
-    "dustjs-helpers": "^1.7.4",
-    "dustjs-linkedin": "^2.7.5",
+    "dustjs-helpers": "^1.6.3",
+    "dustjs-linkedin": "^3.0.1",
     "errorhandler": "^1.5.1",
     "express": "^4.17.1",
     "express-session": "^1.17.1",
     "express-useragent": "^1.0.15",
     "extend-with-super": "^2.0.0",
-    "gitana": "^1.0.318",
+    "form-data": "^2.3.3",
+    "gitana": "^1.0.322",
     "handlebars": "^4.7.6",
     "hbs": "^4.1.1",
+    "helmet": "^4.6.0",
     "http-proxy": "^1.18.1",
     "json5": "^2.1.3",
     "jsonwebtoken": "^8.5.1",
     "klaw": "^3.0.0",
     "lru-cache": "^6.0.0",
-    "marked": "^1.2.5",
+    "marked": "^4.0.14",
     "memorystore": "^1.6.4",
     "mime": "^2.4.6",
     "moment": "^2.29.1",
     "morgan": "^1.10.0",
-    "node-redis-pubsub": "^4.0.0",
     "object-hash": "^2.0.3",
     "object-merge": "^2.5.1",
     "on-headers": "^1.0.2",
@@ -61,36 +63,33 @@
     "passport-linkedin": "^1.0.0",
     "passport-local": "^1.0.0",
     "passport-oauth": "^1.0.0",
-    "passport-saml": "^2.0.2",
-    "passport-twitter": "^1.0.4",
+    "passport-saml": "^3.2.1",
+    "passport-twitter": "^0.1.5",
     "pkginfo": "^0.4.1",
     "q": "^1.5.1",
     "random-js": "^2.1.0",
     "recursive-readdir": "^2.2.2",
-    "redis": "^3.0.2",
+    "redis": "^4.0.6",
     "redislock": "^1.3.0",
-    "request": "^2.88.0",
     "request-param": "^1.0.1",
     "response-time": "^2.3.2",
     "rwlock": "^5.0.0",
-    "semver": "^7.3.2",
+    "semver": "^7.3.4",
     "serve-favicon": "^2.5.0",
     "session-file-store": "^1.5.0",
     "sha1": "^1.1.1",
-    "socket.io": "3.0.3",
+    "socket.io": "^4.4.1",
     "ssl-root-cas": "^1.3.1",
     "sticky-session": "^1.1.2",
     "stomp-client": "^0.9.0",
     "targz": "^1.0.1",
     "temp": "^0.9.4",
     "toobusy-js": "^0.5.1",
-    "uuid": "^8.3.1",
+    "uuid": "^8.3.2",
     "vm2": "^3.9.2",
-    "watch": "^1.0.2",
+    "watch": "^0.13.0",
     "winston": "^3.3.3"
   },
-  "devDependencies": {},
-  "optionalDependencies": {},
   "contributors": [
     {
       "name": "Michael Uzquiano",