cloudcms-server 4.0.0-beta.3 → 4.0.0-beta.5

package/middleware/perf/perf.js

@@ -194,8 +194,9 @@ exports = module.exports = function()
                             car = filename;
                         }
                         var regex1 = new RegExp("-[0-9a-f]{32}$"); // md5
-                        var regex2 = new RegExp("-[0-9]{13}$"); // timestamp
-                        if (regex1.test(car) || regex2.test(car))
+                        var regex2 = new RegExp("-[0-9]{13}$"); // timestamp?
+                        var regex3 = new RegExp("-[0-9]{10}$"); // epoch millis
+                        if (regex1.test(car) || regex2.test(car) || regex3.test(car))
                         {
                             var x = car.lastIndexOf("-");
 

package/middleware/stores/stores.js

@@ -417,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")

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "4.0.0-beta.3",
+  "version": "4.0.0-beta.5",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -43,7 +43,7 @@
     "extend-with-super": "^2.0.0",
     "finalhandler": "^1.2.0",
     "form-data": "^2.3.3",
-    "gitana": "^1.0.322",
+    "gitana": "^1.0.323",
     "handlebars": "^4.7.6",
     "hbs": "^4.1.1",
     "helmet": "^4.6.0",

package/util/auth.js

@@ -324,6 +324,12 @@ var syncProfile = exports.syncProfile = function(req, res, strategy, domainId, p
                 }
 
                 _LOCK([CACHE_IDENTIFIER], function(err, releaseLockFn) {
+                    
+                    if (err) {
+                        try { releaseLockFn(); } catch (e) { }
+                        return callback(err);
+                    }
+                    
                     _handleSyncUser(req, strategy, settings, key, domainId, providerId, providerUserId, token, refreshToken, userObject, groupsArray, function (err, gitanaUser) {
 
                         if (err) {
@@ -333,14 +339,14 @@ var syncProfile = exports.syncProfile = function(req, res, strategy, domainId, p
 
                         // no user found
                         if (!gitanaUser) {
-                            releaseLockFn();
+                            try { releaseLockFn(); } catch (e) { }
                             return callback();
                         }
 
                         _handleConnectAsUser(req, key, gitanaUser, function (err, platform, appHelper, key) {
 
                             if (err) {
-                                releaseLockFn();
+                                try { releaseLockFn(); } catch (e) { }
                                 return callback(err);
                             }
 
@@ -351,8 +357,8 @@ var syncProfile = exports.syncProfile = function(req, res, strategy, domainId, p
                                 "appHelper": appHelper,
                                 "key": key
                             });
-
-                            releaseLockFn();
+    
+                            try { releaseLockFn(); } catch (e) { }
 
                             callback(err, gitanaUser, platform, appHelper, key, platform.getDriver());
                         }, gitanaUser);

package/util/cloudcms.js

@@ -555,7 +555,7 @@ exports = module.exports = function()
     var downloadNode = function(contentStore, gitana, repositoryId, branchId, nodeId, attachmentId, nodePath, locale, forceReload, callback)
     {
         // ensure path starts with "/"
-        if (nodePath && nodePath.substring(0, 1) !== "/") {
+        if (nodePath && !nodePath.startsWith("/")) {
             nodePath = "/" + nodePath;
         }
 
@@ -666,7 +666,7 @@ exports = module.exports = function()
         }
 
         // ensure path starts with "/"
-        if (nodePath && nodePath.substring(0, 1) !== "/") {
+        if (nodePath && !nodePath.startsWith("/")) {
             nodePath = "/" + nodePath;
         }