Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: push back some deprecations, remove deprecated stuff scheduled for v1.18.0

Browse Source
This commit is contained in:
Julian Lam
2021-09-03 12:04:16 -04:00
parent 1f91a31327
commit dd4e66e22c
5 changed files with 4 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/emailer.js
View File

@@ -324,7 +324,7 @@ Emailer.sendToEmail = async (template, email, language, params) => {
!Plugins.hooks.hasListeners('static:email.send'); !Plugins.hooks.hasListeners('static:email.send');
try { try {
if (Plugins.hooks.hasListeners('filter:email.send')) { if (Plugins.hooks.hasListeners('filter:email.send')) {
// Deprecated, remove in v1.18.0 // Deprecated, remove in v1.19.0
await Plugins.hooks.fire('filter:email.send', data); await Plugins.hooks.fire('filter:email.send', data);
} else if (Plugins.hooks.hasListeners('static:email.send')) { } else if (Plugins.hooks.hasListeners('static:email.send')) {
await Plugins.hooks.fire('static:email.send', data); await Plugins.hooks.fire('static:email.send', data);

4
src/middleware/user.js
View File

@@ -82,7 +82,7 @@ module.exports = function (middleware) {
return !res.headersSent; return !res.headersSent;
} }
// TODO: Remove in v1.18.0 // TODO: Remove in v1.19.0
middleware.authenticate = helpers.try(async (req, res, next) => { middleware.authenticate = helpers.try(async (req, res, next) => {
winston.warn(`[middleware] middleware.authenticate has been deprecated, page and API routes are now automatically authenticated via setup(Page|API)Route. Use middleware.authenticateRequest (if not using route helper) and middleware.ensureLoggedIn instead. (request path: ${req.path})`); winston.warn(`[middleware] middleware.authenticate has been deprecated, page and API routes are now automatically authenticated via setup(Page|API)Route. Use middleware.authenticateRequest (if not using route helper) and middleware.ensureLoggedIn instead. (request path: ${req.path})`);
if (!await authenticate(req, res)) { if (!await authenticate(req, res)) {
@@ -101,7 +101,7 @@ module.exports = function (middleware) {
next(); next();
}); });
// TODO: Remove in v1.18.0 // TODO: Remove in v1.19.0
middleware.authenticateOrGuest = (req, res, next) => { middleware.authenticateOrGuest = (req, res, next) => {
winston.warn(`[middleware] middleware.authenticateOrGuest has been renamed, use middleware.authenticateRequest instead. (request path: ${req.path})`); winston.warn(`[middleware] middleware.authenticateOrGuest has been renamed, use middleware.authenticateRequest instead. (request path: ${req.path})`);
middleware.authenticateRequest(req, res, next); middleware.authenticateRequest(req, res, next);

2
src/plugins/hooks.js
View File

@@ -8,7 +8,7 @@ const utils = require('../utils');
const Hooks = module.exports; const Hooks = module.exports;
Hooks.deprecatedHooks = { Hooks.deprecatedHooks = {
'filter:email.send': 'static:email.send', // 👋 @ 1.18.0 'filter:email.send': 'static:email.send', // 👋 @ 1.19.0
'filter:router.page': 'response:router.page', // 👋 @ 2.0.0 'filter:router.page': 'response:router.page', // 👋 @ 2.0.0
}; };

17
src/plugins/index.js
View File

@@ -25,23 +25,6 @@ require('./usage')(Plugins);
Plugins.data = require('./data'); Plugins.data = require('./data');
Plugins.hooks = require('./hooks'); Plugins.hooks = require('./hooks');
// Backwards compatibility for hooks, remove in v1.18.0
const _deprecate = async function (...args) {
const oldMethod = args.shift();
const newMethod = args.shift();
const method = args.shift();
const stack = new Error().stack.toString().split(os.EOL);
const context = stack[stack.findIndex(line => line.startsWith(' at Object.wrapperCallback')) + 1];
winston.warn(`[plugins/hooks] ${oldMethod} has been deprecated, call ${newMethod} instead.`);
winston.warn(`[plugins/hooks] ${context}`);
return method.apply(Plugins.hooks, args);
};
Plugins.registerHook = _deprecate.bind(null, 'Plugins.registerHook', 'Plugins.hooks.register', Plugins.hooks.register);
Plugins.unregisterHook = _deprecate.bind(null, 'Plugins.unregisterHook', 'Plugins.hooks.unregister', Plugins.hooks.unregister);
Plugins.fireHook = _deprecate.bind(null, 'Plugins.fireHook', 'Plugins.hooks.fire', Plugins.hooks.fire);
Plugins.hasListeners = _deprecate.bind(null, 'Plugins.hasListeners', 'Plugins.hooks.hasListeners', Plugins.hooks.hasListeners);
// end
Plugins.getPluginPaths = Plugins.data.getPluginPaths; Plugins.getPluginPaths = Plugins.data.getPluginPaths;
Plugins.loadPluginInfo = Plugins.data.loadPluginInfo; Plugins.loadPluginInfo = Plugins.data.loadPluginInfo;

17
src/privileges/index.js
View File

@@ -9,20 +9,3 @@ privileges.posts = require('./posts');
privileges.users = require('./users'); privileges.users = require('./users');
require('../promisify')(privileges); require('../promisify')(privileges);
// TODO: backwards compatibility remove in 1.18.0
[
'privilegeLabels',
'userPrivilegeList',
'groupPrivilegeList',
'privilegeList',
].forEach((fieldName) => {
Object.defineProperty(privileges, fieldName, {
configurable: true,
enumerable: true,
get: function () {
console.warn(`[deprecated] privileges.${fieldName} is deprecated. Use privileges.categories.${fieldName}`);
return privileges.categories[fieldName];
},
});
});