From 7b098c8b969a1d283a94391d9d8050ad0c5a4d13 Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Mon, 25 Feb 2019 03:25:08 +0000 Subject: [permissionmanager] rework for blacklist system - integrate PM into PM itself - wildcard function for hasPermission() --- server/migrations/20180726033100-create-role.js | 3 -- .../20180809013230-create-role_x_group.js | 30 -------------------- .../20181008151633-create-registrationhook.js | 2 +- .../20181009162133-add-registrationState-client.js | 2 +- .../20190221050800-create-role_x_group.js | 33 ++++++++++++++++++++++ 5 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 server/migrations/20180809013230-create-role_x_group.js create mode 100644 server/migrations/20190221050800-create-role_x_group.js (limited to 'server/migrations') diff --git a/server/migrations/20180726033100-create-role.js b/server/migrations/20180726033100-create-role.js index 20736a2..f3c0e3c 100644 --- a/server/migrations/20180726033100-create-role.js +++ b/server/migrations/20180726033100-create-role.js @@ -13,9 +13,6 @@ module.exports = { }, descr: { type: Sequelize.STRING(2048) - }, - recursiveGroups: { - type: Sequelize.BOOLEAN } }) }, diff --git a/server/migrations/20180809013230-create-role_x_group.js b/server/migrations/20180809013230-create-role_x_group.js deleted file mode 100644 index a6dd792..0000000 --- a/server/migrations/20180809013230-create-role_x_group.js +++ /dev/null @@ -1,30 +0,0 @@ -'use strict' -module.exports = { - up: (queryInterface, Sequelize) => { - return queryInterface.createTable('role_x_group', { - roleId: { - primaryKey: true, - allowNull: false, - type: Sequelize.INTEGER, - onDelete: 'cascade', - references: { - model: 'roles', - key: 'id' - } - }, - groupId: { - primaryKey: true, - allowNull: false, - type: Sequelize.INTEGER, - onDelete: 'cascade', - references: { - model: 'groups', - key: 'id' - } - } - }) - }, - down: (queryInterface, Sequelize) => { - return queryInterface.dropTable('role_x_group') - } -} diff --git a/server/migrations/20181008151633-create-registrationhook.js b/server/migrations/20181008151633-create-registrationhook.js index 5914188..0a96f29 100644 --- a/server/migrations/20181008151633-create-registrationhook.js +++ b/server/migrations/20181008151633-create-registrationhook.js @@ -6,7 +6,7 @@ module.exports = { primaryKey: true, autoIncrement: true, allowNull: false, - type: Sequelize.INTEGER, + type: Sequelize.INTEGER }, name: { type: Sequelize.STRING diff --git a/server/migrations/20181009162133-add-registrationState-client.js b/server/migrations/20181009162133-add-registrationState-client.js index 59e90cd..edd3b17 100644 --- a/server/migrations/20181009162133-add-registrationState-client.js +++ b/server/migrations/20181009162133-add-registrationState-client.js @@ -13,4 +13,4 @@ module.exports = { down: (queryInterface, Sequelize) => { return queryInterface.removeColumn('clients', 'registrationState') } -} \ No newline at end of file +} diff --git a/server/migrations/20190221050800-create-role_x_group.js b/server/migrations/20190221050800-create-role_x_group.js new file mode 100644 index 0000000..e457f87 --- /dev/null +++ b/server/migrations/20190221050800-create-role_x_group.js @@ -0,0 +1,33 @@ +'use strict' +module.exports = { + up: (queryInterface, Sequelize) => { + return queryInterface.createTable('role_x_group', { + roleId: { + primaryKey: true, + allowNull: false, + type: Sequelize.INTEGER, + onDelete: 'cascade', + references: { + model: 'roles', + key: 'id' + } + }, + groupId: { + primaryKey: true, + allowNull: false, + type: Sequelize.INTEGER, + onDelete: 'cascade', + references: { + model: 'groups', + key: 'id' + } + }, + blacklist: { + type: Sequelize.BOOLEAN + } + }) + }, + down: (queryInterface, Sequelize) => { + return queryInterface.dropTable('role_x_group') + } +} -- cgit v1.2.3-55-g7522