@strapi/strapi 4.5.2 → 4.5.4

package/lib/Strapi.js

@@ -242,11 +242,14 @@ class Strapi {
   sendStartupTelemetry() {
     // Emit started event.
     // do not await to avoid slower startup
+    // This event is anonymous
     this.telemetry.send('didStartServer', {
-      database: strapi.config.get('database.connection.client'),
-      plugins: Object.keys(strapi.plugins),
-      // TODO: to add back
-      // providers: this.config.installedProviders,
+      groupProperties: {
+        database: strapi.config.get('database.connection.client'),
+        plugins: Object.keys(strapi.plugins),
+        // TODO: to add back
+        // providers: this.config.installedProviders,
+      },
     });
   }
 

package/lib/commands/opt-in-telemetry.js

@@ -53,12 +53,12 @@ const generateNewPackageJSON = (packageObj) => {
 
 const sendEvent = async (uuid) => {
   try {
-    await fetch('https://analytics.strapi.io/track', {
+    await fetch('https://analytics.strapi.io/api/v2/track', {
       method: 'POST',
       body: JSON.stringify({
         event: 'didOptInTelemetry',
-        uuid,
         deviceId: machineID(),
+        groupProperties: { projectId: uuid },
       }),
       headers: { 'Content-Type': 'application/json' },
     });

package/lib/commands/opt-out-telemetry.js

@@ -28,12 +28,12 @@ const writePackageJSON = async (path, file, spacing) => {
 
 const sendEvent = async (uuid) => {
   try {
-    await fetch('https://analytics.strapi.io/track', {
+    await fetch('https://analytics.strapi.io/api/v2/track', {
       method: 'POST',
       body: JSON.stringify({
         event: 'didOptOutTelemetry',
-        uuid,
         deviceId: machineID(),
+        groupProperties: { projectId: uuid },
       }),
       headers: { 'Content-Type': 'application/json' },
     });

package/lib/core/domain/content-type/index.js

@@ -54,7 +54,7 @@ const createContentType = (uid, definition) => {
     });
   } else {
     throw new Error(
-      `Incorrect Content Type UID "${uid}". The UID should start with api::, plugin:: or strapi::.`
+      `Incorrect Content Type UID "${uid}". The UID should start with api::, plugin:: or admin::.`
     );
   }
 

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

@@ -134,17 +134,20 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     // TODO: wrap into transaction
     const componentData = await createComponents(uid, validData);
 
+    const entityData = creationPipeline(
+      Object.assign(omitComponentData(model, validData), componentData),
+      {
+        contentType: model,
+      }
+    );
     let entity = await db.query(uid).create({
       ...query,
-      data: creationPipeline(Object.assign(omitComponentData(model, validData), componentData), {
-        contentType: model,
-      }),
+      data: entityData,
     });
 
     // TODO: upload the files then set the links in the entity like with compo to avoid making too many queries
-    // FIXME: upload in components
     if (files && Object.keys(files).length > 0) {
-      await this.uploadFiles(uid, entity, files);
+      await this.uploadFiles(uid, Object.assign(entityData, entity), files);
       entity = await this.findOne(uid, entity.id, wrappedParams);
     }
 
@@ -180,19 +183,22 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     // TODO: wrap in transaction
     const componentData = await updateComponents(uid, entityToUpdate, validData);
+    const entityData = updatePipeline(
+      Object.assign(omitComponentData(model, validData), componentData),
+      {
+        contentType: model,
+      }
+    );
 
     let entity = await db.query(uid).update({
       ...query,
       where: { id: entityId },
-      data: updatePipeline(Object.assign(omitComponentData(model, validData), componentData), {
-        contentType: model,
-      }),
+      data: entityData,
     });
 
     // TODO: upload the files then set the links in the entity like with compo to avoid making too many queries
-    // FIXME: upload in components
     if (files && Object.keys(files).length > 0) {
-      await this.uploadFiles(uid, entity, files);
+      await this.uploadFiles(uid, Object.assign(entityData, entity), files);
       entity = await this.findOne(uid, entity.id, wrappedParams);
     }
 

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

@@ -293,40 +293,48 @@ const buildRelationsStore = ({ uid, data }) => {
         break;
       }
       case 'component': {
-        return castArray(value).reduce(
-          (relationsStore, componentValue) =>
-            mergeWith(
-              relationsStore,
-              buildRelationsStore({
-                uid: attribute.component,
-                data: componentValue,
-              }),
-              (objValue, srcValue) => {
-                if (isArray(objValue)) {
-                  return objValue.concat(srcValue);
-                }
+        return castArray(value).reduce((relationsStore, componentValue) => {
+          if (!attribute.component) {
+            throw new ValidationError(
+              `Cannot build relations store from component, component identifier is undefined`
+            );
+          }
+
+          return mergeWith(
+            relationsStore,
+            buildRelationsStore({
+              uid: attribute.component,
+              data: componentValue,
+            }),
+            (objValue, srcValue) => {
+              if (isArray(objValue)) {
+                return objValue.concat(srcValue);
               }
-            ),
-          result
-        );
+            }
+          );
+        }, result);
       }
       case 'dynamiczone': {
-        return value.reduce(
-          (relationsStore, dzValue) =>
-            mergeWith(
-              relationsStore,
-              buildRelationsStore({
-                uid: dzValue.__component,
-                data: dzValue,
-              }),
-              (objValue, srcValue) => {
-                if (isArray(objValue)) {
-                  return objValue.concat(srcValue);
-                }
+        return value.reduce((relationsStore, dzValue) => {
+          if (!dzValue.__component) {
+            throw new ValidationError(
+              `Cannot build relations store from dynamiczone, component identifier is undefined`
+            );
+          }
+
+          return mergeWith(
+            relationsStore,
+            buildRelationsStore({
+              uid: dzValue.__component,
+              data: dzValue,
+            }),
+            (objValue, srcValue) => {
+              if (isArray(objValue)) {
+                return objValue.concat(srcValue);
               }
-            ),
-          result
-        );
+            }
+          );
+        }, result);
       }
       default:
         break;

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

@@ -0,0 +1,15 @@
+'use strict';
+
+const crypto = require('crypto');
+
+const generateAdminUserHash = () => {
+  const ctx = strapi?.requestContext?.get();
+  if (!ctx?.state?.user) {
+    return '';
+  }
+  return crypto.createHash('sha256').update(ctx.state.user.email).digest('hex');
+};
+
+module.exports = {
+  generateAdminUserHash,
+};

package/lib/services/metrics/index.js

@@ -55,10 +55,12 @@ const createTelemetryInstance = (strapi) => {
           return sendEvent(
             'didCheckLicense',
             {
-              licenseInfo: {
-                ...ee.licenseInfo,
-                projectHash: hashProject(strapi),
-                dependencyHash: hashDep(strapi),
+              groupProperties: {
+                licenseInfo: {
+                  ...ee.licenseInfo,
+                  projectHash: hashProject(strapi),
+                  dependencyHash: hashDep(strapi),
+                },
               },
             },
             {

package/lib/services/metrics/middleware.js

@@ -19,7 +19,7 @@ const createMiddleware = ({ sendEvent }) => {
 
       // Send max. 1000 events per day.
       if (_state.counter < 1000) {
-        sendEvent('didReceiveRequest', { url: ctx.request.url });
+        sendEvent('didReceiveRequest', { eventProperties: { url: ctx.request.url } });
 
         // Increase counter.
         _state.counter += 1;

package/lib/services/metrics/sender.js

@@ -10,7 +10,7 @@ const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
 const { env } = require('@strapi/utils');
 const ee = require('../../utils/ee');
 const machineID = require('../../utils/machine-id');
-const stringifyDeep = require('./stringify-deep');
+const { generateAdminUserHash } = require('./admin-user-hash');
 
 const defaultQueryOpts = {
   timeout: 1000,
@@ -42,41 +42,49 @@ module.exports = (strapi) => {
   const serverRootPath = strapi.dirs.app.root;
   const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');
 
-  const anonymousMetadata = {
+  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'),
     projectType: isEE ? 'Enterprise' : 'Community',
     useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath),
     useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
+    projectId: uuid,
     isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',
   };
 
-  addPackageJsonStrapiMetadata(anonymousMetadata, strapi);
+  addPackageJsonStrapiMetadata(anonymousGroupProperties, strapi);
 
   return async (event, payload = {}, opts = {}) => {
+    const userId = generateAdminUserHash();
+
     const reqParams = {
       method: 'POST',
       body: JSON.stringify({
         event,
-        uuid,
+        userId,
         deviceId,
-        properties: stringifyDeep({
-          ...payload,
-          ...anonymousMetadata,
-        }),
+        eventProperties: payload.eventProperties,
+        userProperties: userId ? { ...anonymousUserProperties, ...payload.userProperties } : {},
+        groupProperties: {
+          ...anonymousGroupProperties,
+          ...payload.groupProperties,
+        },
       }),
       ..._.merge({}, defaultQueryOpts, opts),
     };
 
     try {
-      const res = await fetch(`${ANALYTICS_URI}/track`, reqParams);
+      const res = await fetch(`${ANALYTICS_URI}/api/v2/track`, reqParams);
       return res.ok;
     } catch (err) {
       return false;

package/lib/utils/success.js

@@ -17,7 +17,7 @@ try {
     process.env.npm_config_global === 'true' ||
     JSON.parse(process.env.npm_config_argv).original.includes('global')
   ) {
-    fetch('https://analytics.strapi.io/track', {
+    fetch('https://analytics.strapi.io/api/v2/track', {
       method: 'POST',
       body: JSON.stringify({
         event: 'didInstallStrapi',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.5.2",
+  "version": "4.5.4",
   "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",
@@ -80,18 +80,18 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.5.2",
-    "@strapi/database": "4.5.2",
-    "@strapi/generate-new": "4.5.2",
-    "@strapi/generators": "4.5.2",
-    "@strapi/logger": "4.5.2",
-    "@strapi/permissions": "4.5.2",
-    "@strapi/plugin-content-manager": "4.5.2",
-    "@strapi/plugin-content-type-builder": "4.5.2",
-    "@strapi/plugin-email": "4.5.2",
-    "@strapi/plugin-upload": "4.5.2",
-    "@strapi/typescript-utils": "4.5.2",
-    "@strapi/utils": "4.5.2",
+    "@strapi/admin": "4.5.4",
+    "@strapi/database": "4.5.4",
+    "@strapi/generate-new": "4.5.4",
+    "@strapi/generators": "4.5.4",
+    "@strapi/logger": "4.5.4",
+    "@strapi/permissions": "4.5.4",
+    "@strapi/plugin-content-manager": "4.5.4",
+    "@strapi/plugin-content-type-builder": "4.5.4",
+    "@strapi/plugin-email": "4.5.4",
+    "@strapi/plugin-upload": "4.5.4",
+    "@strapi/typescript-utils": "4.5.4",
+    "@strapi/utils": "4.5.4",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -100,7 +100,7 @@
     "cli-table3": "0.6.2",
     "commander": "8.2.0",
     "configstore": "5.0.1",
-    "debug": "4.3.2",
+    "debug": "4.3.4",
     "delegates": "1.0.0",
     "dotenv": "10.0.0",
     "execa": "5.1.1",
@@ -140,5 +140,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "bcb1b7f472aae2556a9b59d59ee66d241c497a3e"
+  "gitHead": "8716ecc920130db5341b0904cf868c6e6b581a5d"
 }