From 79e64ca3a6cf55df5a1091be921d97745869f461 Mon Sep 17 00:00:00 2001
From: ayushaga14 <ayush@akto.io>
Date: Thu, 11 Jan 2024 14:49:06 +0530
Subject: [PATCH 1/2] wordlist fix

---
 .../java/com/akto/test_editor/execution/VariableResolver.java  | 2 +-
 .../main/java/com/akto/test_editor/filter/FilterAction.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/testing/src/main/java/com/akto/test_editor/execution/VariableResolver.java b/apps/testing/src/main/java/com/akto/test_editor/execution/VariableResolver.java
index 97d972ae22..89bca29370 100644
--- a/apps/testing/src/main/java/com/akto/test_editor/execution/VariableResolver.java
+++ b/apps/testing/src/main/java/com/akto/test_editor/execution/VariableResolver.java
@@ -230,7 +230,7 @@ public static String resolveAuthContext(String expression, Map<String, List<Stri
     }
 
     public static Boolean isWordListVariable(Object key, Map<String, Object> varMap) {
-        if (key == null || !(key instanceof String)) {
+        if (key == null) {
             return false;
         }
 
diff --git a/apps/testing/src/main/java/com/akto/test_editor/filter/FilterAction.java b/apps/testing/src/main/java/com/akto/test_editor/filter/FilterAction.java
index badede504b..de9fe11360 100644
--- a/apps/testing/src/main/java/com/akto/test_editor/filter/FilterAction.java
+++ b/apps/testing/src/main/java/com/akto/test_editor/filter/FilterAction.java
@@ -623,7 +623,8 @@ public void extractQueryParams(FilterActionRequest filterActionRequest, Map<Stri
 
         Object val = null;
         List<String> querySet = (List<String>) filterActionRequest.getQuerySet();
-        String key = querySet.get(0);
+        Object k = querySet.get(0);
+        String key = k.toString();
 
         String queryParams = rawApi.getRequest().getQueryParams();
         String url = filterActionRequest.getApiInfoKey().getUrl();

From b3bfd9603c6ad61261af1a9ad7b1c062905fd13a Mon Sep 17 00:00:00 2001
From: ayushaga14 <ayush@akto.io>
Date: Thu, 11 Jan 2024 15:57:05 +0530
Subject: [PATCH 2/2] fix

---
 .../com/akto/test_editor/execution/VariableResolver.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/testing/src/main/java/com/akto/test_editor/execution/VariableResolver.java b/apps/testing/src/main/java/com/akto/test_editor/execution/VariableResolver.java
index 89bca29370..944d469764 100644
--- a/apps/testing/src/main/java/com/akto/test_editor/execution/VariableResolver.java
+++ b/apps/testing/src/main/java/com/akto/test_editor/execution/VariableResolver.java
@@ -363,7 +363,7 @@ public static Map<String, List<String>> resolveWordList(Map<String, List<String>
     }
 
 
-    public static void resolveWordList(Map<String, Object> varMap, Map<ApiInfoKey, List<String>>  sampleDataMap, ApiInfo.ApiInfoKey apiInfoKey) {
+    public static void resolveWordList(Map<String, Object> varMap, Map<ApiInfoKey, List<String>> sampleDataMap, ApiInfo.ApiInfoKey apiInfoKey) {
 
         for (String k: varMap.keySet()) {
             if (!k.contains("wordList_")) {
@@ -404,9 +404,9 @@ public static void resolveWordList(Map<String, Object> varMap, Map<ApiInfoKey, L
                     if (infoKey.getApiCollectionId() != apiInfoKey.getApiCollectionId()) {
                         continue;
                     }
-                    if (infoKey.equals(apiInfoKey)) {
-                        sample.remove(0);
-                    }
+                    // if (infoKey.equals(apiInfoKey)) {
+                    //     sample.remove(0);
+                    // }
                     modifiedSampleDataMap.put(infoKey, sample);
                 }
             } else {