From c5a8a874a97e20c67db49ea12b948cfb4d8c508e Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 25 Nov 2025 17:00:29 +0200
Subject: [PATCH] refacotring to be in sync with PE

---
 .../edge/rpc/processor/user/BaseUserProcessor.java        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java
index fe640505b1..a742d83ada 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java
@@ -47,8 +47,12 @@ public abstract class BaseUserProcessor extends BaseEdgeProcessor {
             }
 
             User userById = edgeCtx.getUserService().findUserById(tenantId, userId);
-            isCreated = userById == null;
-            user.setId(isCreated ? null : userId);
+            if (userById == null) {
+                isCreated = true;
+                user.setId(null);
+            } else {
+                user.setId(userId);
+            }
 
             String userEmail = user.getEmail();
             User existing = edgeCtx.getUserService().findUserByTenantIdAndEmail(tenantId, user.getEmail());