Fix retours PR

packages/strapi/lib/core/configurations.js

@@ -277,17 +277,13 @@ const enableHookNestedDependencies = function (name, flattenHooksConfig) {
   if (isEmpty(get(flattenHooksConfig, name, true))) {
 
     // Check if database connector is used
-    let isUsed = false;
+    const modelUsed = Object.keys(this.api || {})
-    forEach(get(strapi, 'api', {}), api => {
+      .filter(x => isObject(this.api[x].models)) // Filter API with models
-      if (!api.models) return;
+      .map(x => this.api[x].models) // Keep models
-
+      .filter(model => get(this.connection, model.connection, {}).connector === name) || 0; // Filter model with the right connector
-      forEach(api.models, model => {
-        if (get(strapi.connection, model.connection, {}).connector === name) isUsed = true;
-      });
-    });
 
     flattenHooksConfig[name] = {
-      enabled: isUsed
+      enabled: modelUsed.length > 0 // Will return false if there is no model, else true.
     };
 
     // Enabled dependencies.

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

@@ -47,7 +47,7 @@ module.exports = strapi => {
     initialize: function(cb) {
       strapi.app.use(
         async (ctx, next) => {
-          if (ctx.admin) return next();
+          if (ctx.request.admin) return next();
 
           await strapi.koaMiddlewares.kcors({
             origin: strapi.config.middleware.settings.cors.origin,

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

@@ -27,7 +27,7 @@ module.exports = strapi => {
     initialize: function(cb) {
       strapi.app.use(
         async (ctx, next) => {
-          if (ctx.admin) return next();
+          if (ctx.request.admin) return next();
 
           strapi.koaMiddlewares.convert(
             strapi.koaMiddlewares.lusca.csp(strapi.config.middleware.settings.csp)

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

@@ -29,7 +29,7 @@ module.exports = strapi => {
     initialize: function(cb) {
       strapi.app.use(
         async (ctx, next) => {
-          if (ctx.admin) return next();
+          if (ctx.request.admin) return next();
 
           await strapi.koaMiddlewares.convert(
             strapi.koaMiddlewares.lusca.csrf({

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

@@ -29,7 +29,7 @@ module.exports = strapi => {
     initialize: function(cb) {
       strapi.app.use(
         async (ctx, next) => {
-          if (ctx.admin) return next();
+          if (ctx.request.admin) return next();
 
           strapi.koaMiddlewares.convert(
             strapi.koaMiddlewares.lusca.hsts({

packages/strapi/lib/middlewares/index.js

@@ -3,18 +3,20 @@
 const glob = require('glob');
 const path = require('path');
 const { parallel } = require('async');
-const { after, includes, indexOf, drop, dropRight, uniq, defaultsDeep, get, set, isEmpty, isUndefined, union, keys } = require('lodash');
+const { after, includes, indexOf, drop, dropRight, uniq, defaultsDeep, get, set, isEmpty, isUndefined, union } = require('lodash');
 
 module.exports = function() {
   // Set if is admin destination for middleware application.
   // TODO: Use dynamic config for admin url.
   strapi.app.use(async (ctx, next) => {
-    const accepted = keys(strapi.plugins).map(url => `^\/${url}`);
+    const accepted = Object.keys(strapi.plugins).map(url => `^\/${url}`).concat(['^\/admin']);
-    accepted.push('^\/admin');
+
-    const isMatch = accepted.some(rx => new RegExp(rx).test(ctx.request.url));
+    strapi.app.use(async (ctx, next) => {
-    set(ctx, 'admin', isMatch);
+      ctx.request.admin = accepted.some(rx => new RegExp(rx).test(ctx.request.url));
+
       return next();
     });
+  });
 
   // Method to initialize middlewares and emit an event.
   const initialize = (module, middleware) => (resolve, reject) => {

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

@@ -28,7 +28,7 @@ module.exports = strapi => {
     initialize: function(cb) {
       strapi.app.use(
         async (ctx, next) => {
-          if (ctx.admin) return next();
+          if (ctx.request.admin) return next();
 
           strapi.koaMiddlewares.convert(
             strapi.koaMiddlewares.lusca.p3p({

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

@@ -28,7 +28,7 @@ module.exports = strapi => {
     initialize: function(cb) {
       strapi.app.use(
         async (ctx, next) => {
-          if (ctx.admin) return next();
+          if (ctx.request.admin) return next();
 
           strapi.koaMiddlewares.convert(
             strapi.koaMiddlewares.lusca.xframe({

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

@@ -28,7 +28,7 @@ module.exports = strapi => {
     initialize: function(cb) {
       strapi.app.use(
         async (ctx, next) => {
-          if (ctx.admin) return next();
+          if (ctx.request.admin) return next();
 
           strapi.koaMiddlewares.convert(
             strapi.koaMiddlewares.lusca.xssProtection({