@strapi/strapi 4.0.0-beta.2 → 4.0.0-beta.20

package/lib/services/server/register-middlewares.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { yup } = require('@strapi/utils');
+
 const { resolveMiddlewares } = require('./middleware');
 
 /**
@@ -15,7 +16,8 @@ const defaultConfig = [
   'strapi::cors',
   'strapi::poweredBy',
   'strapi::logger',
-  'strapi::request',
+  'strapi::query',
+  'strapi::body',
   'strapi::favicon',
   'strapi::public',
 ];
@@ -24,7 +26,8 @@ const requiredMiddlewares = [
   'strapi::errors',
   'strapi::security',
   'strapi::cors',
-  'strapi::request',
+  'strapi::query',
+  'strapi::body',
   'strapi::public',
   'strapi::favicon',
 ];
@@ -63,6 +66,8 @@ const registerApplicationMiddlewares = async strapi => {
 
   checkRequiredMiddlewares(middlewares);
 
+  // NOTE: exclude middlewares that return nothing.
+  // this is used for middlewares that only extend the app only need to be added in certain conditions
   for (const middleware of middlewares) {
     strapi.server.use(middleware.handler);
   }

package/lib/services/server/register-routes.js

@@ -6,12 +6,10 @@ const createRouteScopeGenerator = namespace => route => {
   const prefix = namespace.endsWith('::') ? namespace : `${namespace}.`;
 
   if (typeof route.handler === 'string') {
-    const [controller, action] = route.handler.split('.');
-
     _.defaultsDeep(route, {
       config: {
         auth: {
-          scope: `${prefix}${controller}.${action}`,
+          scope: [`${route.handler.startsWith(prefix) ? '' : prefix}${route.handler}`],
         },
       },
     });

package/lib/services/server/routing.js

@@ -44,6 +44,18 @@ const routeSchema = yup.object({
   }),
   config: yup
     .object({
+      auth: yup.lazy(value => {
+        if (value === false) {
+          return yup.boolean().required();
+        }
+
+        return yup.object({
+          scope: yup
+            .array()
+            .of(yup.string())
+            .required(),
+        });
+      }),
       policies: yup
         .array()
         .of(policyOrMiddlewareSchema)
@@ -76,6 +88,7 @@ const createRouteManager = (strapi, opts = {}) => {
   const createRoute = (route, router) => {
     validateRouteConfig(route);
 
+    // NOTE: the router type is used to tag controller actions and for authentication / authorization so we need to pass this info down to the route level
     _.set(route, 'info.type', type || 'admin');
 
     composeEndpoint(route, { router });

package/lib/utils/get-dirs.js

@@ -11,6 +11,7 @@ const getDirs = root => ({
   policies: join(root, 'src', 'policies'),
   middlewares: join(root, 'src', 'middlewares'),
   config: join(root, 'config'),
+  public: join(root, 'public'),
 });
 
 module.exports = getDirs;

package/lib/utils/signals.js

@@ -0,0 +1,24 @@
+'use strict';
+
+const destroyOnSignal = strapi => {
+  let signalReceived = false;
+
+  // For unknown reasons, we receive signals 2 times.
+  // As a temporary fix, we ignore the signals received after the first one.
+
+  const terminateStrapi = async () => {
+    if (!signalReceived) {
+      signalReceived = true;
+      await strapi.destroy();
+      process.exit();
+    }
+  };
+
+  ['SIGTERM', 'SIGINT'].forEach(signal => {
+    process.on(signal, terminateStrapi);
+  });
+};
+
+module.exports = {
+  destroyOnSignal,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.0-beta.20",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -53,13 +53,13 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "author": {
-    "name": "Strapi team",
+    "name": "Strapi Solutions SAS",
     "email": "hi@strapi.io",
     "url": "https://strapi.io"
   },
   "maintainers": [
     {
-      "name": "Strapi team",
+      "name": "Strapi Solutions SAS",
       "email": "hi@strapi.io",
       "url": "https://strapi.io"
     }
@@ -77,19 +77,19 @@
     "postinstall": "node lib/utils/success.js"
   },
   "dependencies": {
-    "@hapi/boom": "9.1.4",
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.0.0-beta.2",
-    "@strapi/database": "4.0.0-beta.2",
-    "@strapi/generate-new": "4.0.0-beta.2",
-    "@strapi/generators": "4.0.0-beta.2",
-    "@strapi/logger": "4.0.0-beta.2",
-    "@strapi/plugin-content-manager": "4.0.0-beta.2",
-    "@strapi/plugin-content-type-builder": "4.0.0-beta.2",
-    "@strapi/plugin-email": "4.0.0-beta.2",
-    "@strapi/plugin-upload": "4.0.0-beta.2",
-    "@strapi/utils": "4.0.0-beta.2",
+    "@strapi/admin": "4.0.0-beta.20",
+    "@strapi/database": "4.0.0-beta.20",
+    "@strapi/generate-new": "4.0.0-beta.20",
+    "@strapi/generators": "4.0.0-beta.20",
+    "@strapi/logger": "4.0.0-beta.20",
+    "@strapi/plugin-content-manager": "4.0.0-beta.20",
+    "@strapi/plugin-content-type-builder": "4.0.0-beta.20",
+    "@strapi/plugin-email": "4.0.0-beta.20",
+    "@strapi/plugin-upload": "4.0.0-beta.20",
+    "@strapi/utils": "4.0.0-beta.20",
+    "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
     "chokidar": "3.5.2",
@@ -103,7 +103,8 @@
     "execa": "5.1.1",
     "fs-extra": "10.0.0",
     "glob": "7.2.0",
-    "inquirer": "8.1.5",
+    "http-errors": "1.8.0",
+    "inquirer": "8.2.0",
     "is-docker": "2.2.1",
     "koa": "2.13.3",
     "koa-body": "4.2.0",
@@ -123,11 +124,15 @@
     "package-json": "7.0.0",
     "qs": "6.10.1",
     "resolve-cwd": "3.0.0",
-    "semver": "7.3.5"
+    "semver": "7.3.5",
+    "statuses": "2.0.1"
+  },
+  "devDependencies": {
+    "supertest": "^6.1.6"
   },
   "engines": {
     "node": ">=12.x.x <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "020680cbb38b6281b3e16df264b9388a087b2b49"
+  "gitHead": "b4993dab9f6dbc583709167f459b6f00e0b4baa6"
 }

package/lib/core/app-configuration/load-functions.js

@@ -1,28 +0,0 @@
-'use strict';
-
-const { join, extname, basename } = require('path');
-const fse = require('fs-extra');
-
-module.exports = function loadFunctions(dir) {
-  const functions = {};
-
-  if (!fse.pathExistsSync(dir)) {
-    return functions;
-  }
-
-  const paths = fse.readdirSync(dir, { withFileTypes: true });
-
-  for (const fd of paths) {
-    const { name } = fd;
-    const fullPath = join(dir, name);
-
-    if (fd.isDirectory()) {
-      functions[name] = loadFunctions(fullPath);
-    } else if (fd.isFile() && extname(name) === '.js') {
-      const key = basename(name, '.js');
-      functions[key] = require(fullPath);
-    }
-  }
-
-  return functions;
-};

package/lib/core-api/index.js

@@ -1,39 +0,0 @@
-/**
- * Core API
- */
-'use strict';
-
-const _ = require('lodash');
-
-const createController = require('./controller');
-const { createService } = require('./service');
-
-/**
- * Returns a service and a controller built based on the content type passed
- *
- * @param {object} opts options
- * @param {object} opts.api api
- * @param {object} opts.model model
- * @param {object} opts.strapi strapi
- * @returns {object} controller & service
- */
-function createCoreApi({ api, model, strapi }) {
-  const { modelName } = model;
-
-  // find corresponding service and controller
-  const userService = _.get(api, ['services', modelName], {});
-  const userController = _.get(api, ['controllers', modelName], {});
-
-  const service = Object.assign(createService({ model, strapi }), userService);
-
-  const controller = Object.assign(createController({ service, model }), userController);
-
-  return {
-    service,
-    controller,
-  };
-}
-
-module.exports = {
-  createCoreApi,
-};

package/lib/middlewares/request.js

@@ -1,74 +0,0 @@
-'use strict';
-
-const { defaultsDeep } = require('lodash/fp');
-const body = require('koa-body');
-const qs = require('qs');
-
-const defaults = {
-  multipart: true,
-  queryStringParser: {
-    strictNullHandling: true,
-    arrayLimit: 100,
-    depth: 20,
-  },
-};
-
-/**
- * Body parser hook
- */
-const addQsParser = (app, settings) => {
-  Object.defineProperty(app.request, 'query', {
-    configurable: false,
-    enumerable: true,
-    /*
-     * Get parsed query-string.
-     */
-    get() {
-      const qstr = this.querystring;
-      const cache = (this._querycache = this._querycache || {});
-      return cache[qstr] || (cache[qstr] = qs.parse(qstr, settings));
-    },
-
-    /*
-     * Set query-string as an object.
-     */
-    set(obj) {
-      this.querystring = qs.stringify(obj);
-    },
-  });
-
-  return app;
-};
-
-/**
- * @type {import('./').MiddlewareFactory}
- */
-module.exports = (options, { strapi }) => {
-  const { queryStringParser, ...bodyOptions } = defaultsDeep(defaults, options);
-
-  addQsParser(strapi.server.app, queryStringParser);
-
-  return async (ctx, next) => {
-    // TODO: find a better way later
-    if (ctx.url === '/graphql') {
-      return next();
-    }
-
-    try {
-      return body({ patchKoa: true, ...bodyOptions })(ctx, next);
-    } catch (e) {
-      if ((e || {}).message && e.message.includes('maxFileSize exceeded')) {
-        throw strapi.errors.entityTooLarge('FileTooBig', {
-          errors: [
-            {
-              id: 'parser.file.status.sizeLimit',
-              message: `file is bigger than the limit size!`,
-            },
-          ],
-        });
-      }
-
-      throw e;
-    }
-  };
-};