insatnce_zone_id

Author: Tanishka Jain

server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/UserAttributeChangesSnsHandler.java

@@ -187,11 +187,8 @@ private Map<String, Object> createUserEventMessage(UaaUser user, Map<String, Obj
         // Include username instead of user UUID
         message.put("username", user.getUsername());
 
-        // Include identity provider ID
-        String identityProviderId = getIdentityProviderId(user);
-        if (identityProviderId != null) {
-            message.put("identityProviderId", identityProviderId);
-        }
+        // Include identity zone ID
+        message.put("identityZoneId", user.getZoneId());
 
         // Add only the changed fields
         message.put("changedFields", changedFields);
@@ -209,24 +206,4 @@ private String determineEventType(Map<String, Object> changedFields) {
             return "USER_DATA_UPDATED";
         }
     }
-
-    /**
-     * Retrieves the identity provider ID based on the user's zone ID and origin
-     * Following the relationship:
-     * SELECT id FROM identity_provider WHERE identity_zone_id = user.zoneId AND
-     * origin_key = user.origin
-     */
-    private String getIdentityProviderId(UaaUser user) {
-        try {
-            IdentityProvider identityProvider = identityProviderProvisioning.retrieveByOrigin(
-                    user.getOrigin(),
-                    user.getZoneId());
-            return identityProvider.getId();
-        } catch (Exception e) {
-            logger.warn("Failed to retrieve identity provider ID for user: {} (origin: {}, zoneId: {}). Error: {}",
-                    user.getUsername(), user.getOrigin(), user.getZoneId(), e.getMessage());
-            return null;
-        }
-    }
-
 }