decrypt user for requests

COS301-SE-2023 · Oct 20, 2023 · 5b23285 · 5b23285
1 parent ba34388
commit 5b23285
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...safe_backend/src/main/java/com/fragile/infosafe/primary/service/AccessRequestService.java b/...safe_backend/src/main/java/com/fragile/infosafe/primary/service/AccessRequestService.java
@@ -54,7 +54,7 @@ public List<AccessRequest> getAllAccessRequests() {
             decryptedCurrentAssignee.setFirst_name(encryptionService.decryptString(currentAssignee.getFirst_name()));
             decryptedCurrentAssignee.setLast_name(encryptionService.decryptString(currentAssignee.getLast_name()));
             decryptedCurrentAssignee.setRole(currentAssignee.getRole());
-            accessRequest.setUser_id(currentAssignee);
+            accessRequest.setUser_id(decryptedCurrentAssignee);
         }
         return ar;
     }

diff --git a/...osafe_backend/src/main/java/com/fragile/infosafe/primary/service/AssetRequestService.java b/...osafe_backend/src/main/java/com/fragile/infosafe/primary/service/AssetRequestService.java
@@ -64,7 +64,7 @@ public List<AssetRequests> getAllAssetRequests() {
             decryptedCurrentAssignee.setFirst_name(encryptionService.decryptString(currentAssignee.getFirst_name()));
             decryptedCurrentAssignee.setLast_name(encryptionService.decryptString(currentAssignee.getLast_name()));
             decryptedCurrentAssignee.setRole(currentAssignee.getRole());
-            assetRequests.setUser(currentAssignee);
+            assetRequests.setUser(decryptedCurrentAssignee);
         }
         return ar;
     }

diff --git a/...afe_backend/src/main/java/com/fragile/infosafe/primary/service/SupportRequestService.java b/...afe_backend/src/main/java/com/fragile/infosafe/primary/service/SupportRequestService.java
@@ -72,7 +72,7 @@ public List<SupportRequest> getAllSupportRequests() {
             decryptedCurrentAssignee.setFirst_name(encryptionService.decryptString(currentAssignee.getFirst_name()));
             decryptedCurrentAssignee.setLast_name(encryptionService.decryptString(currentAssignee.getLast_name()));
             decryptedCurrentAssignee.setRole(currentAssignee.getRole());
-            supportRequest.setUser_id(currentAssignee);
+            supportRequest.setUser_id(decryptedCurrentAssignee);
         }
         return sr;
     }
@@ -118,7 +118,7 @@ public List<SupportRequest> getUserSupportRequests(int user_id) {
             decryptedCurrentAssignee.setFirst_name(encryptionService.decryptString(currentAssignee.getFirst_name()));
             decryptedCurrentAssignee.setLast_name(encryptionService.decryptString(currentAssignee.getLast_name()));
             decryptedCurrentAssignee.setRole(currentAssignee.getRole());
-            supportRequest.setUser_id(currentAssignee);
+            supportRequest.setUser_id(decryptedCurrentAssignee);
         }
         return sr;
     }