@strapi/strapi 4.0.0-next.9 → 4.0.3

package/lib/middlewares/router/index.js

@@ -1,72 +0,0 @@
-'use strict';
-
-/**
- * Module dependencies
- */
-
-// Public node modules.
-const _ = require('lodash');
-const Router = require('koa-router');
-const createEndpointComposer = require('./utils/compose-endpoint');
-
-module.exports = strapi => {
-  const composeEndpoint = createEndpointComposer(strapi);
-
-  const registerAdminRoutes = () => {
-    const router = new Router({ prefix: '/admin' });
-
-    for (const route of strapi.admin.routes) {
-      composeEndpoint(route, { pluginName: 'admin', router });
-    }
-
-    strapi.app.use(router.routes()).use(router.allowedMethods());
-  };
-
-  const registerPluginRoutes = () => {
-    for (const pluginName in strapi.plugins) {
-      const plugin = strapi.plugins[pluginName];
-
-      const router = new Router({ prefix: `/${pluginName}` });
-
-      for (const route of plugin.routes || []) {
-        const hasPrefix = _.has(route.config, 'prefix');
-        composeEndpoint(route, {
-          pluginName,
-          router: hasPrefix ? strapi.router : router,
-        });
-      }
-
-      strapi.app.use(router.routes()).use(router.allowedMethods());
-    }
-  };
-
-  const registerAPIRoutes = () => {
-    for (const apiName in strapi.api) {
-      const api = strapi.api[apiName];
-
-      _.forEach(api.routes, routeInfo => {
-        // nested router
-        if (_.has(routeInfo, 'routes')) {
-          const router = new Router({ prefix: routeInfo.prefix });
-
-          for (const route of routeInfo.routes || []) {
-            composeEndpoint(route, { apiName, router });
-          }
-
-          strapi.router.use(router.routes()).use(router.allowedMethods());
-        } else {
-          composeEndpoint(routeInfo, { apiName, router: strapi.router });
-        }
-      });
-    }
-  };
-
-  return {
-    initialize() {
-      strapi.router.prefix(strapi.config.get('middleware.settings.router.prefix', ''));
-      registerAPIRoutes();
-      registerAdminRoutes();
-      registerPluginRoutes();
-    },
-  };
-};

package/lib/middlewares/router/utils/compose-endpoint.js

@@ -1,169 +0,0 @@
-'use strict';
-
-const _ = require('lodash');
-const compose = require('koa-compose');
-const { yup, policy: policyUtils } = require('@strapi/utils');
-
-const policyOrMiddlewareSchema = yup.lazy(value => {
-  if (typeof value === 'string') {
-    return yup.string().required();
-  }
-
-  if (typeof value === 'function') {
-    return yup.mixed().isFunction();
-  }
-
-  return yup.object({
-    name: yup.string().required(),
-    options: yup.object().notRequired(), // any options
-  });
-});
-
-const routeSchema = yup.object({
-  method: yup
-    .string()
-    .oneOf(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'ALL'])
-    .required(),
-  path: yup.string().required(),
-  handler: yup.lazy(value => {
-    if (typeof value === 'string') {
-      return yup.string().required();
-    }
-
-    return yup
-      .mixed()
-      .isFunction()
-      .required();
-  }),
-  config: yup
-    .object({
-      policies: yup
-        .array()
-        .of(policyOrMiddlewareSchema)
-        .notRequired(),
-      middlwares: yup
-        .array()
-        .of(policyOrMiddlewareSchema)
-        .notRequired(),
-    })
-    .notRequired(),
-});
-
-const validateRouteConfig = routeConfig => {
-  try {
-    return routeSchema.validateSync(routeConfig, {
-      strict: true,
-      abortEarly: false,
-      stripUnknown: true,
-    });
-  } catch (error) {
-    console.error(error);
-    throw new Error('Invalid route config');
-  }
-};
-
-module.exports = strapi => {
-  const routerChecker = createRouteChecker(strapi);
-
-  return (routeConfig, { pluginName, router, apiName }) => {
-    validateRouteConfig(routeConfig);
-
-    try {
-      const middlewares = resolveMiddlewares(routeConfig);
-
-      const { method, endpoint, policies, action } = routerChecker(routeConfig, {
-        pluginName,
-        apiName,
-      });
-
-      if (_.isUndefined(action) || !_.isFunction(action)) {
-        return strapi.log.warn(
-          `Ignored attempt to bind route '${routeConfig.method} ${routeConfig.path}' to unknown controller/action.`
-        );
-      }
-
-      router[method](endpoint, compose([...policies, ...middlewares, action]));
-    } catch (error) {
-      throw new Error(
-        `Error creating endpoint ${routeConfig.method} ${routeConfig.path}: ${error.message}`
-      );
-    }
-  };
-};
-
-const resolveMiddlewares = route => {
-  const middlewaresConfig = _.get(route, 'config.middlewares', []);
-
-  return middlewaresConfig.map(middlewareConfig => {
-    if (typeof middlewareConfig === 'function') {
-      return middlewareConfig;
-    }
-
-    const middleware = strapi.middleware(middlewareConfig);
-
-    if (!middleware) {
-      throw new Error(`Middleware ${middlewareConfig} not found.`);
-    }
-
-    return middleware;
-  });
-};
-
-const getMethod = route => _.trim(_.toLower(route.method));
-const getEndpoint = route => _.trim(route.path);
-
-const createRouteChecker = strapi => {
-  return (value, { pluginName, apiName }) => {
-    const method = getMethod(value);
-    const endpoint = getEndpoint(value);
-
-    // Define controller and action names.
-    const [controllerName, actionName] = _.trim(value.handler).split('.');
-    const controllerKey = _.toLower(controllerName);
-
-    let controller;
-
-    if (pluginName) {
-      if (pluginName === 'admin') {
-        controller = strapi.admin.controllers[controllerKey];
-      } else {
-        controller = strapi.plugin(pluginName).controller(controllerKey);
-      }
-    } else {
-      controller = strapi.container.get('controllers').get(`api::${apiName}.${controllerKey}`);
-    }
-    if (!_.isFunction(controller[actionName])) {
-      strapi.stopWithError(
-        `Error creating endpoint ${method} ${endpoint}: handler not found "${controllerKey}.${actionName}"`
-      );
-    }
-
-    const action = controller[actionName].bind(controller);
-
-    const { bodyPolicy } = policyUtils;
-
-    const globalPolicy = policyUtils.globalPolicy({
-      controller: controllerKey,
-      action: actionName,
-      method,
-      endpoint,
-      plugin: pluginName,
-    });
-
-    const policyOption = _.get(value, 'config.policies', []);
-
-    const routePolicies = policyOption.map(policyConfig => {
-      return policyUtils.get(policyConfig, { pluginName, apiName });
-    });
-
-    // Init policies array.
-    const policies = [globalPolicy, ...routePolicies, bodyPolicy];
-
-    return {
-      method,
-      endpoint,
-      policies,
-      action,
-    };
-  };
-};

package/lib/utils/get-prefixed-dependencies.js

@@ -1,7 +0,0 @@
-'use strict';
-
-module.exports = (prefix, pkgJSON) => {
-  return Object.keys(pkgJSON.dependencies)
-    .filter(d => d.startsWith(prefix) && d.length > prefix.length)
-    .map(pkgName => pkgName.substring(prefix.length + 1));
-};