Merge pull request #326 from holashchand/issue-1013

[BUG]: fixed decryption in list entity api
Sunbird-RC · May 27, 2024 · b3ded1d · b3ded1d
2 parents 976bb45 + bb8ca94
commit b3ded1d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/java/registry/src/main/java/dev/sunbirdrc/registry/service/DecryptionHelper.java b/java/registry/src/main/java/dev/sunbirdrc/registry/service/DecryptionHelper.java
@@ -22,6 +22,10 @@ public JsonNode getDecryptedJson(JsonNode rootNode) throws EncryptionException {
         return objectNode;
     }
 
+    public JsonNode getDecryptedJson(String entityType, JsonNode data) throws EncryptionException {
+        return process(data, entityType, null);
+    }
+
     protected Map<String, Object> performOperation(Map<String, Object> plainMap) throws EncryptionException {
         return encryptionService.decrypt(plainMap);
     }

diff --git a/java/registry/src/main/java/dev/sunbirdrc/registry/service/NativeSearchService.java b/java/registry/src/main/java/dev/sunbirdrc/registry/service/NativeSearchService.java
@@ -84,6 +84,12 @@ public class NativeSearchService implements ISearchService {
 	@Value("${search.removeNonPublicFieldsForNativeSearch:true}")
 	private boolean removeNonPublicFieldsForNativeSearch;
 
+	@Autowired(required = false)
+	private DecryptionHelper decryptionHelper;
+
+	@Value("${encryption.enabled}")
+	private boolean encryptionEnabled;
+
 	@Override
 	public JsonNode search(JsonNode inputQueryNode, String userId) throws IOException {
 		return search(inputQueryNode, userId, false);
@@ -167,6 +173,10 @@ private ObjectNode removeNonPublicFields(SearchQuery searchQuery, ObjectNode sha
 				for(JsonNode node : arrayNode) {
 					data.add(JSONUtil.removeNodesByPath(node, definitionsManager.getExcludingFieldsForEntity(entityType)));
 				}
+			} else if (encryptionEnabled) {
+				for(JsonNode node : arrayNode) {
+					data.add(decryptionHelper.getDecryptedJson(entityType, node));
+				}
 			} else {
 				data = arrayNode;
 			}