From a36716c8b92ddef0199fb4ba35a9c71e8a4f8901 Mon Sep 17 00:00:00 2001
From: Chinmoy Chakraborty <chinmoy12c@gmail.com>
Date: Mon, 27 Nov 2023 13:57:35 +0530
Subject: [PATCH] Fixed incorrect construction of deviceString in
 resolveUser().

---
 pom.xml                                                     | 6 +++---
 .../java/com/uci/orchestrator/Service/CommonService.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0ae28bc..9ecc091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,9 @@
 
 	<properties>
 		<java.version>11</java.version>
-		<utils.version>2.3.0-SNAPSHOT</utils.version>
-		<messagerosa.version>2.3.0-SNAPSHOT</messagerosa.version>
-		<dao.version>2.3.0-SNAPSHOT</dao.version>
+		<utils.version>2.4.0</utils.version>
+		<messagerosa.version>2.3.0</messagerosa.version>
+		<dao.version>2.3.0</dao.version>
 	</properties>
 
 	<!-- For Downloading repositories from github packages -->
diff --git a/src/main/java/com/uci/orchestrator/Service/CommonService.java b/src/main/java/com/uci/orchestrator/Service/CommonService.java
index f1fa869..1f2cede 100644
--- a/src/main/java/com/uci/orchestrator/Service/CommonService.java
+++ b/src/main/java/com/uci/orchestrator/Service/CommonService.java
@@ -321,7 +321,7 @@ public Mono<XMessage> resolveUser(XMessage xmsg, String appId) {
 
             UUID appID = UUID.fromString(appId);
 
-            String deviceString = from.getDeviceType().toString() + ":" + from.getUserID();
+            String deviceString = from.getUserID();
             String encodedBase64Key = encodeKey(secret);
             String deviceID = AESWrapper.encrypt(deviceString, encodedBase64Key);
             log.info("ReactiveConsumer:resolveUser::Calling:deviceString: " + deviceString + ", encyprted deviceString: " + deviceID);