From 0369d5f2c78ca22bf216f9e072ba962924aa3144 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Mon, 27 Jul 2020 18:32:17 +0200 Subject: [PATCH] Fix admin routes and user controllers conflicting Signed-off-by: Alexandre Bodin --- packages/strapi/lib/middlewares/router/index.js | 2 +- .../strapi/lib/middlewares/router/utils/routerChecker.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/strapi/lib/middlewares/router/index.js b/packages/strapi/lib/middlewares/router/index.js index 004dd54a76..d4f82d3632 100644 --- a/packages/strapi/lib/middlewares/router/index.js +++ b/packages/strapi/lib/middlewares/router/index.js @@ -33,7 +33,7 @@ module.exports = strapi => { }); _.get(strapi.admin, 'config.routes', []).forEach(route => { - composeEndpoint(route, { router }); + composeEndpoint(route, { plugin: 'admin', router }); }); // Mount admin router on Strapi router diff --git a/packages/strapi/lib/middlewares/router/utils/routerChecker.js b/packages/strapi/lib/middlewares/router/utils/routerChecker.js index 5fe9e05fcd..fc86bad389 100644 --- a/packages/strapi/lib/middlewares/router/utils/routerChecker.js +++ b/packages/strapi/lib/middlewares/router/utils/routerChecker.js @@ -25,9 +25,12 @@ module.exports = strapi => let controller; if (plugin) { - controller = strapi.plugins[plugin].controllers[controllerKey]; + controller = + plugin === 'admin' + ? strapi.admin.controllers[controllerKey] + : strapi.plugins[plugin].controllers[controllerKey]; } else { - controller = strapi.controllers[controllerKey] || strapi.admin.controllers[controllerKey]; + controller = strapi.controllers[controllerKey]; } if (!_.isFunction(controller[actionName])) {