@strapi/strapi 4.0.0-next.7 → 4.0.1

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

@@ -0,0 +1,106 @@
+'use strict';
+
+const _ = require('lodash');
+
+const createRouteScopeGenerator = namespace => route => {
+  const prefix = namespace.endsWith('::') ? namespace : `${namespace}.`;
+
+  if (typeof route.handler === 'string') {
+    _.defaultsDeep(route, {
+      config: {
+        auth: {
+          scope: [`${route.handler.startsWith(prefix) ? '' : prefix}${route.handler}`],
+        },
+      },
+    });
+  }
+};
+
+/**
+ * Register all routes
+ * @param {import('../../').Strapi} strapi
+ */
+module.exports = strapi => {
+  registerAdminRoutes(strapi);
+  registerAPIRoutes(strapi);
+  registerPluginRoutes(strapi);
+};
+
+/**
+ * Register admin routes
+ * @param {import('../../').Strapi} strapi
+ */
+const registerAdminRoutes = strapi => {
+  const generateRouteScope = createRouteScopeGenerator(`admin::`);
+
+  strapi.admin.routes.forEach(route => {
+    generateRouteScope(route);
+    route.info = { pluginName: 'admin' };
+  });
+
+  strapi.server.routes({
+    type: 'admin',
+    prefix: '/admin',
+    routes: strapi.admin.routes,
+  });
+};
+
+/**
+ * Register plugin routes
+ * @param {import('../../').Strapi} strapi
+ */
+const registerPluginRoutes = strapi => {
+  for (const pluginName in strapi.plugins) {
+    const plugin = strapi.plugins[pluginName];
+
+    const generateRouteScope = createRouteScopeGenerator(`plugin::${pluginName}`);
+
+    if (Array.isArray(plugin.routes)) {
+      plugin.routes.forEach(route => {
+        generateRouteScope(route);
+        route.info = { pluginName };
+      });
+
+      strapi.server.routes({
+        type: 'admin',
+        prefix: `/${pluginName}`,
+        routes: plugin.routes,
+      });
+    } else {
+      _.forEach(plugin.routes, router => {
+        router.type = router.type || 'admin';
+        router.prefix = `/${pluginName}`;
+        router.routes.forEach(route => {
+          generateRouteScope(route);
+          route.info = { pluginName };
+        });
+
+        strapi.server.routes(router);
+      });
+    }
+  }
+};
+
+/**
+ * Register api routes
+ * @param {import('../../').Strapi} strapi
+ */
+const registerAPIRoutes = strapi => {
+  for (const apiName in strapi.api) {
+    const api = strapi.api[apiName];
+
+    const generateRouteScope = createRouteScopeGenerator(`api::${apiName}`);
+
+    _.forEach(api.routes, router => {
+      // TODO: remove once auth setup
+      // pass meta down to compose endpoint
+      router.type = 'content-api';
+      router.routes.forEach(route => {
+        generateRouteScope(route);
+        route.info = { apiName };
+      });
+
+      return strapi.server.routes(router);
+    });
+  }
+};

package/lib/services/server/routing.js

@@ -0,0 +1,120 @@
+'use strict';
+
+const Router = require('@koa/router');
+const _ = require('lodash');
+const { has } = require('lodash/fp');
+const { yup } = require('@strapi/utils');
+
+const createEndpointComposer = require('./compose-endpoint');
+
+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();
+    }
+
+    if (Array.isArray(value)) {
+      return yup.array().required();
+    }
+
+    return yup
+      .mixed()
+      .isFunction()
+      .required();
+  }),
+  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)
+        .notRequired(),
+      middlewares: yup
+        .array()
+        .of(policyOrMiddlewareSchema)
+        .notRequired(),
+    })
+    .notRequired(),
+});
+
+const validateRouteConfig = routeConfig => {
+  try {
+    return routeSchema.validateSync(routeConfig, {
+      strict: true,
+      abortEarly: false,
+      stripUnknown: true,
+    });
+  } catch (error) {
+    throw new Error('Invalid route config', error.message);
+  }
+};
+
+const createRouteManager = (strapi, opts = {}) => {
+  const { type } = opts;
+
+  const composeEndpoint = createEndpointComposer(strapi);
+
+  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 });
+  };
+
+  const addRoutes = (routes, router) => {
+    if (Array.isArray(routes)) {
+      routes.forEach(route => createRoute(route, router));
+    } else if (routes.routes) {
+      const subRouter = new Router({ prefix: routes.prefix });
+
+      routes.routes.forEach(route => {
+        const hasPrefix = has('prefix', route.config);
+        createRoute(route, hasPrefix ? router : subRouter);
+      });
+
+      return router.use(subRouter.routes(), subRouter.allowedMethods());
+    }
+  };
+
+  return {
+    addRoutes,
+  };
+};
+
+module.exports = {
+  validateRouteConfig,
+  createRouteManager,
+};

package/lib/services/webhook-runner.js

@@ -79,7 +79,7 @@ class WebhookRunner {
       method: 'post',
       body: JSON.stringify({
         event,
-        created_at: new Date(),
+        createdAt: new Date(),
         ...info,
       }),
       headers: {

package/lib/utils/ee.js

@@ -78,7 +78,7 @@ module.exports = ({ dir, logger = noLog }) => {
 };
 
 Object.defineProperty(module.exports, 'licenseInfo', {
-  get: () => {
+  get() {
     mustHaveKey('licenseInfo');
     return internals.licenseInfo;
   },
@@ -87,7 +87,7 @@ Object.defineProperty(module.exports, 'licenseInfo', {
 });
 
 Object.defineProperty(module.exports, 'isEE', {
-  get: () => {
+  get() {
     mustHaveKey('isEE');
     return internals.isEE;
   },
@@ -96,7 +96,7 @@ Object.defineProperty(module.exports, 'isEE', {
 });
 
 Object.defineProperty(module.exports, 'features', {
-  get: () => {
+  get() {
     mustHaveKey('licenseInfo');
 
     const { type: licenseType } = module.exports.licenseInfo;

package/lib/utils/get-dirs.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const { join } = require('path');
+
+const getDirs = root => ({
+  root,
+  src: join(root, 'src'),
+  api: join(root, 'src', 'api'),
+  components: join(root, 'src', 'components'),
+  extensions: join(root, 'src', 'extensions'),
+  policies: join(root, 'src', 'policies'),
+  middlewares: join(root, 'src', 'middlewares'),
+  config: join(root, 'config'),
+  public: join(root, 'public'),
+});
+
+module.exports = getDirs;

package/lib/utils/index.js

@@ -2,8 +2,10 @@
 
 const openBrowser = require('./open-browser');
 const isInitialized = require('./is-initialized');
+const getDirs = require('./get-dirs');
 
 module.exports = {
   isInitialized,
   openBrowser,
+  getDirs,
 };

package/lib/utils/is-initialized.js

@@ -14,7 +14,7 @@ module.exports = async function isInitialized(strapi) {
     }
 
     // test if there is at least one admin
-    const anyAdministrator = await strapi.query('strapi::user').findOne({ select: ['id'] });
+    const anyAdministrator = await strapi.query('admin::user').findOne({ select: ['id'] });
 
     return !isNil(anyAdministrator);
   } catch (err) {

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/lib/utils/startup-logger.js

@@ -72,7 +72,7 @@ module.exports = app => {
       console.log();
     },
 
-    logStartupMessage(isInitialized) {
+    logStartupMessage({ isInitialized } = {}) {
       // Should the startup message be displayed?
       const hideStartupMessage = process.env.STRAPI_HIDE_STARTUP_MESSAGE
         ? process.env.STRAPI_HIDE_STARTUP_MESSAGE === 'true'
@@ -82,7 +82,7 @@ module.exports = app => {
         if (!isInitialized) {
           this.logFirstStartupMessage();
         } else {
-          this.logStartupMessage();
+          this.logDefaultStartupMessage();
         }
       }
     },

package/lib/utils/update-notifier/index.js

@@ -27,7 +27,7 @@ const geUpdatetMessage = (newVersion, currentVersion) => {
 
   return `
 A new version of Strapi is available ${currentVersionLog} → ${newVersionLog}
-Check out the new the releases at: ${releaseLink}
+Check out the new releases at: ${releaseLink}
 `.trim();
 };
 
@@ -38,7 +38,7 @@ const createUpdateNotifier = strapi => {
     config = new Configstore(
       pkg.name,
       {},
-      { configPath: path.join(strapi.dir, '.strapi-updater.json') }
+      { configPath: path.join(strapi.dirs.root, '.strapi-updater.json') }
     );
   } catch {
     // we don't have write access to the file system
@@ -67,6 +67,7 @@ const createUpdateNotifier = strapi => {
     const now = Date.now();
     const latestVersion = config.get('latest');
     const lastNotification = config.get('lastNotification') || 0;
+
     if (
       !process.stdout.isTTY ||
       lastNotification + notifInterval > now ||

package/package.json

@@ -1,101 +1,7 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.0.0-next.7",
+  "version": "4.0.1",
   "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",
-  "homepage": "https://strapi.io",
-  "directories": {
-    "lib": "./lib",
-    "bin": "./bin"
-  },
-  "main": "./lib",
-  "bin": {
-    "strapi": "./bin/strapi.js"
-  },
-  "dependencies": {
-    "@koa/cors": "^3.0.0",
-    "@strapi/admin": "4.0.0-next.7",
-    "@strapi/database": "4.0.0-next.7",
-    "@strapi/generate": "4.0.0-next.7",
-    "@strapi/generate-api": "4.0.0-next.7",
-    "@strapi/generate-controller": "4.0.0-next.7",
-    "@strapi/generate-model": "4.0.0-next.7",
-    "@strapi/generate-new": "4.0.0-next.7",
-    "@strapi/generate-plugin": "4.0.0-next.7",
-    "@strapi/generate-policy": "4.0.0-next.7",
-    "@strapi/generate-service": "4.0.0-next.7",
-    "@strapi/logger": "4.0.0-next.7",
-    "@strapi/utils": "4.0.0-next.7",
-    "async": "^2.1.2",
-    "boom": "^7.3.0",
-    "boxen": "4.2.0",
-    "chalk": "^4.1.1",
-    "chokidar": "3.5.1",
-    "ci-info": "3.1.1",
-    "cli-table3": "^0.6.0",
-    "commander": "6.1.0",
-    "configstore": "5.0.1",
-    "cross-spawn": "^7.0.3",
-    "debug": "^4.1.1",
-    "delegates": "^1.0.0",
-    "dotenv": "8.2.0",
-    "execa": "^1.0.0",
-    "fs-extra": "^9.1.0",
-    "glob": "^7.1.2",
-    "inquirer": "^6.2.1",
-    "is-docker": "2.2.1",
-    "koa": "^2.13.1",
-    "koa-body": "^4.2.0",
-    "koa-compose": "^4.1.0",
-    "koa-compress": "^5.0.1",
-    "koa-convert": "^2.0.0",
-    "koa-favicon": "^2.0.0",
-    "koa-helmet": "6.1.0",
-    "koa-i18n": "^2.1.0",
-    "koa-ip": "^2.0.0",
-    "koa-locale": "~1.3.0",
-    "koa-router": "^7.4.0",
-    "koa-session": "^6.2.0",
-    "koa-static": "^5.0.0",
-    "lodash": "4.17.21",
-    "node-fetch": "2.6.1",
-    "node-machine-id": "1.1.12",
-    "node-schedule": "1.3.2",
-    "open": "8.2.1",
-    "ora": "^5.4.0",
-    "package-json": "6.5.0",
-    "pluralize": "8.0.0",
-    "qs": "^6.10.1",
-    "resolve-cwd": "^3.0.0",
-    "rimraf": "^3.0.2",
-    "semver": "7.3.5"
-  },
-  "scripts": {
-    "postinstall": "node lib/utils/success.js"
-  },
-  "author": {
-    "email": "hi@strapi.io",
-    "name": "Strapi team",
-    "url": "https://strapi.io"
-  },
-  "maintainers": [
-    {
-      "name": "Strapi team",
-      "email": "hi@strapi.io",
-      "url": "https://strapi.io"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/strapi/strapi.git"
-  },
-  "bugs": {
-    "url": "https://github.com/strapi/strapi/issues"
-  },
-  "engines": {
-    "node": ">=12.x.x <=16.x.x",
-    "npm": ">=6.0.0"
-  },
-  "license": "SEE LICENSE IN LICENSE",
   "keywords": [
     "strapi",
     "cms",
@@ -132,11 +38,102 @@
     "backend",
     "open source",
     "self hosted",
-    "javascript",
     "lerna",
     "lernajs",
     "react",
     "reactjs"
   ],
-  "gitHead": "522d6afd54b68ed3376dd0c807fab6c1315f1931"
+  "homepage": "https://strapi.io",
+  "bugs": {
+    "url": "https://github.com/strapi/strapi/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/strapi/strapi.git"
+  },
+  "license": "SEE LICENSE IN LICENSE",
+  "author": {
+    "name": "Strapi Solutions SAS",
+    "email": "hi@strapi.io",
+    "url": "https://strapi.io"
+  },
+  "maintainers": [
+    {
+      "name": "Strapi Solutions SAS",
+      "email": "hi@strapi.io",
+      "url": "https://strapi.io"
+    }
+  ],
+  "main": "./lib",
+  "types": "./lib/index.d.ts",
+  "bin": {
+    "strapi": "./bin/strapi.js"
+  },
+  "directories": {
+    "lib": "./lib",
+    "bin": "./bin"
+  },
+  "scripts": {
+    "postinstall": "node lib/utils/success.js",
+    "test:unit": "jest --verbose"
+  },
+  "dependencies": {
+    "@koa/cors": "3.1.0",
+    "@koa/router": "10.1.1",
+    "@strapi/admin": "4.0.1",
+    "@strapi/database": "4.0.1",
+    "@strapi/generate-new": "4.0.1",
+    "@strapi/generators": "4.0.1",
+    "@strapi/logger": "4.0.1",
+    "@strapi/plugin-content-manager": "4.0.1",
+    "@strapi/plugin-content-type-builder": "4.0.1",
+    "@strapi/plugin-email": "4.0.1",
+    "@strapi/plugin-upload": "4.0.1",
+    "@strapi/utils": "4.0.1",
+    "bcryptjs": "2.4.3",
+    "boxen": "5.1.2",
+    "chalk": "4.1.2",
+    "chokidar": "3.5.2",
+    "ci-info": "3.2.0",
+    "cli-table3": "0.6.0",
+    "commander": "8.2.0",
+    "configstore": "5.0.1",
+    "debug": "4.3.2",
+    "delegates": "1.0.0",
+    "dotenv": "10.0.0",
+    "execa": "5.1.1",
+    "fs-extra": "10.0.0",
+    "glob": "7.2.0",
+    "http-errors": "1.8.0",
+    "inquirer": "8.2.0",
+    "is-docker": "2.2.1",
+    "koa": "2.13.3",
+    "koa-body": "4.2.0",
+    "koa-compose": "4.1.0",
+    "koa-compress": "5.1.0",
+    "koa-favicon": "2.1.0",
+    "koa-helmet": "6.1.0",
+    "koa-ip": "2.1.0",
+    "koa-session": "6.2.0",
+    "koa-static": "5.0.0",
+    "lodash": "4.17.21",
+    "node-fetch": "2.6.5",
+    "node-machine-id": "1.1.12",
+    "node-schedule": "2.0.0",
+    "open": "8.2.1",
+    "ora": "5.4.1",
+    "package-json": "7.0.0",
+    "qs": "6.10.1",
+    "resolve-cwd": "3.0.0",
+    "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": "e2cd01e8c6cbfeba15ad7787e38b6eebcbb92221"
 }

package/lib/commands/generate.js

@@ -1,76 +0,0 @@
-'use strict';
-
-/**
- * Module dependencies
- */
-
-// FIXME
-/* eslint-disable import/extensions */
-
-// Node.js core.
-const path = require('path');
-
-// Master of ceremonies for generators.
-const generate = require('@strapi/generate');
-
-// Logger.
-const { createLogger } = require('@strapi/logger');
-
-// Configuration
-const loadConfiguration = require('../core/app-configuration');
-
-// Local Strapi dependencies.
-const packageJSON = require('../../package.json');
-
-/**
- * `$ strapi generate`
- *
- * Scaffolding for the application in our working directory.
- */
-
-module.exports = function(id, cliArguments) {
-  const dir = process.cwd();
-  const config = loadConfiguration(dir);
-  const logger = createLogger(config.get('logger', {}));
-
-  // Build initial scope.
-  const scope = {
-    rootPath: process.cwd(),
-    strapiRoot: path.resolve(__dirname, '..'),
-    id: id,
-    args: cliArguments,
-    strapiPackageJSON: packageJSON,
-  };
-
-  scope.generatorType = process.argv[2].split(':')[1];
-
-  // Show usage if no generator type is defined.
-  if (!scope.generatorType) {
-    return logger.error('Write `$ strapi generate:something` instead.');
-  }
-
-  return generate(scope, {
-    // Log and exit the REPL in case there is an error
-    // while we were trying to generate the requested generator.
-    error(msg) {
-      logger.error(msg);
-      process.exit(1);
-    },
-
-    // Log and exit the REPL in case of success
-    // but first make sure we have all the info we need.
-    success() {
-      if (!scope.outputPath && scope.filename && scope.destDir) {
-        scope.outputPath = scope.destDir + scope.filename;
-      }
-
-      if (scope.generatorType !== 'new') {
-        logger.info(
-          `Generated a new ${scope.generatorType} \`${scope.name}\` at \`${scope.filePath}\`.`
-        );
-      }
-
-      process.exit(0);
-    },
-  });
-};