Merge pull request #7212 from strapi/fix/issue-7196

Fix admin routes and user controllers conflicting
strapi · Jul 27, 2020 · c4472f6 · c4472f6
2 parents 9c4728c + 0369d5f
commit c4472f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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])) {