From 8d3b02e66d17a22be58b70e699f0be8cb122a44a Mon Sep 17 00:00:00 2001
From: Carlos Monastyrski <charly.monastyrski@gmail.com>
Date: Fri, 14 Nov 2025 17:46:19 -0300
Subject: [PATCH] Address PR suggestions

---
 .../ee/services/audit-log/audit-log-types.ts  |  9 +------
 .../src/services/auth/auth-login-service.ts   | 24 +++++++------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.ts
index 0d5182097..57f7bc68f 100644
--- a/backend/src/ee/services/audit-log/audit-log-types.ts
+++ b/backend/src/ee/services/audit-log/audit-log-types.ts
@@ -572,6 +572,7 @@ interface UserActorMetadata {
   email?: string | null;
   username: string;
   permission?: Record<string, unknown>;
+  authMethod?: string;
 }
 
 interface ServiceActorMetadata {
@@ -2662,10 +2663,6 @@ interface OrgAdminBypassSSOEvent {
 interface UserLoginEvent {
   type: EventType.USER_LOGIN;
   metadata: {
-    email: string;
-    userAgent: string;
-    ipAddress: string;
-    authMethod: string;
     organizationId?: string;
     organizationName?: string;
     authProvider?: string;
@@ -2675,12 +2672,8 @@ interface UserLoginEvent {
 interface SelectOrganizationEvent {
   type: EventType.SELECT_ORGANIZATION;
   metadata: {
-    email: string;
-    userAgent: string;
-    ipAddress: string;
     organizationId: string;
     organizationName: string;
-    authMethod: string;
   };
 }
 
diff --git a/backend/src/services/auth/auth-login-service.ts b/backend/src/services/auth/auth-login-service.ts
index 8895933e8..e2f0f5f16 100644
--- a/backend/src/services/auth/auth-login-service.ts
+++ b/backend/src/services/auth/auth-login-service.ts
@@ -465,16 +465,14 @@ export const authLoginServiceFactory = ({
             metadata: {
               email: userEnc.email,
               userId: userEnc.userId,
-              username: userEnc.username
+              username: userEnc.username,
+              authMethod
             }
           },
           event: {
             type: EventType.USER_LOGIN,
             metadata: {
-              email,
-              userAgent,
-              ipAddress: ip,
-              authMethod
+              organizationId
             }
           }
         });
@@ -682,18 +680,15 @@ export const authLoginServiceFactory = ({
         metadata: {
           email: user.email,
           userId: user.id,
-          username: user.username
+          username: user.username,
+          authMethod: decodedToken.authMethod
         }
       },
       event: {
         type: EventType.SELECT_ORGANIZATION,
         metadata: {
-          email: user.email || "",
-          userAgent,
-          ipAddress,
           organizationId,
-          organizationName: selectedOrg.name,
-          authMethod: decodedToken.authMethod
+          organizationName: selectedOrg.name
         }
       }
     });
@@ -1102,16 +1097,13 @@ export const authLoginServiceFactory = ({
           metadata: {
             email: userEnc.email,
             userId: userEnc.userId,
-            username: userEnc.username
+            username: userEnc.username,
+            authMethod: decodedProviderToken.authMethod
           }
         },
         event: {
           type: EventType.USER_LOGIN,
           metadata: {
-            email,
-            userAgent,
-            ipAddress: ip,
-            authMethod: decodedProviderToken.authMethod,
             organizationId,
             ...(isAuthMethodSaml(decodedProviderToken.authMethod) && {
               authProvider: decodedProviderToken.authMethod