Hotfix for invalid project routes

package.json

@@ -1,7 +1,7 @@
 {
   "name": "hashbrown-cms",
   "repository": "https://github.com/Putaitu/hashbrown-cms.git",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "The pluggable CMS",
   "main": "hashbrown.js",
   "scripts": {

src/Server/Controllers/ServerController.js

@@ -33,7 +33,6 @@ class ServerController extends ApiController {
         app.post('/api/server/backups/:project/:timestamp/restore', this.middleware({ needsAdmin: true, setProject: false }), this.postRestoreProjectBackup);
         app.post('/api/server/settings/:project/:section', this.middleware({ needsAdmin: true, setProject: false }), this.postProjectSettings);
         app.post('/api/server/migrate/:project/', this.middleware({ needsAdmin: true, setProject: false }), this.postMigrateContent);
-        app.post('/api/server/rename/:project/', this.middleware({ needsAdmin: true, setProject: false }), this.postRenameProject);
 
         app.put('/api/server/projects/:project/:environment', this.middleware({ needsAdmin: true, setProject: false }), this.putEnvironment);
 
@@ -207,8 +206,11 @@ class ServerController extends ApiController {
      */
     static postProjectSettings(req, res) {
         let settings = req.body;
-
-        SettingsHelper.setSettings(req.params.project, null, req.params.section, settings)
+
+        ProjectHelper.checkProject(req.params.project)
+        .then(() => {
+            return SettingsHelper.setSettings(req.params.project, null, req.params.section, settings);
+        })
         .then(() => {
             res.status(200).send(settings);
         })
@@ -477,22 +479,6 @@ class ServerController extends ApiController {
             res.status(502).send(ServerController.printError(e));
         });
     }
-
-    /**
-     * Renames a project
-     */
-    static postRenameProject(req, res) {
-        let oldName = req.params.project;
-        let newName = req.body.name;
-
-        ProjectHelper.renameProject(oldName, newName)
-        .then((msg) => {
-            res.status(200).send(msg);
-        })
-        .catch((e) => {
-            res.status(502).send(ServerController.printError(e));
-        });
-    }
 }
 
 module.exports = ServerController;

src/Server/Controllers/ViewController.js

@@ -102,6 +102,7 @@ class ViewController extends Controller {
                 });
             })
             .catch((e) => {
+                debug.error(e, this);
                 res.status(403).redirect('/login');  
             });
         });

src/Server/Helpers/ProjectHelper.js

@@ -49,6 +49,26 @@ class ProjectHelper {
         });
     }
 
+    /**
+     * Performs a check of the requested project
+     *
+     * @param {String} project
+     *
+     * @returns {Promise}
+     */
+    static checkProject(
+        project = requiredParam('project')
+    ) {
+        return this.projectExists(project)
+        .then((projectExists) => {
+            if(!projectExists) {
+                return Promise.reject(new Error('Project "' + project + '" could not be found'));
+            }
+
+            return Promise.resolve();
+        });
+    }
+
     /**
      * Gets a Project object
      *
@@ -61,7 +81,10 @@ class ProjectHelper {
         let users;
         let backups;
 
-        return HashBrown.Helpers.SettingsHelper.getSettings(id)
+        return this.checkProject(id)
+        .then(() => {
+            return HashBrown.Helpers.SettingsHelper.getSettings(id);
+        })
         .then((foundSettings) => {
             settings = foundSettings || {};
 
@@ -98,8 +121,11 @@ class ProjectHelper {
      * @returns {Promise(Array)} environments
      */
     static getAllEnvironments(project) {
-        // First attempt to get remote environments
-        return SyncHelper.getResource(project, null, 'environments')
+        return this.checkProject(project)
+        .then(() => {
+            // First attempt to get remote environments
+            return SyncHelper.getResource(project, null, 'environments')
+        })
         .then((environments) => {
             // If remote environments were found, resolve immediately
             if(environments && Array.isArray(environments)) {
@@ -145,20 +171,23 @@ class ProjectHelper {
      * @returns {Promise} Promise
      */
     static deleteProject(
-        id = requriedParam('id'),
+        id = requiredParam('id'),
         makeBackup = true
     ) {
-        // Make backup first, if specified
-        if(makeBackup) {
-            return BackupHelper.createBackup(id)
-            .then(() => {
-                return MongoHelper.dropDatabase(id);
-            });
+        return this.checkProject(id)
+        .then(() => {
+            // Make backup first, if specified
+            if(makeBackup) {
+                return BackupHelper.createBackup(id)
+                .then(() => {
+                    return MongoHelper.dropDatabase(id);
+                });
 
-        // If not, just drop the database
-        } else {
-            return MongoHelper.dropDatabase(id);
-        }
+            // If not, just drop the database
+            } else {
+                return MongoHelper.dropDatabase(id);
+            }
+        });
     }
 
     /**
@@ -173,8 +202,11 @@ class ProjectHelper {
         project = requiredParam('project'),
         environment = requiredParam('environment')
     ) {
-        // Check if project is synced first
-        return SettingsHelper.getSettings(project, null, 'sync')
+        return this.checkProject(project)
+        .then(() => {
+            // Check if project is synced first
+            return SettingsHelper.getSettings(project, null, 'sync');
+        })
         .then((sync) => {
             if(sync.enabled) {
                 return Promise.reject(new Error('Cannot add environments to a synced project'));
@@ -189,29 +221,6 @@ class ProjectHelper {
         });
     }
 
-    /**
-     * Renames a project
-     *
-     * @param {String} oldName
-     * @param {String} newName
-     *
-     * @return {Promise} Promise
-     */
-    static renameProject(
-        oldName = requiredParam('oldName'),
-        newName = requiredParam('newName')
-    ) {
-        // Check if project is synced first
-        return SettingsHelper.getSettings(project, null, 'sync')
-        .then((sync) => {
-            if(sync.enabled) {
-                return Promise.reject(new Error('Cannot rename a synced project'));
-            }
-
-            return MongoHelper.renameDatabase(oldName, newName);
-        });
-    }
-
     /**
      * Deletes an environment
      *
@@ -224,8 +233,11 @@ class ProjectHelper {
         project = requiredParam('project'),
         environment = requiredParam('environment')
     ) {
-        // Check if project is synced first
-        return SettingsHelper.getSettings(project, null, 'sync')
+        return this.checkProject(project)
+        .then(() => {
+            // Check if project is synced first
+            return SettingsHelper.getSettings(project, null, 'sync');
+        })
         .then((sync) => {
             if(sync.enabled) {
                 return Promise.reject(new Error('Cannot delete environments from a synced project'));