@strapi/strapi 4.11.0-alpha.0 → 4.11.0-beta.1

package/ee/LICENSE.txt

@@ -1,21 +1 @@
-This Strapi Enterprise Edition (EE) supplemental license (this “EE Supplemental License”) governs the use of this software and documentation (collectively, the “EE Software”) by you and any entity you represent (collectively, “You”). If You have separately entered into the Strapi, Inc. Enterprise Agreement (the “Enterprise Agreement”), then this EE Supplemental License hereby incorporates by reference the Enterprise Agreement and modifies the Enterprise Agreement solely to the extent set forth herein. If You have separately entered into the Strapi, Inc. Subscription Agreement (the “Subscription Agreement”), then this EE Supplemental License hereby incorporates by reference the Agreement and modifies the Subscription Agreement solely to the extent set forth herein. If You have not entered into either the Enterprise Agreement or the Subscription Agreement, then You may use the EE Software solely as set forth in Section 2 below. 
-
-In the event of a direct conflict between the terms of this EE Supplemental License and the terms of the Enterprise Agreement or the Subscription Agreement, as applicable, the terms of this EE Supplemental License will control. Except to the extent modified by this EE Supplemental License, the Enterprise Agreement or the Subscription Agreement, as applicable, remain in full force and effect in accordance with its terms.
-
-By using the EE Software, You hereby agree to the below terms and conditions.
-
-1. Notwithstanding any terms to the contrary in the Enterprise Agreement or Subscription Agreement, You may copy, modify and publish patches to the EE Software in a production environment (such copies, “Production Copies,” such modifications, “Production Modifications” and such patches, “Production Patches”) if and only if (a) You have agreed to, and are in full compliance with, the Enterprise Agreement or Subscription Agreement, as applicable, and (b) You have a valid license to the EE Software for the correct number of projects. You agree that Strapi and/or its licensors (as applicable) will own all right, title and interest in and to all such Production Copies, Production Modifications and Production Patches. You may display and/or distribute such Production Copies, Production Modifications and Production Patches if and only if (i) You have a valid license to the EE Software for the correct number of projects and (ii) You are in compliance with the Enterprise Agreement or Subscription Agreement, as applicable. You hereby assign to Strapi all right, title and interest in and to all Production Copies, Production Modifications and Production Patches, including all intellectual property rights embodied in or related to the foregoing.
-
-2. Notwithstanding the foregoing, You may copy and modify the EE Software solely for development and testing purposes (such copies, “Development Copies” and such modifications, “Development Modifications”) with or without a license to the EE Software if your use is in compliance with this Section 2. You agree that Strapi and/or its licensors (as applicable) will own all right, title and interest in and to all Development Copies and Development Modifications and You hereby assign to Strapi all right, title and interest in and to all Development Copies and Development Modifications, including all intellectual property rights embodied in or related to the foregoing. If You do not have a license to the EE Software, then You further agree as follows:
-
-Other than as expressly set forth in this Section 2, You may not (a) copy or modify the EE Software, (b) create derivative works of the EE Software, (c) remove or modify any notice of any patent, copyright, trademark, or other proprietary rights that appear on or in the EE Software, (d) reverse engineer, decompile, translate, disassemble, or discover the source code of all or any portion of the EE Software, (e) publicly display all or any part of the EE Software, (f) distribute, disclose, market, lease, publish, merge, resell, assign, loan, sublicense, rent, or transfer the EE Software to any third party, (g) use the EE Software for any dial-up, remote access, interactive, or other on-line or hosted service, or to provide a service bureau, time share, or other services to third parties, (h) merge the EE Software into another product, (i) disclose the results of any EE Software performance benchmarks or test results to any third party without Strapi’s prior written consent, (j) use any trademarks, logos, service marks, trade names of Strapi, or any portion thereof, without Strapi’s prior written consent, (k) use the EE Software, or any portion thereof, in a manner that does not comply with applicable law, regulations, or governmental orders, or (l) use or store the EE Software on equipment not owned or controlled by Customer. 
-
-THE EE SOFTWARE IS PROVIDED ON AN “AS IS” BASIS WITHOUT ANY REPRESENTATIONS, WARRANTIES, COVENANTS, OR CONDITIONS OF ANY KIND (EXPRESS OR IMPLIED, STATUTORY OR OTHERWISE), INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, TITLE, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT.  FURTHER, STRAPI DOES NOT REPRESENT OR WARRANT THAT (A) THE ACCESS TO OR USE OF THE EE SOFTWARE WILL BE SECURE, TIMELY, UNINTERRUPTED, ERROR-FREE, OR OPERATE IN COMBINATION WITH ANY OTHER HARDWARE, SOFTWARE, SYSTEM, OR DATA, (B) THE EE SOFTWARE WILL MEET YOUR REQUIREMENTS OR EXPECTATIONS, OR OTHERWISE PRODUCE ANY PARTICULAR RESULTS, (C) ERRORS OR DEFECTS WILL BE CORRECTED, PATCHES OR WORKAROUNDS WILL BE PROVIDED, OR STRAPI WILL DETECT ANY BUG IN THE EE SOFTWARE, (D) THE SOFTWARE IS FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS, OR (E) THIRD-PARTY DISRUPTIONS OR SECURITY BREACHES OF THE EE SOFTWARE WILL BE PREVENTED.
-
-STRAPI WILL NOT BE LIABLE FOR ANY LOSS OF PROFITS OR ANY INDIRECT, SPECIAL, INCIDENTAL, RELIANCE, OR CONSEQUENTIAL DAMAGES OF ANY KIND, REGARDLESS OF THE FORM OF ACTION, WHETHER IN CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY, OR OTHERWISE, EVEN IF INFORMED OF THE POSSIBILITY OF SUCH DAMAGES IN ADVANCE. 
-
-STRAPI’S ENTIRE LIABILITY TO YOU FOR USE OF THE EE SOFTWARE WILL NOT EXCEED $100.
-
-3. You are not granted any other rights beyond what is expressly stated herein and in the Enterprise Agreement or Subscription Agreement, as applicable.
-
-4. This EE Supplemental License does not apply to Strapi software that is distributed as part of the Strapi Community Edition (CE) (the “CE Software”).
+If you or the company you represent has entered into a written agreement referencing the Enterprise Edition of the Strapi source code available at https://github.com/strapi/strapi, then such agreement applies to your use of the Enterprise Edition of the Strapi Software. If you or the company you represent is using the Enterprise Edition of the Strapi Software in connection with a subscription to our cloud offering, then the agreement you have agreed to with respect to our cloud offering and the licenses included in such agreement apply to your use of the Enterprise Edition of the Strapi Software. Otherwise, the Strapi Enterprise Software License Agreement (found here https://strapi.io/enterprise-terms) applies to your use of the Enterprise Edition of the Strapi Software.  BY ACCESSING OR USING THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE RELEVANT REFERENCED AGREEMENT.  IF YOU ARE NOT AUTHORIZED TO ACCEPT THESE TERMS ON BEHALF OF THE COMPANY YOU REPRESENT OR IF YOU DO NOT AGREE TO ALL OF THE RELEVANT TERMS AND CONDITIONS REFERENCED AND YOU HAVE NOT OTHERWISE EXECUTED A WRITTEN AGREEMENT WITH STRAPI, YOU ARE NOT AUTHORIZED TO ACCESS OR USE OR ALLOW ANY USER TO ACCESS OR USE ANY PART OF THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE.  YOUR ACCESS RIGHTS ARE CONDITIONAL ON YOUR CONSENT TO THE RELEVANT REFERENCED TERMS TO THE EXCLUSION OF ALL OTHER TERMS; IF THE RELEVANT REFERENCED TERMS ARE CONSIDERED AN OFFER BY YOU, ACCEPTANCE IS EXPRESSLY LIMITED TO THE RELEVANT REFERENCED TERMS.

package/lib/Strapi.js

@@ -255,6 +255,7 @@ class Strapi {
         numberOfAllContentTypes: _.size(this.contentTypes), // TODO: V5: This event should be renamed numberOfContentTypes in V5 as the name is already taken to describe the number of content types using i18n.
         numberOfComponents: _.size(this.components),
         numberOfDynamicZones: getNumberOfDynamicZones(),
+        environment: strapi.config.environment,
         // TODO: to add back
         // providers: this.config.installedProviders,
       },

package/lib/commands/actions/export/action.js

@@ -25,6 +25,7 @@ const {
   exitMessageText,
   abortTransfer,
   getTransferTelemetryPayload,
+  setSignalHandler,
 } = require('../../utils/data-transfer');
 const { exitWith } = require('../../utils/helpers');
 
@@ -115,10 +116,7 @@ module.exports = async (opts) => {
   let outFile;
   try {
     // Abort transfer if user interrupts process
-    ['SIGTERM', 'SIGINT', 'SIGQUIT'].forEach((signal) => {
-      process.removeAllListeners(signal);
-      process.on(signal, () => abortTransfer({ engine, strapi }));
-    });
+    setSignalHandler(() => abortTransfer({ engine, strapi }));
 
     results = await engine.transfer();
     outFile = results.destination.file.path;

package/lib/commands/actions/import/action.js

@@ -21,6 +21,8 @@ const {
   exitMessageText,
   abortTransfer,
   getTransferTelemetryPayload,
+  setSignalHandler,
+  getDiffHandler,
 } = require('../../utils/data-transfer');
 const { exitWith } = require('../../utils/helpers');
 
@@ -111,6 +113,8 @@ module.exports = async (opts) => {
 
   const { updateLoader } = loadersFactory();
 
+  engine.onSchemaDiff(getDiffHandler(engine, { force: opts.force, action: 'import' }));
+
   progress.on(`stage::start`, ({ stage, data }) => {
     updateLoader(stage, data).start();
   });
@@ -134,10 +138,7 @@ module.exports = async (opts) => {
   let results;
   try {
     // Abort transfer if user interrupts process
-    ['SIGTERM', 'SIGINT', 'SIGQUIT'].forEach((signal) => {
-      process.removeAllListeners(signal);
-      process.on(signal, () => abortTransfer({ engine, strapi }));
-    });
+    setSignalHandler(() => abortTransfer({ engine, strapi }));
 
     results = await engine.transfer();
   } catch (e) {

package/lib/commands/actions/import/command.js

@@ -9,7 +9,7 @@ const {
   throttleOption,
   validateExcludeOnly,
 } = require('../../utils/data-transfer');
-const { confirmMessage, forceOption } = require('../../utils/commander');
+const { getCommanderConfirmMessage, forceOption } = require('../../utils/commander');
 const { getLocalScript, exitWith } = require('../../utils/helpers');
 
 /**
@@ -88,7 +88,7 @@ module.exports = ({ command }) => {
     })
     .hook(
       'preAction',
-      confirmMessage(
+      getCommanderConfirmMessage(
         'The import will delete all assets and data in your database. Are you sure you want to proceed?',
         { failMessage: 'Import process aborted' }
       )

package/lib/commands/actions/transfer/action.js

@@ -22,6 +22,8 @@ const {
   exitMessageText,
   abortTransfer,
   getTransferTelemetryPayload,
+  setSignalHandler,
+  getDiffHandler,
 } = require('../../utils/data-transfer');
 const { exitWith } = require('../../utils/helpers');
 
@@ -146,6 +148,8 @@ module.exports = async (opts) => {
 
   const { updateLoader } = loadersFactory();
 
+  engine.onSchemaDiff(getDiffHandler(engine, { force: opts.force, action: 'transfer' }));
+
   progress.on(`stage::start`, ({ stage, data }) => {
     updateLoader(stage, data).start();
   });
@@ -171,10 +175,7 @@ module.exports = async (opts) => {
   let results;
   try {
     // Abort transfer if user interrupts process
-    ['SIGTERM', 'SIGINT', 'SIGQUIT'].forEach((signal) => {
-      process.removeAllListeners(signal);
-      process.on(signal, () => abortTransfer({ engine, strapi }));
-    });
+    setSignalHandler(() => abortTransfer({ engine, strapi }));
 
     results = await engine.transfer();
   } catch (e) {

package/lib/commands/actions/transfer/command.js

@@ -2,7 +2,7 @@
 
 const inquirer = require('inquirer');
 const { Option } = require('commander');
-const { confirmMessage, forceOption, parseURL } = require('../../utils/commander');
+const { getCommanderConfirmMessage, forceOption, parseURL } = require('../../utils/commander');
 const {
   getLocalScript,
   exitWith,
@@ -76,7 +76,7 @@ module.exports = ({ command }) => {
             thisCommand.opts().fromToken = answers.fromToken;
           }
 
-          await confirmMessage(
+          await getCommanderConfirmMessage(
             'The transfer will delete all the local Strapi assets and its database. Are you sure you want to proceed?',
             { failMessage: 'Transfer process aborted' }
           )(thisCommand);
@@ -104,7 +104,7 @@ module.exports = ({ command }) => {
             thisCommand.opts().toToken = answers.toToken;
           }
 
-          await confirmMessage(
+          await getCommanderConfirmMessage(
             'The transfer will delete all the remote Strapi assets and its database. Are you sure you want to proceed?',
             { failMessage: 'Transfer process aborted' }
           )(thisCommand);

package/lib/commands/utils/commander.js

@@ -111,30 +111,35 @@ const promptEncryptionKey = async (thisCommand) => {
  * @param {object} options Additional options
  * @param {string|undefined} options.failMessage The message to display when prompt is not confirmed
  */
-const confirmMessage = (message, { failMessage } = {}) => {
+const getCommanderConfirmMessage = (message, { failMessage } = {}) => {
   return async (command) => {
-    // if we have a force option, assume yes
-    const opts = command.opts();
-    if (opts?.force === true) {
-      // attempt to mimic the inquirer prompt exactly
-      console.log(`${green('?')} ${bold(message)} ${cyan('Yes')}`);
-      return;
-    }
-
-    const answers = await inquirer.prompt([
-      {
-        type: 'confirm',
-        message,
-        name: `confirm`,
-        default: false,
-      },
-    ]);
-    if (!answers.confirm) {
+    const confirmed = await confirmMessage(message, { force: command.opts().force });
+    if (!confirmed) {
       exitWith(1, failMessage);
     }
   };
 };
 
+const confirmMessage = async (message, { force } = {}) => {
+  // if we have a force option, respond yes
+  if (force === true) {
+    // attempt to mimic the inquirer prompt exactly
+    console.log(`${green('?')} ${bold(message)} ${cyan('Yes')}`);
+    return true;
+  }
+
+  const answers = await inquirer.prompt([
+    {
+      type: 'confirm',
+      message,
+      name: `confirm`,
+      default: false,
+    },
+  ]);
+
+  return answers.confirm;
+};
+
 const forceOption = new Option(
   '--force',
   `Automatically answer "yes" to all prompts, including potentially destructive requests, and run non-interactively.`
@@ -146,6 +151,7 @@ module.exports = {
   parseURL,
   parseInteger,
   promptEncryptionKey,
+  getCommanderConfirmMessage,
   confirmMessage,
   forceOption,
 };

package/lib/commands/utils/data-transfer.js

@@ -12,9 +12,11 @@ const {
   createLogger,
 } = require('@strapi/logger');
 const ora = require('ora');
+const { TransferEngineInitializationError } = require('@strapi/data-transfer/dist/engine/errors');
+const { merge } = require('lodash/fp');
 const { readableBytes, exitWith } = require('./helpers');
 const strapi = require('../../index');
-const { getParseListWithChoices, parseInteger } = require('./commander');
+const { getParseListWithChoices, parseInteger, confirmMessage } = require('./commander');
 
 const exitMessageText = (process, error = false) => {
   const processCapitalized = process[0].toUpperCase() + process.slice(1);
@@ -113,6 +115,15 @@ const abortTransfer = async ({ engine, strapi }) => {
   return true;
 };
 
+const setSignalHandler = async (handler, signals = ['SIGINT', 'SIGTERM', 'SIGQUIT']) => {
+  signals.forEach((signal) => {
+    // We specifically remove ALL listeners because we have to clear the one added in Strapi bootstrap that has a process.exit
+    // TODO: Ideally Strapi bootstrap would not add that listener, and then this could be more flexible and add/remove only what it needs to
+    process.removeAllListeners(signal);
+    process.on(signal, handler);
+  });
+};
+
 const createStrapiInstance = async (opts = {}) => {
   try {
     const appContext = await strapi.compile();
@@ -257,6 +268,79 @@ const getTransferTelemetryPayload = (engine) => {
   };
 };
 
+/**
+ * Get a transfer engine schema diff handler that confirms with the user before bypassing a schema check
+ */
+const getDiffHandler = (engine, { force, action }) => {
+  return async (context, next) => {
+    // if we abort here, we need to actually exit the process because of conflict with inquirer prompt
+    setSignalHandler(async () => {
+      await abortTransfer({ engine, strapi });
+      exitWith(1, exitMessageText(action, true));
+    });
+
+    let workflowsStatus;
+    const source = 'Schema Integrity';
+
+    Object.entries(context.diffs).forEach(([uid, diffs]) => {
+      for (const diff of diffs) {
+        const path = [uid].concat(diff.path).join('.');
+        const endPath = diff.path[diff.path.length - 1];
+
+        // Catch known features
+        if (
+          uid === 'admin::workflow' ||
+          uid === 'admin::workflow-stage' ||
+          endPath?.startsWith('strapi_reviewWorkflows_')
+        ) {
+          workflowsStatus = diff.kind;
+        }
+        // handle generic cases
+        else if (diff.kind === 'added') {
+          engine.reportWarning(chalk.red(`${chalk.bold(path)} does not exist on source`), source);
+        } else if (diff.kind === 'deleted') {
+          engine.reportWarning(
+            chalk.red(`${chalk.bold(path)} does not exist on destination`),
+            source
+          );
+        } else if (diff.kind === 'modified') {
+          engine.reportWarning(chalk.red(`${chalk.bold(path)} has a different data type`), source);
+        }
+      }
+    });
+
+    // output the known feature warnings
+    if (workflowsStatus === 'added') {
+      engine.reportWarning(chalk.red(`Review workflows feature does not exist on source`), source);
+    } else if (workflowsStatus === 'deleted') {
+      engine.reportWarning(
+        chalk.red(`Review workflows feature does not exist on destination`),
+        source
+      );
+    } else if (workflowsStatus === 'modified') {
+      engine.panic(
+        new TransferEngineInitializationError('Unresolved differences in schema [review workflows]')
+      );
+    }
+
+    const confirmed = await confirmMessage(
+      'There are differences in schema between the source and destination, and the data listed above will be lost. Are you sure you want to continue?',
+      {
+        force,
+      }
+    );
+
+    // reset handler back to normal
+    setSignalHandler(() => abortTransfer({ engine, strapi }));
+
+    if (confirmed) {
+      context.ignoredDiffs = merge(context.diffs, context.ignoredDiffs);
+    }
+
+    return next(context);
+  };
+};
+
 module.exports = {
   loadersFactory,
   buildTransferTable,
@@ -271,4 +355,6 @@ module.exports = {
   validateExcludeOnly,
   formatDiagnostic,
   abortTransfer,
+  setSignalHandler,
+  getDiffHandler,
 };

package/lib/services/entity-service/index.js

@@ -59,6 +59,10 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     return options;
   },
 
+  async wrapResult(result) {
+    return result;
+  },
+
   async emitEvent(uid, event, entity) {
     // Ignore audit log events to prevent infinite loops
     if (uid === 'admin::audit-log') {
@@ -83,10 +87,12 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     const query = transformParamsToQuery(uid, wrappedParams);
 
     if (kind === 'singleType') {
-      return db.query(uid).findOne(query);
+      const entity = db.query(uid).findOne(query);
+      return this.wrapResult(entity, { uid, action: 'findOne' });
     }
 
-    return db.query(uid).findMany(query);
+    const entities = await db.query(uid).findMany(query);
+    return this.wrapResult(entities, { uid, action: 'findMany' });
   },
 
   async findPage(uid, opts) {
@@ -94,7 +100,11 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     const query = transformParamsToQuery(uid, wrappedParams);
 
-    return db.query(uid).findPage(query);
+    const page = await db.query(uid).findPage(query);
+    return {
+      ...page,
+      results: await this.wrapResult(page.results, { uid, action: 'findPage' }),
+    };
   },
 
   // TODO: streamline the logic based on the populate option
@@ -103,7 +113,11 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     const query = transformParamsToQuery(uid, wrappedParams);
 
-    return db.query(uid).findPage(query);
+    const entities = await db.query(uid).findPage(query);
+    return {
+      ...entities,
+      results: await this.wrapResult(entities.results, { uid, action: 'findWithRelationCounts' }),
+    };
   },
 
   async findWithRelationCounts(uid, opts) {
@@ -111,7 +125,8 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     const query = transformParamsToQuery(uid, wrappedParams);
 
-    return db.query(uid).findMany(query);
+    const entities = await db.query(uid).findMany(query);
+    return this.wrapResult(entities, { uid, action: 'findWithRelationCounts' });
   },
 
   async findOne(uid, entityId, opts) {
@@ -119,7 +134,8 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     const query = transformParamsToQuery(uid, pickSelectionParams(wrappedParams));
 
-    return db.query(uid).findOne({ ...query, where: { id: entityId } });
+    const entity = await db.query(uid).findOne({ ...query, where: { id: entityId } });
+    return this.wrapResult(entity, { uid, action: 'findOne' });
   },
 
   async count(uid, opts) {
@@ -162,6 +178,8 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
       entity = await this.findOne(uid, entity.id, wrappedParams);
     }
 
+    entity = await this.wrapResult(entity, { uid, action: 'create' });
+
     await this.emitEvent(uid, ENTRY_CREATE, entity);
 
     return entity;
@@ -213,6 +231,8 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
       entity = await this.findOne(uid, entity.id, wrappedParams);
     }
 
+    entity = await this.wrapResult(entity, { uid, action: 'update' });
+
     await this.emitEvent(uid, ENTRY_UPDATE, entity);
 
     return entity;
@@ -224,7 +244,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     // select / populate
     const query = transformParamsToQuery(uid, pickSelectionParams(wrappedParams));
 
-    const entityToDelete = await db.query(uid).findOne({
+    let entityToDelete = await db.query(uid).findOne({
       ...query,
       where: { id: entityId },
     });
@@ -238,6 +258,8 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     await db.query(uid).delete({ where: { id: entityToDelete.id } });
     await deleteComponents(uid, componentsToDelete, { loadComponents: false });
 
+    entityToDelete = await this.wrapResult(entityToDelete, { uid, action: 'delete' });
+
     await this.emitEvent(uid, ENTRY_DELETE, entityToDelete);
 
     return entityToDelete;
@@ -250,7 +272,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     // select / populate
     const query = transformParamsToQuery(uid, wrappedParams);
 
-    const entitiesToDelete = await db.query(uid).findMany(query);
+    let entitiesToDelete = await db.query(uid).findMany(query);
 
     if (!entitiesToDelete.length) {
       return null;
@@ -265,21 +287,27 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
       componentsToDelete.map((compos) => deleteComponents(uid, compos, { loadComponents: false }))
     );
 
+    entitiesToDelete = await this.wrapResult(entitiesToDelete, { uid, action: 'delete' });
+
     // Trigger webhooks. One for each entity
     await Promise.all(entitiesToDelete.map((entity) => this.emitEvent(uid, ENTRY_DELETE, entity)));
 
     return deletedEntities;
   },
 
-  load(uid, entity, field, params = {}) {
+  async load(uid, entity, field, params = {}) {
     if (!_.isString(field)) {
       throw new Error(`Invalid load. Expected "${field}" to be a string`);
     }
 
-    return db.query(uid).load(entity, field, transformLoadParamsToQuery(uid, field, params));
+    const loadedEntity = await db
+      .query(uid)
+      .load(entity, field, transformLoadParamsToQuery(uid, field, params));
+
+    return this.wrapResult(loadedEntity, { uid, field, action: 'load' });
   },
 
-  loadPages(uid, entity, field, params = {}, pagination = {}) {
+  async loadPages(uid, entity, field, params = {}, pagination = {}) {
     if (!_.isString(field)) {
       throw new Error(`Invalid load. Expected "${field}" to be a string`);
     }
@@ -293,7 +321,12 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     const query = transformLoadParamsToQuery(uid, field, params, pagination);
 
-    return db.query(uid).loadPages(entity, field, query);
+    const loadedPage = await db.query(uid).loadPages(entity, field, query);
+
+    return {
+      ...loadedPage,
+      results: await this.wrapResult(loadedPage.results, { uid, field, action: 'load' }),
+    };
   },
 });
 

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

@@ -10,7 +10,7 @@ const crypto = require('crypto');
  */
 const generateAdminUserHash = (strapi) => {
   const ctx = strapi?.requestContext?.get();
-  if (!ctx?.state?.user) {
+  if (!ctx?.state?.user?.email) {
     return '';
   }
   return crypto.createHash('sha256').update(ctx.state.user.email).digest('hex');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.11.0-alpha.0",
+  "version": "4.11.0-beta.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",
   "keywords": [
     "strapi",
@@ -81,19 +81,19 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.11.0-alpha.0",
-    "@strapi/data-transfer": "4.11.0-alpha.0",
-    "@strapi/database": "4.11.0-alpha.0",
-    "@strapi/generate-new": "4.11.0-alpha.0",
-    "@strapi/generators": "4.11.0-alpha.0",
-    "@strapi/logger": "4.11.0-alpha.0",
-    "@strapi/permissions": "4.11.0-alpha.0",
-    "@strapi/plugin-content-manager": "4.11.0-alpha.0",
-    "@strapi/plugin-content-type-builder": "4.11.0-alpha.0",
-    "@strapi/plugin-email": "4.11.0-alpha.0",
-    "@strapi/plugin-upload": "4.11.0-alpha.0",
-    "@strapi/typescript-utils": "4.11.0-alpha.0",
-    "@strapi/utils": "4.11.0-alpha.0",
+    "@strapi/admin": "4.11.0-beta.1",
+    "@strapi/data-transfer": "4.11.0-beta.1",
+    "@strapi/database": "4.11.0-beta.1",
+    "@strapi/generate-new": "4.11.0-beta.1",
+    "@strapi/generators": "4.11.0-beta.1",
+    "@strapi/logger": "4.11.0-beta.1",
+    "@strapi/permissions": "4.11.0-beta.1",
+    "@strapi/plugin-content-manager": "4.11.0-beta.1",
+    "@strapi/plugin-content-type-builder": "4.11.0-beta.1",
+    "@strapi/plugin-email": "4.11.0-beta.1",
+    "@strapi/plugin-upload": "4.11.0-beta.1",
+    "@strapi/typescript-utils": "4.11.0-beta.1",
+    "@strapi/utils": "4.11.0-beta.1",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -142,5 +142,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "ca5fb0fcfab1b6784208d2ddf6d51617b8893b35"
+  "gitHead": "a5fa3bd7e1c4680dd350580620d383612597d25d"
 }