From: MichaelMorris <michael.morris@est.tech>
Date: Mon, 22 Aug 2022 10:05:42 +0000 (+0100)
Subject: Fix use of encrypted user in backend
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4cc1d594570bfd5d2eba32453ef632c0b07a575d;p=sdc.git

Fix use of encrypted user in backend

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-4141
Change-Id: I4ebef3cb44eee6d15cde7ae1e2c88fa91ac6ff20
(cherry picked from commit 12af6a010abc5e12030933e9d192ed712dfc99cb)
---

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/ThreadLocalUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/ThreadLocalUtils.java
index d895b694f5..1cd84d02a7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/ThreadLocalUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/ThreadLocalUtils.java
@@ -83,7 +83,7 @@ public class ThreadLocalUtils implements IUsersThreadLocalHolder {
     private void updateUserContext(String user_id) {
         User user = userBusinessLogic.getUser(user_id, false);
         Set<String> roles = new HashSet<>(Arrays.asList(user.getRole()));
-        UserContext userContext = new UserContext(user_id, roles, user.getFirstName(), user.getLastName());
+        UserContext userContext = new UserContext(user.getUserId(), roles, user.getFirstName(), user.getLastName());
         ThreadLocalsHolder.setUserContext(userContext);
     }
 }