chore: replace koa-router-joi (strapi fork) by original and maintained

koa-joi-router

Upgrade some dependencies

packages/strapi-admin/package.json

@@ -102,6 +102,7 @@
   "license": "MIT",
   "gitHead": "c85658a19b8fef0f3164c19693a45db305dc07a9",
   "devDependencies": {
+    "webpack": "^4.29.6",
     "webpack-cli": "^3.3.2",
     "webpack-dev-server": "^3.4.1"
   }

packages/strapi-plugin-graphql/package.json

@@ -26,6 +26,7 @@
     "strapi-utils": "3.0.0-beta.6"
   },
   "devDependencies": {
+    "koa": "^2.1.0",
     "cross-env": "^5.2.0",
     "rimraf": "^2.6.3"
   },

packages/strapi-plugin-users-permissions/package.json

@@ -36,6 +36,9 @@
     "strapi-utils": "3.0.0-beta.6",
     "uuid": "^3.1.0"
   },
+  "devDependencies": {
+    "koa": "^2.1.0"
+  },
   "author": {
     "name": "Strapi team",
     "email": "hi@strapi.io",

packages/strapi/lib/core/bootstrap.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 
 const { createController, createService } = require('../core-api');
 const getURLFromSegments = require('../utils/url-from-segments');
-const routerJoi = require('koa-router-joi');
+const routerJoi = require('koa-joi-router');
 
 module.exports = function(strapi) {
   // Retrieve Strapi version.

packages/strapi/lib/middlewares/router/index.js

@@ -6,7 +6,7 @@
 
 // Public node modules.
 const _ = require('lodash');
-const routerJoi = require('koa-router-joi');
+const routerJoi = require('koa-joi-router');
 
 /**
  * Router hook

packages/strapi/lib/middlewares/router/utils/routerChecker.js

@@ -12,7 +12,7 @@ const finder = require('strapi-utils').finder;
 const regex = require('strapi-utils').regex;
 const joijson = require('strapi-utils').joijson;
 const policyUtils = require('strapi-utils').policy;
-const { Joi } = require('koa-router-joi');
+const { Joi } = require('koa-joi-router');
 
 module.exports = strapi =>
   function routerChecker(value, endpoint, plugin) {
@@ -20,13 +20,20 @@ module.exports = strapi =>
     const route = regex.detectRoute(endpoint);
 
     // Define controller and action names.
-    const handler = _.trim(value.handler).split('.');
+    const [controllerName, actionName] = _.trim(value.handler).split('.');
-    const controller = plugin
+    const controllerKey = _.toLower(controllerName);
-      ? strapi.plugins[plugin].controllers[handler[0].toLowerCase()]
-      : strapi.controllers[handler[0].toLowerCase()] ||
-        strapi.admin.controllers[handler[0].toLowerCase()];
 
-    const action = controller[handler[1]];
+    let controller;
+
+    if (plugin) {
+      controller = strapi.plugins[plugin].controllers[controllerKey];
+    } else {
+      controller =
+        strapi.controllers[controllerKey] ||
+        strapi.admin.controllers[controllerKey];
+    }
+
+    const action = controller[actionName];
 
     // Retrieve the API's name where the controller is located
     // to access to the right validators

packages/strapi/package.json

@@ -31,10 +31,10 @@
     "koa-favicon": "^2.0.0",
     "koa-i18n": "^2.1.0",
     "koa-ip": "^1.0.0",
+    "koa-joi-router": "^6.0.0",
     "koa-locale": "~1.3.0",
     "koa-lusca": "~2.2.0",
     "koa-qs": "^2.0.0",
-    "koa-router-joi": "^1.0.1",
     "koa-session": "^5.5.1",
     "koa-static": "^4.0.1",
     "lodash": "^4.17.5",