yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 17:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor properties format to move all properties objects to the root level of the req body

Browse Source
This commit is contained in:
ivanThePleasant 2022-09-05 16:44:58 +03:00
parent b704a6b918
commit 00f5efec51
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/strapi/lib/services/metrics/sender.js
View File

@ -10,7 +10,6 @@ const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
const ee = require('../../utils/ee'); const ee = require('../../utils/ee');
const machineID = require('../../utils/machine-id'); const machineID = require('../../utils/machine-id');
const { generateAdminUserHash } = require('./admin-user-hash'); const { generateAdminUserHash } = require('./admin-user-hash');
const stringifyDeep = require('./stringify-deep');
const defaultQueryOpts = { const defaultQueryOpts = {
timeout: 1000, timeout: 1000,
@ -72,13 +71,11 @@ module.exports = (strapi) => {
event, event,
adminUserId, adminUserId,
deviceId, deviceId,
properties: { eventProperties: payload.eventProperties,
eventProperties: stringifyDeep({ ...payload?.eventProperties }), userProperties: { ...anonymousUserProperties, ...payload.userProperties },
userProperties: stringifyDeep({ ...payload?.userProperties, ...anonymousUserProperties }), groupProperties: {
groupProperties: stringifyDeep({ ...anonymousGroupProperties,
...payload?.groupProperties, ...payload.groupProperties,
...anonymousGroupProperties,
}),
}, },
}), }),
..._.merge({}, defaultQueryOpts, opts), ..._.merge({}, defaultQueryOpts, opts),