@strapi/strapi 4.14.0-beta.0 → 4.14.1

package/lib/services/entity-validator/validators.js

@@ -1,216 +0,0 @@
-'use strict';
-
-const _ = require('lodash');
-
-const { yup } = require('@strapi/utils');
-
-/**
- * @type {import('yup').StringSchema} StringSchema
- * @type {import('yup').NumberSchema} NumberSchema
- * @type {import('yup').AnySchema} AnySchema
- */
-
-/**
- * Utility function to compose validators
- */
-const composeValidators =
-  (...fns) =>
-  (...args) => {
-    let nextArgs = args;
-    let validator = yup.mixed();
-
-    // if we receive a schema then use it as base schema for nested composition
-    if (yup.isSchema(args[0])) {
-      validator = args[0];
-      nextArgs = args.slice(1);
-    }
-
-    return fns.reduce((validator, fn) => fn(validator, ...nextArgs), validator);
-  };
-
-/* Validator utils */
-
-/**
- * Adds minLength validator
- * @param {StringSchema} validator yup validator
- * @param {Object} metas
- * @param {{ minLength: Number }} metas.attr model attribute
- * @param {Object} options
- * @param {boolean} options.isDraft
- *
- * @returns {StringSchema}
- */
-const addMinLengthValidator = (validator, { attr }, { isDraft }) =>
-  _.isInteger(attr.minLength) && !isDraft ? validator.min(attr.minLength) : validator;
-
-/**
- * Adds maxLength validator
- * @param {StringSchema} validator yup validator
- * @param {Object} metas
- * @param {{ maxLength: Number }} metas.attr model attribute
- *
- * @returns {StringSchema}
- */
-const addMaxLengthValidator = (validator, { attr }) =>
-  _.isInteger(attr.maxLength) ? validator.max(attr.maxLength) : validator;
-
-/**
- * Adds min integer validator
- * @param {NumberSchema} validator yup validator
- * @param {Object} metas
- * @param {{ min: Number }} metas.attr model attribute
- *
- * @returns {NumberSchema}
- */
-const addMinIntegerValidator = (validator, { attr }) =>
-  _.isNumber(attr.min) ? validator.min(_.toInteger(attr.min)) : validator;
-
-/**
- * Adds max integer validator
- * @param {NumberSchema} validator yup validator
- * @param {Object} metas
- * @param {{ max: Number }} metas.attr model attribute
- *
- * @returns {NumberSchema}
- */
-const addMaxIntegerValidator = (validator, { attr }) =>
-  _.isNumber(attr.max) ? validator.max(_.toInteger(attr.max)) : validator;
-
-/**
- * Adds min float/decimal validator
- * @param {NumberSchema} validator yup validator
- * @param {Object} metas
- * @param {{ min: Number }} metas.attr model attribute
- *
- * @returns {NumberSchema}
- */
-const addMinFloatValidator = (validator, { attr }) =>
-  _.isNumber(attr.min) ? validator.min(attr.min) : validator;
-
-/**
- * Adds max float/decimal validator
- * @param {NumberSchema} validator yup validator
- * @param {Object} metas model attribute
- * @param {{ max: Number }} metas.attr
- *
- * @returns {NumberSchema}
- */
-const addMaxFloatValidator = (validator, { attr }) =>
-  _.isNumber(attr.max) ? validator.max(attr.max) : validator;
-
-/**
- * Adds regex validator
- * @param {StringSchema} validator yup validator
- * @param {Object} metas model attribute
- * @param {{ regex: RegExp }} metas.attr
- *
- * @returns {StringSchema}
- */
-const addStringRegexValidator = (validator, { attr }) =>
-  _.isUndefined(attr.regex)
-    ? validator
-    : validator.matches(new RegExp(attr.regex), { excludeEmptyString: !attr.required });
-
-/**
- *
- * @param {AnySchema} validator
- * @param {Object} metas
- * @param {{ unique: Boolean, type: String }} metas.attr
- * @param {{ uid: String }} metas.model
- * @param {{ name: String, value: any }} metas.updatedAttribute
- * @param {Object} metas.entity
- *
- * @returns {AnySchema}
- */
-const addUniqueValidator = (validator, { attr, model, updatedAttribute, entity }) => {
-  if (!attr.unique && attr.type !== 'uid') {
-    return validator;
-  }
-
-  return validator.test('unique', 'This attribute must be unique', async (value) => {
-    /**
-     * If the attribute value is `null` we want to skip the unique validation.
-     * Otherwise it'll only accept a single `null` entry in the database.
-     */
-    if (_.isNil(updatedAttribute.value)) {
-      return true;
-    }
-
-    /**
-     * If the attribute is unchanged we skip the unique verification. This will
-     * prevent the validator to be triggered in case the user activated the
-     * unique constraint after already creating multiple entries with
-     * the same attribute value for that field.
-     */
-    if (entity && updatedAttribute.value === entity[updatedAttribute.name]) {
-      return true;
-    }
-
-    const whereParams = entity
-      ? { $and: [{ [updatedAttribute.name]: value }, { $not: { id: entity.id } }] }
-      : { [updatedAttribute.name]: value };
-
-    const record = await strapi.db.query(model.uid).findOne({
-      select: ['id'],
-      where: whereParams,
-    });
-
-    return !record;
-  });
-};
-
-/* Type validators */
-
-const stringValidator = composeValidators(
-  () => yup.string().transform((val, originalVal) => originalVal),
-  addMinLengthValidator,
-  addMaxLengthValidator,
-  addStringRegexValidator,
-  addUniqueValidator
-);
-
-const emailValidator = composeValidators(stringValidator, (validator) =>
-  validator.email().min(1, '${path} cannot be empty')
-);
-
-const uidValidator = composeValidators(stringValidator, (validator) =>
-  validator.matches(/^[A-Za-z0-9-_.~]*$/)
-);
-
-const enumerationValidator = ({ attr }) => {
-  return yup.string().oneOf((Array.isArray(attr.enum) ? attr.enum : [attr.enum]).concat(null));
-};
-
-const integerValidator = composeValidators(
-  () => yup.number().integer(),
-  addMinIntegerValidator,
-  addMaxIntegerValidator,
-  addUniqueValidator
-);
-
-const floatValidator = composeValidators(
-  () => yup.number(),
-  addMinFloatValidator,
-  addMaxFloatValidator,
-  addUniqueValidator
-);
-
-module.exports = {
-  string: stringValidator,
-  text: stringValidator,
-  richtext: stringValidator,
-  password: stringValidator,
-  email: emailValidator,
-  enumeration: enumerationValidator,
-  boolean: () => yup.boolean(),
-  uid: uidValidator,
-  json: () => yup.mixed(),
-  integer: integerValidator,
-  biginteger: composeValidators(addUniqueValidator),
-  float: floatValidator,
-  decimal: floatValidator,
-  date: composeValidators(addUniqueValidator),
-  time: composeValidators(addUniqueValidator),
-  datetime: composeValidators(addUniqueValidator),
-  timestamp: composeValidators(addUniqueValidator),
-};

package/lib/services/errors.js

@@ -1,87 +0,0 @@
-'use strict';
-
-const createError = require('http-errors');
-const {
-  NotFoundError,
-  UnauthorizedError,
-  ForbiddenError,
-  PayloadTooLargeError,
-  RateLimitError,
-  NotImplementedError,
-} = require('@strapi/utils').errors;
-
-const mapErrorsAndStatus = [
-  {
-    classError: UnauthorizedError,
-    status: 401,
-  },
-  {
-    classError: ForbiddenError,
-    status: 403,
-  },
-  {
-    classError: NotFoundError,
-    status: 404,
-  },
-  {
-    classError: PayloadTooLargeError,
-    status: 413,
-  },
-  {
-    classError: RateLimitError,
-    status: 429,
-  },
-  {
-    classError: NotImplementedError,
-    status: 501,
-  },
-];
-
-const formatApplicationError = (error) => {
-  const errorAndStatus = mapErrorsAndStatus.find((pair) => error instanceof pair.classError);
-  const status = errorAndStatus ? errorAndStatus.status : 400;
-
-  return {
-    status,
-    body: {
-      data: null,
-      error: {
-        status,
-        name: error.name,
-        message: error.message,
-        details: error.details,
-      },
-    },
-  };
-};
-
-const formatHttpError = (error) => {
-  return {
-    status: error.status,
-    body: {
-      data: null,
-      error: {
-        status: error.status,
-        name: error.name,
-        message: error.message,
-        details: error.details,
-      },
-    },
-  };
-};
-
-const formatInternalError = (error) => {
-  const httpError = createError(error);
-
-  if (httpError.expose) {
-    return formatHttpError(httpError);
-  }
-
-  return formatHttpError(createError(httpError.status || 500));
-};
-
-module.exports = {
-  formatApplicationError,
-  formatHttpError,
-  formatInternalError,
-};

package/lib/services/event-hub.js

@@ -1,83 +0,0 @@
-'use strict';
-
-/**
- * The event hub is Strapi's event control center.
- */
-module.exports = function createEventHub() {
-  const listeners = new Map();
-
-  // Default subscriber to easily add listeners with the on() method
-  const defaultSubscriber = async (eventName, ...args) => {
-    if (listeners.has(eventName)) {
-      for (const listener of listeners.get(eventName)) {
-        await listener(...args);
-      }
-    }
-  };
-
-  // Store of subscribers that will be called when an event is emitted
-  const subscribers = [defaultSubscriber];
-
-  const eventHub = {
-    async emit(eventName, ...args) {
-      for (const subscriber of subscribers) {
-        await subscriber(eventName, ...args);
-      }
-    },
-
-    subscribe(subscriber) {
-      subscribers.push(subscriber);
-
-      // Return a function to remove the subscriber
-      return () => {
-        eventHub.unsubscribe(subscriber);
-      };
-    },
-
-    unsubscribe(subscriber) {
-      const subscriberIndex = subscribers.indexOf(subscriber);
-
-      // Only remove the subscriber if it exists
-      if (subscriberIndex >= 0) {
-        subscribers.splice(subscriberIndex, 1);
-      }
-    },
-
-    on(eventName, listener) {
-      if (!listeners.has(eventName)) {
-        listeners.set(eventName, [listener]);
-      } else {
-        listeners.get(eventName).push(listener);
-      }
-
-      // Return a function to remove the listener
-      return () => {
-        eventHub.off(eventName, listener);
-      };
-    },
-
-    off(eventName, listener) {
-      listeners.get(eventName).splice(listeners.get(eventName).indexOf(listener), 1);
-    },
-
-    once(eventName, listener) {
-      return eventHub.on(eventName, async (...args) => {
-        eventHub.off(eventName, listener);
-        return listener(...args);
-      });
-    },
-
-    destroy() {
-      listeners.clear();
-      subscribers.length = 0;
-      return this;
-    },
-  };
-
-  return {
-    ...eventHub,
-    removeListener: eventHub.off,
-    removeAllListeners: eventHub.destroy,
-    addListener: eventHub.on,
-  };
-};

package/lib/services/fs.js

@@ -1,58 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fse = require('fs-extra');
-
-/**
- * create strapi fs layer
- */
-module.exports = (strapi) => {
-  function normalizePath(optPath) {
-    const filePath = Array.isArray(optPath) ? optPath.join('/') : optPath;
-
-    const normalizedPath = path.normalize(filePath).replace(/^\/?(\.\/|\.\.\/)+/, '');
-
-    return path.resolve(strapi.dirs.app.root, normalizedPath);
-  }
-
-  const strapiFS = {
-    /**
-     * Writes a file in a strapi app
-     * @param {Array|string} optPath - file path
-     * @param {string} data - content
-     */
-    writeAppFile(optPath, data) {
-      const writePath = normalizePath(optPath);
-      return fse.ensureFile(writePath).then(() => fse.writeFile(writePath, data));
-    },
-
-    /**
-     * Writes a file in a plugin extensions folder
-     * @param {string} plugin - plugin name
-     * @param {Array|string} optPath - path to file
-     * @param {string} data - content
-     */
-    writePluginFile(plugin, optPath, data) {
-      const newPath = ['extensions', plugin].concat(optPath).join('/');
-      return strapiFS.writeAppFile(newPath, data);
-    },
-
-    /**
-     * Removes a file in strapi app
-     */
-    removeAppFile(optPath) {
-      const removePath = normalizePath(optPath);
-      return fse.remove(removePath);
-    },
-
-    /**
-     * Appends a file in strapi app
-     */
-    appendFile(optPath, data) {
-      const writePath = normalizePath(optPath);
-      return fse.appendFileSync(writePath, data);
-    },
-  };
-
-  return strapiFS;
-};

package/lib/services/metrics/admin-user-hash.js

@@ -1,21 +0,0 @@
-'use strict';
-
-const crypto = require('crypto');
-
-/**
- * Generate an admin user hash
- *
- * @param {Strapi.Strapi} strapi
- * @returns {string}
- */
-const generateAdminUserHash = (strapi) => {
-  const ctx = strapi?.requestContext?.get();
-  if (!ctx?.state?.user?.email) {
-    return '';
-  }
-  return crypto.createHash('sha256').update(ctx.state.user.email).digest('hex');
-};
-
-module.exports = {
-  generateAdminUserHash,
-};

package/lib/services/metrics/index.js

@@ -1,61 +0,0 @@
-'use strict';
-
-/**
- * Strapi telemetry package.
- * You can learn more at https://docs.strapi.io/developer-docs/latest/getting-started/usage-information.html
- */
-
-const { scheduleJob } = require('node-schedule');
-
-const wrapWithRateLimit = require('./rate-limiter');
-const createSender = require('./sender');
-const createMiddleware = require('./middleware');
-const isTruthy = require('./is-truthy');
-
-const LIMITED_EVENTS = [
-  'didSaveMediaWithAlternativeText',
-  'didSaveMediaWithCaption',
-  'didDisableResponsiveDimensions',
-  'didEnableResponsiveDimensions',
-  'didInitializePluginUpload',
-];
-
-const createTelemetryInstance = (strapi) => {
-  const uuid = strapi.config.get('uuid');
-  const telemetryDisabled = strapi.config.get('packageJsonStrapi.telemetryDisabled');
-  const isDisabled =
-    !uuid || isTruthy(process.env.STRAPI_TELEMETRY_DISABLED) || isTruthy(telemetryDisabled);
-
-  const crons = [];
-  const sender = createSender(strapi);
-  const sendEvent = wrapWithRateLimit(sender, { limitedEvents: LIMITED_EVENTS });
-
-  return {
-    get isDisabled() {
-      return isDisabled;
-    },
-
-    register() {
-      if (!isDisabled) {
-        const pingCron = scheduleJob('0 0 12 * * *', () => sendEvent('ping'));
-        crons.push(pingCron);
-
-        strapi.server.use(createMiddleware({ sendEvent }));
-      }
-    },
-
-    bootstrap() {},
-
-    destroy() {
-      // Clear open handles
-      crons.forEach((cron) => cron.cancel());
-    },
-
-    async send(event, payload) {
-      if (isDisabled) return true;
-      return sendEvent(event, payload);
-    },
-  };
-};
-
-module.exports = createTelemetryInstance;

package/lib/services/metrics/is-truthy.js

@@ -1,9 +0,0 @@
-'use strict';
-
-const _ = require('lodash');
-
-const isTruthy = (val) => {
-  return [1, true].includes(val) || ['true', '1'].includes(_.toLower(val));
-};
-
-module.exports = isTruthy;

package/lib/services/metrics/middleware.js

@@ -1,33 +0,0 @@
-'use strict';
-
-const createMiddleware = ({ sendEvent }) => {
-  const _state = {
-    currentDay: null,
-    counter: 0,
-  };
-
-  return async (ctx, next) => {
-    const { url, method } = ctx.request;
-
-    if (!url.includes('.') && ['GET', 'PUT', 'POST', 'DELETE'].includes(method)) {
-      const dayOfMonth = new Date().getDate();
-
-      if (dayOfMonth !== _state.currentDay) {
-        _state.currentDay = dayOfMonth;
-        _state.counter = 0;
-      }
-
-      // Send max. 1000 events per day.
-      if (_state.counter < 1000) {
-        sendEvent('didReceiveRequest', { eventProperties: { url: ctx.request.url } });
-
-        // Increase counter.
-        _state.counter += 1;
-      }
-    }
-
-    await next();
-  };
-};
-
-module.exports = createMiddleware;

package/lib/services/metrics/rate-limiter.js

@@ -1,27 +0,0 @@
-'use strict';
-
-/**
- * @param events a list of events that need to be limited
- */
-module.exports = (sender, { limitedEvents = [] } = {}) => {
-  let currentDay = new Date().getDate();
-  const eventCache = new Map();
-
-  return async (event, ...args) => {
-    if (!limitedEvents.includes(event)) {
-      return sender(event, ...args);
-    }
-
-    if (new Date().getDate() !== currentDay) {
-      eventCache.clear();
-      currentDay = new Date().getDate();
-    }
-
-    if (eventCache.has(event)) {
-      return false;
-    }
-
-    eventCache.set(event, true);
-    return sender(event, ...args);
-  };
-};

package/lib/services/metrics/sender.js

@@ -1,90 +0,0 @@
-'use strict';
-
-const os = require('os');
-const path = require('path');
-const _ = require('lodash');
-const isDocker = require('is-docker');
-const ciEnv = require('ci-info');
-const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
-const { env } = require('@strapi/utils');
-const machineID = require('../../utils/machine-id');
-const { generateAdminUserHash } = require('./admin-user-hash');
-
-const defaultQueryOpts = {
-  timeout: 1000,
-  headers: { 'Content-Type': 'application/json' },
-};
-
-const ANALYTICS_URI = 'https://analytics.strapi.io';
-
-/**
- * Add properties from the package.json strapi key in the metadata
- * @param {object} metadata
- */
-const addPackageJsonStrapiMetadata = (metadata, strapi) => {
-  const { packageJsonStrapi = {} } = strapi.config;
-
-  _.defaults(metadata, packageJsonStrapi);
-};
-
-/**
- * Create a send function for event with all the necessary metadatas
- * @param {Object} strapi strapi app
- * @returns {Function} (event, payload) -> Promise{boolean}
- */
-module.exports = (strapi) => {
-  const { uuid } = strapi.config;
-  const deviceId = machineID();
-
-  const serverRootPath = strapi.dirs.app.root;
-  const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');
-
-  const anonymousUserProperties = {
-    environment: strapi.config.environment,
-    os: os.type(),
-    osPlatform: os.platform(),
-    osArch: os.arch(),
-    osRelease: os.release(),
-    nodeVersion: process.versions.node,
-  };
-
-  const anonymousGroupProperties = {
-    docker: process.env.DOCKER || isDocker(),
-    isCI: ciEnv.isCI,
-    version: strapi.config.get('info.strapi'),
-    useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath),
-    useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
-    projectId: uuid,
-    isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',
-  };
-
-  addPackageJsonStrapiMetadata(anonymousGroupProperties, strapi);
-
-  return async (event, payload = {}, opts = {}) => {
-    const userId = generateAdminUserHash(strapi);
-
-    const reqParams = {
-      method: 'POST',
-      body: JSON.stringify({
-        event,
-        userId,
-        deviceId,
-        eventProperties: payload.eventProperties,
-        userProperties: userId ? { ...anonymousUserProperties, ...payload.userProperties } : {},
-        groupProperties: {
-          ...anonymousGroupProperties,
-          projectType: strapi.EE ? 'Enterprise' : 'Community',
-          ...payload.groupProperties,
-        },
-      }),
-      ..._.merge({ headers: { 'X-Strapi-Event': event } }, defaultQueryOpts, opts),
-    };
-
-    try {
-      const res = await strapi.fetch(`${ANALYTICS_URI}/api/v2/track`, reqParams);
-      return res.ok;
-    } catch (err) {
-      return false;
-    }
-  };
-};