Rename

Author: FelixMalfait

packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts

@@ -66,18 +66,18 @@ export class AdminPanelService {
       ),
     );
 
-    const analytics = this.auditService.createContext({
+    const auditService = this.auditService.createContext({
       workspaceId: user.userWorkspaces[0].workspace.id,
       userId: impersonatorUserId,
     });
 
-    await analytics.insertWorkspaceEvent(MONITORING_EVENT, {
+    await auditService.insertWorkspaceEvent(MONITORING_EVENT, {
       eventName: 'server.impersonation.attempt',
       message: `Impersonation attempt: targetUserId=${userId}, workspaceId=${workspaceId}, impersonatorUserId=${impersonatorUserId}`,
     });
 
     try {
-      await analytics.insertWorkspaceEvent(MONITORING_EVENT, {
+      await auditService.insertWorkspaceEvent(MONITORING_EVENT, {
         eventName: 'server.impersonation.login_token_attempt',
         message: `Impersonation token generation attempt for user ${userId}`,
       });
@@ -91,7 +91,7 @@ export class AdminPanelService {
         },
       );
 
-      await analytics.insertWorkspaceEvent(MONITORING_EVENT, {
+      await auditService.insertWorkspaceEvent(MONITORING_EVENT, {
         eventName: 'server.impersonation.login_token_generated',
         message: `Impersonation token generated successfully for user ${userId}`,
       });
@@ -106,7 +106,7 @@ export class AdminPanelService {
         loginToken,
       };
     } catch {
-      await analytics.insertWorkspaceEvent(MONITORING_EVENT, {
+      await auditService.insertWorkspaceEvent(MONITORING_EVENT, {
         eventName: 'server.impersonation.login_token_failed',
         message: `Impersonation token generation failed for targetUserId=${userId}`,
       });

packages/twenty-server/src/engine/core-modules/audit/README.md

@@ -23,23 +23,23 @@ export class MyService {
 
   async doSomething() {
     // Create an analytics context
-    const analytics = this.auditService.createContext({
+    const auditService = this.auditService.createContext({
       workspaceId: 'workspace-id',
       userId: 'user-id',
     });
 
     // Track a workspace event
-    analytics.insertWorkspaceEvent(CUSTOM_DOMAIN_ACTIVATED_EVENT, {});
+    auditService.insertWorkspaceEvent(CUSTOM_DOMAIN_ACTIVATED_EVENT, {});
 
     // Track an object event
-    analytics.createObjectEvent(OBJECT_RECORD_CREATED_EVENT, {
+    auditService.createObjectEvent(OBJECT_RECORD_CREATED_EVENT, {
       recordId: 'record-id',
       objectMetadataId: 'object-metadata-id',
       // other properties
     });
 
     // Track a pageview
-    analytics.createPageviewEvent('page-name', {
+    auditService.createPageviewEvent('page-name', {
       href: '/path',
       locale: 'en-US',
       // other properties

packages/twenty-server/src/engine/core-modules/audit/jobs/create-audit-log-from-internal-event.ts

@@ -26,26 +26,26 @@ export class CreateAuditLogFromInternalEvent {
             }
           : eventData.properties;
 
-      const analytics = this.auditService.createContext({
+      const auditService = this.auditService.createContext({
         workspaceId: workspaceEventBatch.workspaceId,
         userId: eventData.userId,
       });
 
       // Since these are object record events, we use createObjectEvent
       if (workspaceEventBatch.name.endsWith('.updated')) {
-        analytics.createObjectEvent(OBJECT_RECORD_UPDATED_EVENT, {
+        auditService.createObjectEvent(OBJECT_RECORD_UPDATED_EVENT, {
           ...eventProperties,
           recordId: eventData.recordId,
           objectMetadataId: eventData.objectMetadata.id,
         });
       } else if (workspaceEventBatch.name.endsWith('.created')) {
-        analytics.createObjectEvent(OBJECT_RECORD_CREATED_EVENT, {
+        auditService.createObjectEvent(OBJECT_RECORD_CREATED_EVENT, {
           ...eventProperties,
           recordId: eventData.recordId,
           objectMetadataId: eventData.objectMetadata.id,
         });
       } else if (workspaceEventBatch.name.endsWith('.deleted')) {
-        analytics.createObjectEvent(OBJECT_RECORD_DELETED_EVENT, {
+        auditService.createObjectEvent(OBJECT_RECORD_DELETED_EVENT, {
           ...eventProperties,
           recordId: eventData.recordId,
           objectMetadataId: eventData.objectMetadata.id,

packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts

@@ -641,12 +641,12 @@ export class AuthResolver {
   ): Promise<void> {
     const { impersonatorUserId } = tokenPayload;
 
-    const analytics = this.auditService.createContext({
+    const auditService = this.auditService.createContext({
       workspaceId: workspace.id,
       userId: impersonatorUserId,
     });
 
-    await analytics.insertWorkspaceEvent(MONITORING_EVENT, {
+    await auditService.insertWorkspaceEvent(MONITORING_EVENT, {
       eventName: 'server.impersonation.token_exchange_attempt',
       message: `Impersonation token exchange attempt for ${targetUserEmail} by ${impersonatorUserId}`,
     });
@@ -659,7 +659,7 @@ export class AuthResolver {
     }
 
     if (!impersonatorUserId) {
-      await analytics.insertWorkspaceEvent(MONITORING_EVENT, {
+      await auditService.insertWorkspaceEvent(MONITORING_EVENT, {
         eventName: 'server.impersonation.token_exchange_failed',
         message: `Invalid impersonation token (missing impersonator user ID) for ${targetUserEmail}`,
       });
@@ -674,7 +674,7 @@ export class AuthResolver {
     });
 
     if (!impersonatorUser) {
-      await analytics.insertWorkspaceEvent(MONITORING_EVENT, {
+      await auditService.insertWorkspaceEvent(MONITORING_EVENT, {
         eventName: 'server.impersonation.token_exchange_failed',
         message: `Impersonator user not found: ${impersonatorUserId} for ${targetUserEmail}`,
       });
@@ -685,7 +685,7 @@ export class AuthResolver {
     }
 
     if (impersonatorUser.canImpersonate !== true) {
-      await analytics.insertWorkspaceEvent(MONITORING_EVENT, {
+      await auditService.insertWorkspaceEvent(MONITORING_EVENT, {
         eventName: 'server.impersonation.token_exchange_failed',
         message: `User not authorized to impersonate: ${impersonatorUserId} for ${targetUserEmail}`,
       });
@@ -702,12 +702,12 @@ export class AuthResolver {
     workspaceId: string,
     impersonatorUserId: string,
   ): Promise<void> {
-    const analytics = this.auditService.createContext({
+    const auditService = this.auditService.createContext({
       workspaceId,
       userId: impersonatorUserId,
     });
 
-    await analytics.insertWorkspaceEvent(MONITORING_EVENT, {
+    await auditService.insertWorkspaceEvent(MONITORING_EVENT, {
       eventName: 'server.impersonation.login_token_exchanged',
       message: 'Impersonation token exchanged',
     });

packages/twenty-server/src/engine/core-modules/auth/token/services/renew-token.service.ts

@@ -59,6 +59,7 @@ export class RenewTokenService {
       targetedTokenTypeFromPayload ?? JwtTokenTypeEnum.ACCESS;
 
     // Support legacy tokens where authProvider might be undefined
+    // TODO: remove in November 2025
     const resolvedAuthProvider = authProvider ?? AuthProviderEnum.Password;
 
     const accessToken =

packages/twenty-server/src/engine/core-modules/domain-manager/controllers/cloudflare.controller.ts

@@ -71,7 +71,7 @@ export class CloudflareController {
 
       if (!workspace) return;
 
-      const analytics = this.auditService.createContext({
+      const auditService = this.auditService.createContext({
         workspaceId: workspace.id,
       });
 
@@ -100,7 +100,10 @@ export class CloudflareController {
           ...workspaceUpdated,
         });
 
-        await analytics.insertWorkspaceEvent(CUSTOM_DOMAIN_ACTIVATED_EVENT, {});
+        await auditService.insertWorkspaceEvent(
+          CUSTOM_DOMAIN_ACTIVATED_EVENT,
+          {},
+        );
       }
 
       return res.status(200).send();

packages/twenty-server/src/engine/core-modules/domain-manager/services/custom-domain.service.ts

@@ -199,11 +199,11 @@ export class CustomDomainService {
 
       await this.workspaceRepository.save(workspace);
 
-      const analytics = this.auditService.createContext({
+      const auditService = this.auditService.createContext({
         workspaceId: workspace.id,
       });
 
-      analytics.insertWorkspaceEvent(
+      auditService.insertWorkspaceEvent(
         workspace.isCustomDomainEnabled
           ? CUSTOM_DOMAIN_ACTIVATED_EVENT
           : CUSTOM_DOMAIN_DEACTIVATED_EVENT,

packages/twenty-server/src/engine/core-modules/webhook/jobs/call-webhook.job.ts

@@ -48,7 +48,7 @@ export class CallWebhookJob {
       webhookId: data.webhookId,
       eventName: data.eventName,
     };
-    const analytics = this.auditService.createContext({
+    const auditService = this.auditService.createContext({
       workspaceId: data.workspaceId,
     });
 
@@ -79,13 +79,13 @@ export class CallWebhookJob {
 
       const success = response.status >= 200 && response.status < 300;
 
-      analytics.insertWorkspaceEvent(WEBHOOK_RESPONSE_EVENT, {
+      auditService.insertWorkspaceEvent(WEBHOOK_RESPONSE_EVENT, {
         status: response.status,
         success,
         ...commonPayload,
       });
     } catch (err) {
-      analytics.insertWorkspaceEvent(WEBHOOK_RESPONSE_EVENT, {
+      auditService.insertWorkspaceEvent(WEBHOOK_RESPONSE_EVENT, {
         success: false,
         ...commonPayload,
         ...(err.response && { status: err.response.status }),