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

feat: expose global/admin privileges to all routes

Browse Source 
@barisusakli revert if necessary 😬
This commit is contained in:
Julian Lam
2020-08-20 10:35:36 -04:00
parent b2271eb64f
commit 4737f937ee
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/middleware/render.js
View File

@@ -7,6 +7,7 @@ const winston = require('winston');
const plugins = require('../plugins'); const plugins = require('../plugins');
const meta = require('../meta'); const meta = require('../meta');
const privileges = require('../privileges');
const translator = require('../translator'); const translator = require('../translator');
const widgets = require('../widgets'); const widgets = require('../widgets');
const utils = require('../utils'); const utils = require('../utils');
@@ -31,6 +32,9 @@ module.exports = function (middleware) {
options.url = (req.baseUrl + req.path.replace(/^\/api/, '')); options.url = (req.baseUrl + req.path.replace(/^\/api/, ''));
options.bodyClass = buildBodyClass(req, res, options); options.bodyClass = buildBodyClass(req, res, options);
const privilegeSet = await Promise.all(['global', 'admin'].map(async type => privileges[type].get(req.uid)));
options.privileges = { ...privilegeSet[0], ...privilegeSet[1] };
const buildResult = await plugins.fireHook('filter:' + template + '.build', { req: req, res: res, templateData: options }); const buildResult = await plugins.fireHook('filter:' + template + '.build', { req: req, res: res, templateData: options });
const templateToRender = buildResult.templateData.templateToRender || template; const templateToRender = buildResult.templateData.templateToRender || template;

2
test/api.js
View File

@@ -66,7 +66,7 @@ describe('Read API', async () => {
await socketUser.exportPosts({ uid: adminUid }, { uid: adminUid }); await socketUser.exportPosts({ uid: adminUid }, { uid: adminUid });
await socketUser.exportUploads({ uid: adminUid }, { uid: adminUid }); await socketUser.exportUploads({ uid: adminUid }, { uid: adminUid });
// wait for export child process to complete // wait for export child process to complete
await wait(20000); // await wait(20000);
// Attach a search hook so /api/search is enabled // Attach a search hook so /api/search is enabled
plugins.registerHook('core', { plugins.registerHook('core', {