From 5137fffb5622650c0036ed6250922975e4c78ac8 Mon Sep 17 00:00:00 2001
From: Ermis Wieger <ermis.wieger@nttdata.com>
Date: Tue, 20 Aug 2024 12:16:55 +0200
Subject: [PATCH] refactored imporsanate user

---
 .../main/java/com/nttdata/calender/api/RemedyJavaAPI.java  | 4 ----
 .../com/nttdata/calender/api/rsso/RssoInterceptor.java     | 7 ++++++-
 .../main/java/com/nttdata/calender/approval/Approval.java  | 4 ++--
 .../main/java/com/nttdata/calender/presets/Presets.java    | 2 +-
 .../com/nttdata/calender/supportgroup/SupportGroup.java    | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/com/nttdata/calender/api/RemedyJavaAPI.java b/backend/src/main/java/com/nttdata/calender/api/RemedyJavaAPI.java
index 575df19..2189d13 100644
--- a/backend/src/main/java/com/nttdata/calender/api/RemedyJavaAPI.java
+++ b/backend/src/main/java/com/nttdata/calender/api/RemedyJavaAPI.java
@@ -85,10 +85,6 @@ public class RemedyJavaAPI {
 	 * @throws ARException when the user is unknown
 	 */
 	public void impersonateUser(String userName) throws ARException {
-
-		if(!this.appConfig.getRssoActive())
-			server.impersonateUser("WuiQualityKV");
-
 		server.impersonateUser(userName);
 	}
 
diff --git a/backend/src/main/java/com/nttdata/calender/api/rsso/RssoInterceptor.java b/backend/src/main/java/com/nttdata/calender/api/rsso/RssoInterceptor.java
index 144c0f7..73a9f4e 100644
--- a/backend/src/main/java/com/nttdata/calender/api/rsso/RssoInterceptor.java
+++ b/backend/src/main/java/com/nttdata/calender/api/rsso/RssoInterceptor.java
@@ -10,6 +10,7 @@ import org.springframework.web.servlet.HandlerInterceptor;
 import com.bmc.thirdparty.org.springframework.beans.factory.annotation.Autowired;
 
 import com.nttdata.calender.ApplicationConfig;
+import com.nttdata.calender.api.RemedyJavaAPI;
 /**
  * Interceptor for handling Rsso related operations.
  */
@@ -19,11 +20,14 @@ public class RssoInterceptor implements HandlerInterceptor {
     private final Rsso rsso;
     private static final Logger applicationLogger = LogManager.getLogger("application");
     private ApplicationConfig appConfig;
+    //EW env Fix
+    private final RemedyJavaAPI javaAPI;
 
     @Autowired
-    public RssoInterceptor(Rsso rsso, ApplicationConfig appConfig) {
+    public RssoInterceptor(Rsso rsso, ApplicationConfig appConfig, RemedyJavaAPI javaAPI) {
         this.rsso = rsso;
         this.appConfig=appConfig;
+        this.javaAPI=javaAPI;
     }
 
     /**
@@ -43,6 +47,7 @@ public class RssoInterceptor implements HandlerInterceptor {
             throws Exception {
         // Check if a session exists, create one if not
         if (!this.appConfig.getRssoActive()) {
+            this.javaAPI.impersonateUser("WuiQualityKV");
             return true;
         }
 
diff --git a/backend/src/main/java/com/nttdata/calender/approval/Approval.java b/backend/src/main/java/com/nttdata/calender/approval/Approval.java
index f843d82..5ab33bf 100644
--- a/backend/src/main/java/com/nttdata/calender/approval/Approval.java
+++ b/backend/src/main/java/com/nttdata/calender/approval/Approval.java
@@ -49,8 +49,8 @@ public class Approval {
     public String update(ApprovalUpdateRequest request) throws ARException {
         // Clear the list before processing a new request
         listOfFieldValues.clear();
-
-        remedyJavaAPI.impersonateUser("WuiQualityKV");
+         
+        //remedyJavaAPI.impersonateUser("WuiQualityKV");
         String action = "APPROVAL";
 
         var queryUpdate = new Query.QueryBuilder("ASF:CHG_CAL_Interactions")
diff --git a/backend/src/main/java/com/nttdata/calender/presets/Presets.java b/backend/src/main/java/com/nttdata/calender/presets/Presets.java
index 8dac690..f2f646e 100644
--- a/backend/src/main/java/com/nttdata/calender/presets/Presets.java
+++ b/backend/src/main/java/com/nttdata/calender/presets/Presets.java
@@ -58,7 +58,7 @@ public class Presets {
                 this.presets = new ArrayList<>();
                 this.listOfFieldValues = new ArrayList<>();
 
-                api.impersonateUser("WuiQualityKV");
+                //api.impersonateUser("WuiQualityKV");
         }
 
         /**
diff --git a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java
index e8972c4..b141862 100644
--- a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java
+++ b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java
@@ -51,7 +51,7 @@ public class SupportGroup {
      */
     public void querySupportGroups(RemedyJavaAPI api) throws ARException, NotFoundError {
 
-        api.impersonateUser("WuiQualityKV");
+        //api.impersonateUser("WuiQualityKV");
 
         applicationLogger.info("\n\n\nRequest: querySupportGroups (Initial)\nUser: " + api.getUser() + "\nAdmin? "
                 + (api.isAdministrator() ? "Yes" : "No"));
@@ -112,7 +112,7 @@ public class SupportGroup {
      * @throws ARException if an error occurs during the query
      */
     public void queryUserSupportGroup(RemedyJavaAPI api) throws ARException {
-        api.impersonateUser("WuiQualityKV");
+        //api.impersonateUser("WuiQualityKV");
 
         var querySupportGroups = new Query.QueryBuilder("CTM:Support Group Association")
                 .addFieldId("SupportGroupId", 1000000079).build();