Add new permissions to fixtures

closes #2325
- added new permissions
- added relation to user roles
- added updateFixtures to migrateUp
- removed validation per model to fix tests

core/server/data/fixtures/index.js

@@ -3,7 +3,11 @@ var sequence   = require('when/sequence'),
     Post        = require('../../models/post').Post,
     Tag         = require('../../models/tag').Tag,
     Role        = require('../../models/role').Role,
-    Permission = require('../../models/permission').Permission;
+    Permission  = require('../../models/permission').Permission,
+    Permissions = require('../../models/permission').Permissions,
+
+    populateFixtures,
+    updateFixtures;
 
 var fixtures = {
     posts: [
@@ -63,12 +67,71 @@ var fixtures = {
             "action_type":      "create",
             "object_type":      "post"
         }
+    ],
+
+    permissions003: [
+        {
+            "name":             "Get slug",
+            "action_type":      "slug",
+            "object_type":      "post"
+        },
+        {
+            "name":             "Export database",
+            "action_type":      "exportContent",
+            "object_type":      "db"
+        },
+        {
+            "name":             "Import database",
+            "action_type":      "importContent",
+            "object_type":      "db"
+        },
+        {
+            "name":             "Delete all content",
+            "action_type":      "deleteAllContent",
+            "object_type":      "db"
+        },
+        {
+            "name":             "Browse users",
+            "action_type":      "browse",
+            "object_type":      "user"
+        },
+        {
+            "name":             "Read users",
+            "action_type":      "read",
+            "object_type":      "user"
+        },
+        {
+            "name":             "Edit users",
+            "action_type":      "edit",
+            "object_type":      "user"
+        },
+        {
+            "name":             "Add users",
+            "action_type":      "add",
+            "object_type":      "user"
+        },
+        {
+            "name":             "Browse settings",
+            "action_type":      "browse",
+            "object_type":      "setting"
+        },
+        {
+            "name":             "Read settings",
+            "action_type":      "read",
+            "object_type":      "setting"
+        },
+        {
+            "name":             "Edit settings",
+            "action_type":      "edit",
+            "object_type":      "setting"
+        }
     ]
 };
 
-module.exports = {
+
-    populateFixtures: function () {
+populateFixtures = function () {
-        var ops = [];
+    var ops = [],
+        relations = [];
 
     _.each(fixtures.posts, function (post) {
         ops.push(function () {return Post.add(post); });
@@ -81,24 +144,150 @@ module.exports = {
     _.each(fixtures.roles, function (role) {
         ops.push(function () {return Role.add(role); });
     });
+
     _.each(fixtures.permissions, function (permission) {
         ops.push(function () {return Permission.add(permission); });
     });
 
+    _.each(fixtures.permissions003, function (permission) {
+        ops.push(function () {return Permission.add(permission); });
+    });
+
     // add the tag to the post
-        ops.push(function () {
+    relations.push(function () {
         Post.forge({id: 1}).fetch({withRelated: ['tags']}).then(function (post) {
             post.tags().attach([1]);
         });
     });
 
-        // finally, grant admins all permissions
+    //grant permissions to roles
-        ops.push(function () {
+    relations.push(function () {
-            Role.forge({id: 1}).fetch({withRelated: ['permissions']}).then(function (role) {
+        // admins gets all permissions
-                role.permissions().attach([1, 2, 3]);
+        Role.forge({name: 'Administrator'}).fetch({withRelated: ['permissions']}).then(function (role) {
+            Permissions.forge().fetch().then(function (perms) {
+                var admin_perm = _.map(perms.toJSON(), function (perm) {
+                    return perm.id;
+                });
+                return role.permissions().attach(_.compact(admin_perm));
             });
         });
 
-        return sequence(ops);
+        // editor gets access to posts, users and settings.browse, settings.read
+        Role.forge({name: 'Editor'}).fetch({withRelated: ['permissions']}).then(function (role) {
+            Permissions.forge().fetch().then(function (perms) {
+                var editor_perm = _.map(perms.toJSON(), function (perm) {
+                    if (perm.object_type === 'post' || perm.object_type === 'user') {
+                        return perm.id;
                     }
+                    if (perm.object_type === 'setting' &&
+                            (perm.action_type === 'browse' || perm.action_type === 'read')) {
+                        return perm.id;
+                    }
+                    return null;
+                });
+                return role.permissions().attach(_.compact(editor_perm));
+            });
+        });
+
+        // author gets access to post.add, post.slug, settings.browse, settings.read, users.browse and users.read
+        Role.forge({name: 'Author'}).fetch({withRelated: ['permissions']}).then(function (role) {
+            Permissions.forge().fetch().then(function (perms) {
+                var author_perm = _.map(perms.toJSON(), function (perm) {
+                    if (perm.object_type === 'post' &&
+                            (perm.action_type === 'add' || perm.action_type === 'slug')) {
+                        return perm.id;
+                    }
+                    if (perm.object_type === 'setting' &&
+                            (perm.action_type === 'browse' || perm.action_type === 'read')) {
+                        return perm.id;
+                    }
+                    if (perm.object_type === 'user' &&
+                            (perm.action_type === 'browse' || perm.action_type === 'read')) {
+                        return perm.id;
+                    }
+                    return null;
+                });
+                return role.permissions().attach(_.compact(author_perm));
+            });
+        });
+    });
+
+    return sequence(ops).then(function () {
+        sequence(relations);
+    });
+};
+
+updateFixtures = function () {
+    var ops = [],
+        relations = [];
+
+    _.each(fixtures.permissions003, function (permission) {
+        ops.push(function () {return Permission.add(permission); });
+    });
+
+    relations.push(function () {
+        // admin gets all new permissions
+        Role.forge({name: 'Administrator'}).fetch({withRelated: ['permissions']}).then(function (role) {
+            Permissions.forge().fetch().then(function (perms) {
+                var admin_perm = _.map(perms.toJSON(), function (perm) {
+                    var result  = fixtures.permissions003.filter(function (object) {
+                        return object.object_type === perm.object_type && object.action_type === perm.action_type;
+                    });
+                    if (!_.isEmpty(result)) {
+                        return perm.id;
+                    }
+                    return null;
+                });
+                return role.permissions().attach(_.compact(admin_perm));
+            });
+        });
+
+        // editor gets access to posts, users and settings.browse, settings.read
+        Role.forge({name: 'Editor'}).fetch({withRelated: ['permissions']}).then(function (role) {
+            Permissions.forge().fetch().then(function (perms) {
+                var editor_perm = _.map(perms.toJSON(), function (perm) {
+                    if (perm.object_type === 'post' || perm.object_type === 'user') {
+                        return perm.id;
+                    }
+                    if (perm.object_type === 'setting' &&
+                            (perm.action_type === 'browse' || perm.action_type === 'read')) {
+                        return perm.id;
+                    }
+                    return null;
+                });
+                return role.permissions().attach(_.compact(editor_perm));
+            });
+        });
+
+        // author gets access to post.add, post.slug, settings.browse, settings.read, users.browse and users.read
+        Role.forge({name: 'Author'}).fetch({withRelated: ['permissions']}).then(function (role) {
+            Permissions.forge().fetch().then(function (perms) {
+                var author_perm = _.map(perms.toJSON(), function (perm) {
+                    if (perm.object_type === 'post' &&
+                            (perm.action_type === 'add' || perm.action_type === 'slug')) {
+                        return perm.id;
+                    }
+                    if (perm.object_type === 'setting' &&
+                            (perm.action_type === 'browse' || perm.action_type === 'read')) {
+                        return perm.id;
+                    }
+                    if (perm.object_type === 'user' &&
+                            (perm.action_type === 'browse' || perm.action_type === 'read')) {
+                        return perm.id;
+                    }
+                    return null;
+                });
+                return role.permissions().attach(_.compact(author_perm));
+            });
+        });
+    });
+
+    return sequence(ops).then(function () {
+        sequence(relations);
+    });
+};
+
+module.exports = {
+    populateFixtures: populateFixtures,
+    updateFixtures: updateFixtures
 };

core/server/data/import/000.js

@@ -141,33 +141,33 @@ function importApps(ops, tableData, transaction) {
         }));
     });
 }
-/*
-function importAppSettings(ops, tableData, transaction) {
-    var appsData = tableData.apps,
-        appSettingsData = tableData.app_settings,
-        appName;
 
-    appSettingsData = stripProperties(['id'], appSettingsData);
+// function importAppSettings(ops, tableData, transaction) {
+//     var appsData = tableData.apps,
+//         appSettingsData = tableData.app_settings,
+//         appName;
+// 
+//     appSettingsData = stripProperties(['id'], appSettingsData);
+// 
+//     _.each(appSettingsData, function (appSetting) {
+//         // Find app to attach settings to
+//         appName = _.find(appsData, function (app) {
+//             return app.id === appSetting.app_id;
+//         }).name;
+//         ops.push(models.App.findOne({name: appName}, {transacting: transaction}).then(function (_app) {
+//             if (_app) {
+//                 // Fix app_id
+//                 appSetting.app_id = _app.id;
+//                 return models.AppSetting.add(appSetting, {transacting: transaction})
+//                     // add pass-through error handling so that bluebird doesn't think we've dropped it
+//                     .otherwise(function (error) { return when.reject(error); });
+//             }
+//             // Gracefully ignore missing apps
+//             return when.resolve(_app);
+//         }));
+//     });
+// }
 
-    _.each(appSettingsData, function (appSetting) {
-        // Find app to attach settings to
-        appName = _.find(appsData, function (app) {
-            return app.id === appSetting.app_id;
-        }).name;
-        ops.push(models.App.findOne({name: appName}, {transacting: transaction}).then(function (_app) {
-            if (_app) {
-                // Fix app_id
-                appSetting.app_id = _app.id;
-                return models.AppSetting.add(appSetting, {transacting: transaction})
-                    // add pass-through error handling so that bluebird doesn't think we've dropped it
-                    .otherwise(function (error) { return when.reject(error); });
-            }
-            // Gracefully ignore missing apps
-            return when.resolve(_app);
-        }));
-    });
-}
-*/
 // No data needs modifying, we just import whatever tables are available
 Importer000.prototype.basicImport = function (data) {
     var ops = [],

core/server/data/migration/index.js

@@ -252,7 +252,7 @@ function checkMySQLPostTable() {
 // Migrate from a specific version to the latest
 migrateUp = function () {
     return getTables().then(function (oldTables) {
-        // if tables exist and lient is mysqls check if posts table is okay
+        // if tables exist and client is mysqls check if posts table is okay
         if (!_.isEmpty(oldTables) && client === 'mysql') {
             return checkMySQLPostTable().then(function () {
                 return oldTables;
@@ -274,6 +274,8 @@ migrateUp = function () {
             return sequence(commands);
         }
         return;
+    }).then(function () {
+        return fixtures.updateFixtures();
     });
 };
 

core/server/models/app.js

@@ -6,10 +6,6 @@ var ghostBookshelf = require('./base'),
 App = ghostBookshelf.Model.extend({
     tableName: 'apps',
 
-    validate: function () {
-        ghostBookshelf.validator.check(this.get('name'), "App name cannot be blank").notEmpty();
-    },
-
     permissions: function () {
         // Have to use the require here because of circular dependencies
         return this.belongsToMany(require('./permission').Permission, 'permissions_apps');

core/server/models/appField.js

@@ -6,17 +6,6 @@ var ghostBookshelf = require('./base'),
 AppField = ghostBookshelf.Model.extend({
     tableName: 'app_fields',
 
-    validate: function () {
-        ghostBookshelf.validator.check(this.get('key'), 'Key cannot be blank').notEmpty();
-        ghostBookshelf.validator.check(this.get('key'), 'Key maximum length is 150 characters.').len(0, 150);
-        ghostBookshelf.validator.check(this.get('app_id'), 'App cannot be blank').notEmpty();
-        ghostBookshelf.validator.check(this.get('type'), 'Type maximum length is 150 characters.').len(0, 150);
-        ghostBookshelf.validator.check(this.get('relatable_id'), 'Relatable id cannot be blank').notEmpty();
-        ghostBookshelf.validator.check(this.get('relatable_type'), 'Relatable type cannot be blank').notEmpty();
-
-        return true;
-    },
-
     post: function () {
         return this.morphOne(Post, 'relatable');
     }

core/server/models/appSetting.js

@@ -6,15 +6,6 @@ var ghostBookshelf = require('./base'),
 AppSetting = ghostBookshelf.Model.extend({
     tableName: 'app_settings',
 
-    validate: function () {
-        ghostBookshelf.validator.check(this.get('key'), 'Key cannot be blank').notEmpty();
-        ghostBookshelf.validator.check(this.get('key'), 'Key maximum length is 150 characters.').len(0, 150);
-        ghostBookshelf.validator.check(this.get('app_id'), 'App cannot be blank').notEmpty();
-        ghostBookshelf.validator.check(this.get('type'), 'Type maximum length is 150 characters.').len(0, 150);
-
-        return true;
-    },
-
     app: function () {
         return this.belongsTo(App);
     }

core/server/models/permission.js

@@ -2,6 +2,7 @@ var ghostBookshelf = require('./base'),
     User           = require('./user').User,
     Role           = require('./role').Role,
     App            = require('./app').App,
+
     Permission,
     Permissions;
 

core/test/unit/import_spec.js

@@ -103,13 +103,7 @@ describe("Import", function () {
 
         beforeEach(function (done) {
             // migrate to current version
-            migration.migrateUp().then(function () {
+            migration.migrateUpFreshDb().then(function () {
-                // Load the fixtures
-                return fixtures.populateFixtures();
-            }).then(function () {
-                // Initialise the default settings
-                return Settings.populateDefaults();
-            }).then(function () {
                 return testUtils.insertDefaultUser();
             }).then(function () {
                 done();
@@ -169,12 +163,8 @@ describe("Import", function () {
 
         beforeEach(function (done) {
             // migrate to current version
-            migration.migrateUp().then(function () {
+            migration.migrateUpFreshDb().then(function () {
                 // Load the fixtures
-                return fixtures.populateFixtures();
-            }).then(function () {
-                    // Initialise the default settings
-                return Settings.populateDefaults();
             }).then(function () {
                 return testUtils.insertDefaultUser();
             }).then(function () {
@@ -356,13 +346,7 @@ describe("Import", function () {
 
         beforeEach(function (done) {
             // migrate to current version
-            migration.migrateUp().then(function () {
+            migration.migrateUpFreshDb().then(function () {
-                // Load the fixtures
-                return fixtures.populateFixtures();
-            }).then(function () {
-                    // Initialise the default settings
-                return Settings.populateDefaults();
-            }).then(function () {
                 return testUtils.insertDefaultUser();
             }).then(function () {
                 done();
@@ -543,13 +527,7 @@ describe("Import", function () {
 
         beforeEach(function (done) {
             // migrate to current version
-            migration.migrateUp().then(function () {
+            migration.migrateUpFreshDb().then(function () {
-                // Load the fixtures
-                return fixtures.populateFixtures();
-            }).then(function () {
-                    // Initialise the default settings
-                    return Settings.populateDefaults();
-                }).then(function () {
                 return testUtils.insertDefaultUser();
             }).then(function () {
                 done();

core/test/unit/permissions_spec.js

@@ -104,7 +104,7 @@ describe('Permissions', function () {
             .then(function (actionsMap) {
                 should.exist(actionsMap);
 
-                actionsMap.edit.sort().should.eql(['post', 'tag', 'user', 'page'].sort());
+                actionsMap.edit.sort().should.eql(['post', 'tag', 'user', 'page', 'setting'].sort());
 
                 actionsMap.should.equal(permissions.actionsMap);