From b65085d75802029b47fa6a96ee5beed66007d26c Mon Sep 17 00:00:00 2001
From: aji-aju <ajithprasad770@gmail.com>
Date: Fri, 20 Jun 2025 18:14:34 +0530
Subject: [PATCH] Scim Bot can update display name

---
 .../org/openmetadata/service/jdbi3/EntityRepository.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
index 83c6819d507..1c5295d501b 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
@@ -3339,7 +3339,10 @@ public abstract class EntityRepository<T extends EntityInterface> {
     }
 
     private void updateDisplayName() {
-      if (operation.isPut() && !nullOrEmpty(original.getDisplayName()) && updatedByBot()) {
+      if (operation.isPut()
+          && !nullOrEmpty(original.getDisplayName())
+          && updatedByBot()
+          && isNotScimBot()) {
         // Revert change to non-empty displayName if it is being updated by a bot
         updated.setDisplayName(original.getDisplayName());
         return;
@@ -4125,6 +4128,10 @@ public abstract class EntityRepository<T extends EntityInterface> {
           daoCollection.entityExtensionDAO().getExtension(original.getId(), extensionName);
       return JsonUtils.readValue(json, entityClass);
     }
+
+    private boolean isNotScimBot() {
+      return !"scim-bot".equalsIgnoreCase(this.updatingUser.getName());
+    }
   }
 
   /**