Skip to content

Node.js based forum software built for the modern web

breaking: removal of deprecated privilege hooks

Julian Lam8ea377a4011d
diff --git a/src/plugins/hooks.js b/src/plugins/hooks.js
index 4769766872..0b79e78f5f 100644
--- a/src/plugins/hooks.js
+++ b/src/plugins/hooks.js
@@ -8,67 +8,11 @@ const als = require('../als');
const Hooks = module.exports;
Hooks._deprecated = new Map([
- ['filter:privileges.global.list', {
- new: 'static:privileges.global.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
- ['filter:privileges.global.groups.list', {
- new: 'static:privileges.global.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
- ['filter:privileges.global.list_human', {
- new: 'static:privileges.global.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
- ['filter:privileges.global.groups.list_human', {
- new: 'static:privileges.global.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
- ['filter:privileges.list', {
- new: 'static:privileges.categories.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
- ['filter:privileges.groups.list', {
- new: 'static:privileges.categories.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
- ['filter:privileges.list_human', {
- new: 'static:privileges.categories.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
- ['filter:privileges.groups.list_human', {
- new: 'static:privileges.categories.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
-
- ['filter:privileges.admin.list', {
- new: 'static:privileges.admin.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
- ['filter:privileges.admin.groups.list', {
- new: 'static:privileges.admin.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
- ['filter:privileges.admin.list_human', {
- new: 'static:privileges.admin.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
- ['filter:privileges.admin.groups.list_human', {
- new: 'static:privileges.admin.init',
- since: 'v3.5.0',
- until: 'v4.0.0',
- }],
+ /* ['filter:old.hook.name', {
+ new: 'filter:new.hook.name',
+ since: 'v4.0.0',
+ until: 'v5.0.0',
+ }], */
]);
Hooks.internals = {
diff --git a/src/privileges/admin.js b/src/privileges/admin.js
index 958b4cfe49..422e9c1060 100644
--- a/src/privileges/admin.js
+++ b/src/privileges/admin.js
@@ -39,8 +39,8 @@ privsAdmin.init = async () => {
}
};
-privsAdmin.getUserPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.admin.list', Array.from(_privilegeMap.keys()));
-privsAdmin.getGroupPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.admin.groups.list', Array.from(_privilegeMap.keys()).map(privilege => `groups:${privilege}`));
+privsAdmin.getUserPrivilegeList = () => Array.from(_privilegeMap.keys());
+privsAdmin.getGroupPrivilegeList = () => Array.from(_privilegeMap.keys()).map(privilege => `groups:${privilege}`);
privsAdmin.getPrivilegeList = async () => {
const [user, group] = await Promise.all([
privsAdmin.getUserPrivilegeList(),
@@ -149,18 +149,12 @@ privsAdmin.list = async function (uid) {
groupPrivilegeList.splice(idx, 1);
}
- const labels = await utils.promiseParallel({
- users: plugins.hooks.fire('filter:privileges.admin.list_human', privilegeLabels.slice()),
- groups: plugins.hooks.fire('filter:privileges.admin.groups.list_human', privilegeLabels.slice()),
- });
-
const keys = {
users: userPrivilegeList,
groups: groupPrivilegeList,
};
const payload = await utils.promiseParallel({
- labels,
labelData: Array.from(_privilegeMap.values()),
users: helpers.getUserPrivileges(0, keys.users),
groups: helpers.getGroupPrivileges(0, keys.groups),
diff --git a/src/privileges/categories.js b/src/privileges/categories.js
index 6061b28abe..3efa1e2413 100644
--- a/src/privileges/categories.js
+++ b/src/privileges/categories.js
@@ -53,8 +53,8 @@ privsCategories.getType = function (privilege) {
return priv && priv.type ? priv.type : '';
};
-privsCategories.getUserPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.list', Array.from(_privilegeMap.keys()));
-privsCategories.getGroupPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.groups.list', Array.from(_privilegeMap.keys()).map(privilege => `groups:${privilege}`));
+privsCategories.getUserPrivilegeList = () => Array.from(_privilegeMap.keys());
+privsCategories.getGroupPrivilegeList = () => Array.from(_privilegeMap.keys()).map(privilege => `groups:${privilege}`);
privsCategories.getPrivilegeList = async () => {
const [user, group] = await Promise.all([
@@ -72,27 +72,20 @@ privsCategories.getPrivilegesByFilter = function (filter) {
// Method used in admin/category controller to show all users/groups with privs in that given cid
privsCategories.list = async function (cid) {
- let labels = Array.from(_privilegeMap.values()).map(data => data.label);
- labels = await utils.promiseParallel({
- users: plugins.hooks.fire('filter:privileges.list_human', labels.slice()),
- groups: plugins.hooks.fire('filter:privileges.groups.list_human', labels.slice()),
- });
-
const keys = await utils.promiseParallel({
users: privsCategories.getUserPrivilegeList(),
groups: privsCategories.getGroupPrivilegeList(),
});
const payload = await utils.promiseParallel({
- labels,
labelData: Array.from(_privilegeMap.values()),
users: helpers.getUserPrivileges(cid, keys.users),
groups: helpers.getGroupPrivileges(cid, keys.groups),
});
payload.keys = keys;
- payload.columnCountUserOther = payload.labels.users.length - privsCategories._coreSize;
- payload.columnCountGroupOther = payload.labels.groups.length - privsCategories._coreSize;
+ payload.columnCountUserOther = payload.labelData.length - privsCategories._coreSize;
+ payload.columnCountGroupOther = payload.labelData.length - privsCategories._coreSize;
return payload;
};
diff --git a/src/privileges/global.js b/src/privileges/global.js
index aca4d85250..9de1beba8d 100644
--- a/src/privileges/global.js
+++ b/src/privileges/global.js
@@ -54,8 +54,8 @@ privsGlobal.getType = function (privilege) {
return priv && priv.type ? priv.type : '';
};
-privsGlobal.getUserPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.global.list', Array.from(_privilegeMap.keys()));
-privsGlobal.getGroupPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.global.groups.list', Array.from(_privilegeMap.keys()).map(privilege => `groups:${privilege}`));
+privsGlobal.getUserPrivilegeList = () => Array.from(_privilegeMap.keys());
+privsGlobal.getGroupPrivilegeList = () => Array.from(_privilegeMap.keys()).map(privilege => `groups:${privilege}`);
privsGlobal.getPrivilegeList = async () => {
const [user, group] = await Promise.all([
privsGlobal.getUserPrivilegeList(),
@@ -65,21 +65,12 @@ privsGlobal.getPrivilegeList = async () => {
};
privsGlobal.list = async function () {
- async function getLabels() {
- const labels = Array.from(_privilegeMap.values()).map(data => data.label);
- return await utils.promiseParallel({
- users: plugins.hooks.fire('filter:privileges.global.list_human', labels.slice()),
- groups: plugins.hooks.fire('filter:privileges.global.groups.list_human', labels.slice()),
- });
- }
-
const keys = await utils.promiseParallel({
users: privsGlobal.getUserPrivilegeList(),
groups: privsGlobal.getGroupPrivilegeList(),
});
const payload = await utils.promiseParallel({
- labels: getLabels(),
labelData: Array.from(_privilegeMap.values()),
users: helpers.getUserPrivileges(0, keys.users),
groups: helpers.getGroupPrivileges(0, keys.groups),