gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix custom resource handler, closes #1125

Browse Source
This commit is contained in:
zadam 2020-06-22 23:13:53 +02:00
parent a89b6711d1
commit 74a7802088
1 changed files with 62 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/routes/custom.js
View File

@ -2,12 +2,11 @@ const repository = require('../services/repository');
const log = require('../services/log'); const log = require('../services/log');
const fileUploadService = require('./api/files.js'); const fileUploadService = require('./api/files.js');
const scriptService = require('../services/script'); const scriptService = require('../services/script');
const cls = require('../services/cls');
function register(router) { async function handleRequest(req, res) {
// explicitly no CSRF middleware since it's meant to allow integration from external services
router.all('/custom/:path*', async (req, res, next) => {
// express puts content after first slash into 0 index element // express puts content after first slash into 0 index element
const path = req.params.path + req.params[0]; const path = req.params.path + req.params[0];
const attrs = await repository.getEntities("SELECT * FROM attributes WHERE isDeleted = 0 AND type = 'label' AND name IN ('customRequestHandler', 'customResourceProvider')"); const attrs = await repository.getEntities("SELECT * FROM attributes WHERE isDeleted = 0 AND type = 'label' AND name IN ('customRequestHandler', 'customResourceProvider')");
@ -60,6 +59,16 @@ function register(router) {
log.info(message); log.info(message);
res.status(404).send(message); res.status(404).send(message);
}
function register(router) {
// explicitly no CSRF middleware since it's meant to allow integration from external services
router.all('/custom/:path*', async (req, res, next) => {
cls.namespace.bindEmitter(req);
cls.namespace.bindEmitter(res);
cls.init(() => handleRequest(req, res));
}); });
} }