@strapi/strapi 4.3.4 → 4.3.7

package/lib/services/metrics/sender.js

@@ -33,7 +33,7 @@ const addPackageJsonStrapiMetadata = (metadata, strapi) => {
  * @param {Object} strapi strapi app
  * @returns {Function} (event, payload) -> Promise{boolean}
  */
-module.exports = strapi => {
+module.exports = (strapi) => {
   const { uuid } = strapi.config;
   const deviceId = machineID();
   const isEE = strapi.EE === true && ee.isEE === true;
@@ -41,22 +41,22 @@ module.exports = strapi => {
   const serverRootPath = strapi.dirs.app.root;
   const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');
 
-  const anonymous_metadata = {
+  const anonymousMetadata = {
     environment: strapi.config.environment,
     os: os.type(),
     osPlatform: os.platform(),
+    osArch: os.arch(),
     osRelease: os.release(),
-    nodeVersion: process.version,
+    nodeVersion: process.versions.node,
     docker: process.env.DOCKER || isDocker(),
     isCI: ciEnv.isCI,
     version: strapi.config.get('info.strapi'),
-    strapiVersion: strapi.config.get('info.strapi'),
     projectType: isEE ? 'Enterprise' : 'Community',
     useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath),
     useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
   };
 
-  addPackageJsonStrapiMetadata(anonymous_metadata, strapi);
+  addPackageJsonStrapiMetadata(anonymousMetadata, strapi);
 
   return async (event, payload = {}, opts = {}) => {
     const reqParams = {
@@ -67,7 +67,7 @@ module.exports = strapi => {
         deviceId,
         properties: stringifyDeep({
           ...payload,
-          ...anonymous_metadata,
+          ...anonymousMetadata,
         }),
       }),
       ..._.merge({}, defaultQueryOpts, opts),

package/lib/services/metrics/stringify-deep.js

@@ -7,7 +7,7 @@ const { map, mapValues, isObject, isArray, toString } = require('lodash/fp');
  * @param {object} obj
  * @returns {object}
  */
-const stringifyDeep = value => {
+const stringifyDeep = (value) => {
   if (isArray(value)) {
     return map(stringifyDeep, value);
   }

package/lib/services/server/admin-api.js

@@ -2,7 +2,7 @@
 
 const { createAPI } = require('./api');
 
-const createAdminAPI = strapi => {
+const createAdminAPI = (strapi) => {
   const opts = {
     prefix: '', // '/admin';
     type: 'admin',

package/lib/services/server/compose-endpoint.js

@@ -7,10 +7,10 @@ const compose = require('koa-compose');
 const { resolveRouteMiddlewares } = require('./middleware');
 const { resolvePolicies } = require('./policy');
 
-const getMethod = route => trim(toLower(route.method));
-const getPath = route => trim(route.path);
+const getMethod = (route) => trim(toLower(route.method));
+const getPath = (route) => trim(route.path);
 
-const createRouteInfoMiddleware = routeInfo => (ctx, next) => {
+const createRouteInfoMiddleware = (routeInfo) => (ctx, next) => {
   const route = {
     ...routeInfo,
     config: routeInfo.config || {},
@@ -22,7 +22,7 @@ const createRouteInfoMiddleware = routeInfo => (ctx, next) => {
 
 const getAuthConfig = prop('config.auth');
 
-const createAuthorizeMiddleware = strapi => async (ctx, next) => {
+const createAuthorizeMiddleware = (strapi) => async (ctx, next) => {
   const { auth, route } = ctx.state;
 
   const authService = strapi.container.get('auth');
@@ -44,7 +44,7 @@ const createAuthorizeMiddleware = strapi => async (ctx, next) => {
   }
 };
 
-const createAuthenticateMiddleware = strapi => async (ctx, next) => {
+const createAuthenticateMiddleware = (strapi) => async (ctx, next) => {
   return strapi.container.get('auth').authenticate(ctx, next);
 };
 
@@ -56,7 +56,7 @@ const returnBodyMiddleware = async (ctx, next) => {
   }
 };
 
-module.exports = strapi => {
+module.exports = (strapi) => {
   const authenticate = createAuthenticateMiddleware(strapi);
   const authorize = createAuthorizeMiddleware(strapi);
 
@@ -108,7 +108,7 @@ const getController = (name, { pluginName, apiName }, strapi) => {
   return ctrl;
 };
 
-const extractHandlerParts = name => {
+const extractHandlerParts = (name) => {
   const controllerName = name.slice(0, name.lastIndexOf('.'));
   const actionName = name.slice(name.lastIndexOf('.') + 1);
 

package/lib/services/server/content-api.js

@@ -2,7 +2,7 @@
 
 const { createAPI } = require('./api');
 
-const createContentAPI = strapi => {
+const createContentAPI = (strapi) => {
   const opts = {
     prefix: strapi.config.get('api.rest.prefix', '/api'),
     type: 'content-api',

package/lib/services/server/http-server.js

@@ -17,7 +17,7 @@ const createHTTPServer = (strapi, koaApp) => {
 
   const server = http.createServer(listener);
 
-  server.on('connection', connection => {
+  server.on('connection', (connection) => {
     connections.add(connection);
 
     connection.on('close', () => {
@@ -26,7 +26,7 @@ const createHTTPServer = (strapi, koaApp) => {
   });
 
   // handle port in use cleanly
-  server.on('error', err => {
+  server.on('error', (err) => {
     if (err.code === 'EADDRINUSE') {
       return strapi.stopWithError(`The port ${err.port} is already used by another application.`);
     }
@@ -45,15 +45,15 @@ const createHTTPServer = (strapi, koaApp) => {
       return;
     }
 
-    return new Promise((resolve, reject) =>
-      server.close(error => {
+    return new Promise((resolve, reject) => {
+      server.close((error) => {
         if (error) {
-          return reject(error);
+          reject(error);
+        } else {
+          resolve();
         }
-
-        resolve();
-      })
-    );
+      });
+    });
   };
 
   return server;

package/lib/services/server/index.js

@@ -10,7 +10,7 @@ const registerAllRoutes = require('./register-routes');
 const registerApplicationMiddlewares = require('./register-middlewares');
 const createKoaApp = require('./koa');
 
-const healthCheck = async ctx => {
+const healthCheck = async (ctx) => {
   ctx.set('strapi', 'You are so French!');
   ctx.status = 204;
 };
@@ -27,7 +27,7 @@ const healthCheck = async ctx => {
  * @param {Strapi} strapi
  * @returns {Server}
  */
-const createServer = strapi => {
+const createServer = (strapi) => {
   const app = createKoaApp({
     proxy: strapi.config.get('server.proxy'),
     keys: strapi.config.get('server.app.keys'),
@@ -83,7 +83,7 @@ const createServer = strapi => {
     mount() {
       state.mounted = true;
 
-      Object.values(apis).forEach(api => api.mount(router));
+      Object.values(apis).forEach((api) => api.mount(router));
       app.use(router.routes()).use(router.allowedMethods());
 
       return this;
@@ -104,7 +104,7 @@ const createServer = strapi => {
     listRoutes() {
       const allRoutes = [...router.stack];
 
-      Object.values(apis).forEach(api => {
+      Object.values(apis).forEach((api) => {
         allRoutes.push(...api.listRoutes());
       });
 

package/lib/services/server/koa.js

@@ -4,19 +4,19 @@ const { isNil, camelCase } = require('lodash/fp');
 const Koa = require('koa');
 const createError = require('http-errors');
 const delegate = require('delegates');
-var statuses = require('statuses');
+const statuses = require('statuses');
 const { formatHttpError } = require('../errors');
 
-const addCustomMethods = app => {
+const addCustomMethods = (app) => {
   const delegator = delegate(app.context, 'response');
 
   /* errors */
   statuses.codes
-    .filter(code => code >= 400 && code < 600)
-    .forEach(code => {
+    .filter((code) => code >= 400 && code < 600)
+    .forEach((code) => {
       const name = statuses(code);
       const camelCasedName = camelCase(name);
-      app.response[camelCasedName] = function(message, details = {}) {
+      app.response[camelCasedName] = function responseCode(message, details = {}) {
         const httpError = createError(code, message, { details });
         const { status, body } = formatHttpError(httpError);
         this.status = status;
@@ -26,17 +26,17 @@ const addCustomMethods = app => {
     });
 
   /* send, created, deleted */
-  app.response.send = function(data, status = 200) {
+  app.response.send = function send(data, status = 200) {
     this.status = status;
     this.body = data;
   };
 
-  app.response.created = function(data) {
+  app.response.created = function created(data) {
     this.status = 201;
     this.body = data;
   };
 
-  app.response.deleted = function(data) {
+  app.response.deleted = function deleted(data) {
     if (isNil(data)) {
       this.status = 204;
     } else {
@@ -45,10 +45,7 @@ const addCustomMethods = app => {
     }
   };
 
-  delegator
-    .method('send')
-    .method('created')
-    .method('deleted');
+  delegator.method('send').method('created').method('deleted');
 
   return app;
 };

package/lib/services/server/middleware.js

@@ -90,7 +90,7 @@ const resolveMiddlewares = (config, strapi) => {
     );
   }
 
-  middlewares.forEach(middleware => {
+  middlewares.forEach((middleware) => {
     // NOTE: we replace null middlewares by a dumb one to avoid having to filter later on
     if (isNil(middleware.handler)) {
       middleware.handler = (_, next) => next();

package/lib/services/server/policy.js

@@ -6,7 +6,7 @@ const { policy: policyUtils } = require('@strapi/utils');
 
 const getPoliciesConfig = propOr([], 'config.policies');
 
-const resolvePolicies = route => {
+const resolvePolicies = (route) => {
   const policiesConfig = getPoliciesConfig(route);
   const resolvedPolicies = policyUtils.resolve(policiesConfig, route.info);
 

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

@@ -34,7 +34,7 @@ const requiredMiddlewares = [
 ];
 
 const middlewareConfigSchema = yup.array().of(
-  yup.lazy(value => {
+  yup.lazy((value) => {
     if (typeof value === 'string') {
       return yup.string().required();
     }
@@ -58,7 +58,7 @@ const middlewareConfigSchema = yup.array().of(
  * Register middlewares in router
  * @param {Strapi} strapi
  */
-const registerApplicationMiddlewares = async strapi => {
+const registerApplicationMiddlewares = async (strapi) => {
   const middlewareConfig = strapi.config.get('middlewares', defaultConfig);
 
   await validateMiddlewareConfig(middlewareConfig);
@@ -78,7 +78,7 @@ const registerApplicationMiddlewares = async strapi => {
  *
  * @param {MiddlewaresConfig} config
  */
-const validateMiddlewareConfig = async config => {
+const validateMiddlewareConfig = async (config) => {
   try {
     await middlewareConfigSchema.validate(config, { strict: true, abortEarly: false });
   } catch (error) {
@@ -92,9 +92,9 @@ const validateMiddlewareConfig = async config => {
  * Check if some required middlewares are missing in configure middlewares
  * @param {Middlewares} middlewares
  */
-const checkRequiredMiddlewares = middlewares => {
-  const missingMiddlewares = requiredMiddlewares.filter(name => {
-    return middlewares.findIndex(mdl => mdl.name === name) === -1;
+const checkRequiredMiddlewares = (middlewares) => {
+  const missingMiddlewares = requiredMiddlewares.filter((name) => {
+    return middlewares.findIndex((mdl) => mdl.name === name) === -1;
   });
 
   if (missingMiddlewares.length > 0) {
@@ -104,8 +104,6 @@ const checkRequiredMiddlewares = middlewares => {
       )}".`
     );
   }
-
-  return;
 };
 
 module.exports = registerApplicationMiddlewares;

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

@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 
-const createRouteScopeGenerator = namespace => route => {
+const createRouteScopeGenerator = (namespace) => (route) => {
   const prefix = namespace.endsWith('::') ? namespace : `${namespace}.`;
 
   if (typeof route.handler === 'string') {
@@ -20,7 +20,7 @@ const createRouteScopeGenerator = namespace => route => {
  * Register all routes
  * @param {import('../../').Strapi} strapi
  */
-module.exports = strapi => {
+module.exports = (strapi) => {
   registerAdminRoutes(strapi);
   registerAPIRoutes(strapi);
   registerPluginRoutes(strapi);
@@ -30,10 +30,10 @@ module.exports = strapi => {
  * Register admin routes
  * @param {import('../../').Strapi} strapi
  */
-const registerAdminRoutes = strapi => {
+const registerAdminRoutes = (strapi) => {
   const generateRouteScope = createRouteScopeGenerator(`admin::`);
 
-  strapi.admin.routes.forEach(route => {
+  strapi.admin.routes.forEach((route) => {
     generateRouteScope(route);
     route.info = { pluginName: 'admin' };
   });
@@ -49,14 +49,14 @@ const registerAdminRoutes = strapi => {
  * Register plugin routes
  * @param {import('../../').Strapi} strapi
  */
-const registerPluginRoutes = 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 => {
+      plugin.routes.forEach((route) => {
         generateRouteScope(route);
         route.info = { pluginName };
       });
@@ -67,10 +67,10 @@ const registerPluginRoutes = strapi => {
         routes: plugin.routes,
       });
     } else {
-      _.forEach(plugin.routes, router => {
+      _.forEach(plugin.routes, (router) => {
         router.type = router.type || 'admin';
         router.prefix = `/${pluginName}`;
-        router.routes.forEach(route => {
+        router.routes.forEach((route) => {
           generateRouteScope(route);
           route.info = { pluginName };
         });
@@ -85,17 +85,17 @@ const registerPluginRoutes = strapi => {
  * Register api routes
  * @param {import('../../').Strapi} strapi
  */
-const registerAPIRoutes = strapi => {
+const registerAPIRoutes = (strapi) => {
   for (const apiName in strapi.api) {
     const api = strapi.api[apiName];
 
     const generateRouteScope = createRouteScopeGenerator(`api::${apiName}`);
 
-    _.forEach(api.routes, router => {
+    _.forEach(api.routes, (router) => {
       // TODO: remove once auth setup
       // pass meta down to compose endpoint
       router.type = 'content-api';
-      router.routes.forEach(route => {
+      router.routes.forEach((route) => {
         generateRouteScope(route);
         route.info = { apiName };
       });

package/lib/services/server/routing.js

@@ -7,7 +7,7 @@ const { yup } = require('@strapi/utils');
 
 const createEndpointComposer = require('./compose-endpoint');
 
-const policyOrMiddlewareSchema = yup.lazy(value => {
+const policyOrMiddlewareSchema = yup.lazy((value) => {
   if (typeof value === 'string') {
     return yup.string().required();
   }
@@ -23,12 +23,9 @@ const policyOrMiddlewareSchema = yup.lazy(value => {
 });
 
 const routeSchema = yup.object({
-  method: yup
-    .string()
-    .oneOf(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'ALL'])
-    .required(),
+  method: yup.string().oneOf(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'ALL']).required(),
   path: yup.string().required(),
-  handler: yup.lazy(value => {
+  handler: yup.lazy((value) => {
     if (typeof value === 'string') {
       return yup.string().required();
     }
@@ -37,38 +34,26 @@ const routeSchema = yup.object({
       return yup.array().required();
     }
 
-    return yup
-      .mixed()
-      .isFunction()
-      .required();
+    return yup.mixed().isFunction().required();
   }),
   config: yup
     .object({
-      auth: yup.lazy(value => {
+      auth: yup.lazy((value) => {
         if (value === false) {
           return yup.boolean().required();
         }
 
         return yup.object({
-          scope: yup
-            .array()
-            .of(yup.string())
-            .required(),
+          scope: yup.array().of(yup.string()).required(),
         });
       }),
-      policies: yup
-        .array()
-        .of(policyOrMiddlewareSchema)
-        .notRequired(),
-      middlewares: yup
-        .array()
-        .of(policyOrMiddlewareSchema)
-        .notRequired(),
+      policies: yup.array().of(policyOrMiddlewareSchema).notRequired(),
+      middlewares: yup.array().of(policyOrMiddlewareSchema).notRequired(),
     })
     .notRequired(),
 });
 
-const validateRouteConfig = routeConfig => {
+const validateRouteConfig = (routeConfig) => {
   try {
     return routeSchema.validateSync(routeConfig, {
       strict: true,
@@ -96,11 +81,11 @@ const createRouteManager = (strapi, opts = {}) => {
 
   const addRoutes = (routes, router) => {
     if (Array.isArray(routes)) {
-      routes.forEach(route => createRoute(route, router));
+      routes.forEach((route) => createRoute(route, router));
     } else if (routes.routes) {
       const subRouter = new Router({ prefix: routes.prefix });
 
-      routes.routes.forEach(route => {
+      routes.routes.forEach((route) => {
         const hasPrefix = has('prefix', route.config);
         createRoute(route, hasPrefix ? router : subRouter);
       });

package/lib/services/utils/upload-files.js

@@ -18,12 +18,12 @@ module.exports = async (uid, entity, files) => {
 
   const uploadService = strapi.plugin('upload').service('upload');
 
-  const findModelFromUploadPath = path => {
+  const findModelFromUploadPath = (path) => {
     if (path.length === 0) {
       return uid;
     }
 
-    let currentPath = [];
+    const currentPath = [];
     let tmpModel = modelDef;
     let modelUID = uid;
 
@@ -75,5 +75,5 @@ module.exports = async (uid, entity, files) => {
     }
   };
 
-  await Promise.all(Object.keys(files).map(key => doUpload(key, files[key])));
+  await Promise.all(Object.keys(files).map((key) => doUpload(key, files[key])));
 };

package/lib/services/webhook-runner.js

@@ -1,6 +1,7 @@
 /**
  * The event hub is Strapi's event control center.
  */
+
 'use strict';
 
 const debug = require('debug')('strapi:webhook');
@@ -51,7 +52,7 @@ class WebhookRunner {
       );
     }
 
-    const listen = info => {
+    const listen = (info) => {
       this.queue.enqueue({ event, info });
     };
 
@@ -62,10 +63,10 @@ class WebhookRunner {
   async executeListener({ event, info }) {
     debug(`Executing webhook for event '${event}'`);
     const webhooks = this.webhooksMap.get(event) || [];
-    const activeWebhooks = webhooks.filter(webhook => webhook.isEnabled === true);
+    const activeWebhooks = webhooks.filter((webhook) => webhook.isEnabled === true);
 
     for (const webhook of activeWebhooks) {
-      await this.run(webhook, event, info).catch(error => {
+      await this.run(webhook, event, info).catch((error) => {
         this.logger.error('Error running webhook');
         this.logger.error(error);
       });
@@ -90,7 +91,7 @@ class WebhookRunner {
       },
       timeout: 10000,
     })
-      .then(async res => {
+      .then(async (res) => {
         if (res.ok) {
           return {
             statusCode: res.status,
@@ -102,7 +103,7 @@ class WebhookRunner {
           message: await res.text(),
         };
       })
-      .catch(err => {
+      .catch((err) => {
         return {
           statusCode: 500,
           message: err.message,
@@ -114,7 +115,7 @@ class WebhookRunner {
     debug(`Registering webhook '${webhook.id}'`);
     const { events } = webhook;
 
-    events.forEach(event => {
+    events.forEach((event) => {
       if (this.webhooksMap.has(event)) {
         this.webhooksMap.get(event).push(webhook);
       } else {
@@ -134,7 +135,7 @@ class WebhookRunner {
     debug(`Unregistering webhook '${webhook.id}'`);
 
     this.webhooksMap.forEach((webhooks, event) => {
-      const filteredWebhooks = webhooks.filter(value => value.id !== webhook.id);
+      const filteredWebhooks = webhooks.filter((value) => value.id !== webhook.id);
 
       // Cleanup hanging listeners
       if (filteredWebhooks.length === 0) {

package/lib/services/webhook-store.js

@@ -1,6 +1,7 @@
 /**
  * Webhook store is the implementation of webhook storage over the core_store
  */
+
 'use strict';
 
 const webhookModel = {
@@ -25,7 +26,7 @@ const webhookModel = {
   },
 };
 
-const toDBObject = data => {
+const toDBObject = (data) => {
   return {
     name: data.name,
     url: data.url,
@@ -35,7 +36,7 @@ const toDBObject = data => {
   };
 };
 
-const fromDBObject = row => {
+const fromDBObject = (row) => {
   return {
     id: row.id,
     name: row.name,

package/lib/services/worker-queue.js

@@ -1,6 +1,7 @@
 /**
  * Simple worker queue in memory
  */
+
 'use strict';
 
 const debug = require('debug')('strapi:worker-queue');

package/lib/types/core/strapi/index.d.ts

@@ -2,7 +2,8 @@ import type Koa from 'koa';
 import { Database } from '@strapi/database';
 
 import type { StringMap } from './utils';
-import type { GenericController } from '../core-api/controller'
+import type { GenericController } from '../../../core-api/controller'
+import type { GenericService } from '../../../core-api/service'
 
 /**
  * The Strapi interface implemented by the main Strapi class.
@@ -33,12 +34,12 @@ export interface Strapi {
    *
    * It returns all the registered services
    */
-  readonly services: StringMap<Service>;
+  readonly services: StringMap<GenericService>;
 
   /**
    * Find a service using its unique identifier
    */
-  service<T extends Service = unknown>(uid: string): T | undefined;
+  service<T extends GenericService = GenericService>(uid: string): T | undefined;
 
   /**
    * Getter for the Strapi controllers container

package/lib/types/factories.d.ts

@@ -1,4 +1,4 @@
-import { Service } from '../core-api/service';
+import { Service,GenericService } from '../core-api/service';
 import { Controller, GenericController } from '../core-api/controller';
 import { Middleware } from '../middlewares';
 import { Policy } from '../core/registries/policies';
@@ -47,14 +47,14 @@ interface Router {
 type ControllerCallback<T extends GenericController = GenericController> = (params: {
   strapi: Strapi;
 }) => T;
-type ServiceCallback<T extends Service = Service> = (params: { strapi: Strapi }) => T;
+type ServiceCallback<T extends GenericService = GenericService> = (params: { strapi: Strapi }) => T;
 
 export function createCoreRouter(uid: string, cfg?: RouterConfig = {}): () => Router;
 export function createCoreController<T extends GenericController = GenericController>(
   uid: string,
   cfg?: ControllerCallback<T> | T = {}
 ): () => T & Controller;
-export function createCoreService<T extends Service = Service>(
+export function createCoreService<T extends GenericService = GenericService>(
   uid: string,
   cfg?: ServiceCallback<T> | T = {}
 ): () => T;