Add unit tests to the admin hash generation, fix minor requests

packages/core/admin/admin/src/components/AuthenticatedApp/index.js

@@ -78,7 +78,7 @@ const AuthenticatedApp = () => {
 
   const shouldShowLoader = isLoading || shouldShowNotDependentQueriesLoader;
 
-  const adminUserId = userInfo ? hashAdminUserEmail(userInfo) : '';
+  const adminUserId = hashAdminUserEmail(userInfo);
   const appInfosValue = useMemo(() => {
     return {
       ...appInfos,

packages/core/admin/admin/src/utils/unique-admin-hash.js

@@ -10,6 +10,9 @@ async function digestMessage(message) {
 }
 
 export default async function hashAdminUserEmail(payload) {
+  if (!payload) {
+    return '';
+  }
   try {
     return await digestMessage(payload.email);
   } catch (error) {

packages/core/admin/server/services/__tests__/metrics.test.js

@@ -57,7 +57,7 @@ describe('Metrics', () => {
 
     expect(getLanguagesInUse).toHaveBeenCalledWith();
     expect(send).toHaveBeenCalledWith('didChangeInterfaceLanguage', {
-      groupProperties: {
+      userProperties: {
         languagesInUse: ['en', 'fr', 'en'],
       },
     });

packages/core/admin/server/services/metrics.js

@@ -17,7 +17,7 @@ const sendDidUpdateRolePermissions = async () => {
 const sendDidChangeInterfaceLanguage = async () => {
   const languagesInUse = await getService('user').getLanguagesInUse();
   // This event is anonymous
-  strapi.telemetry.send('didChangeInterfaceLanguage', { groupProperties: { languagesInUse } });
+  strapi.telemetry.send('didChangeInterfaceLanguage', { userProperties: { languagesInUse } });
 };
 
 module.exports = {

packages/core/strapi/lib/services/metrics/__tests__/admin-user-hash.test.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const crypto = require('crypto');
+const { generateAdminUserHash } = require('../admin-user-hash');
+const createContext = require('../../../../../../../test/helpers/create-context');
+
+describe('user email hash', () => {
+  test('should create a hash from admin email', () => {
+    const state = {
+      user: {
+        email: 'testemail@strapi.io',
+      },
+    };
+
+    const ctx = createContext({}, { state });
+
+    const hash = crypto.createHash('sha256').update('testemail@strapi.io').digest('hex');
+
+    const adminUserId = generateAdminUserHash(ctx);
+    expect(adminUserId).toBe(hash);
+  });
+
+  test('should return empty string if user is not available on ctx', () => {
+    const ctx = createContext({}, {});
+
+    const adminUserId = generateAdminUserHash(ctx);
+    expect(adminUserId).toBe('');
+  });
+});

packages/core/strapi/lib/services/metrics/sender.js

@@ -74,7 +74,7 @@ module.exports = (strapi) => {
         event,
         adminUserId,
         deviceId,
-        eventProperties: adminUserId ? payload.eventProperties : {},
+        eventProperties: payload.eventProperties,
         userProperties: adminUserId
           ? { ...anonymousUserProperties, ...payload.userProperties }
           : {},