fix: encode global search keywords

globalfund · Nov 22, 2023 · f78188e · f78188e
1 parent 272968c
commit f78188e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/controllers/global-search.controller.ts b/src/controllers/global-search.controller.ts
@@ -82,18 +82,17 @@ export class GlobalSearchController {
       globalSearchMapping.categories,
       (category: any) => category.url.length > 0,
     ).map((category: any) => {
-      return axios.get(
-        category.url
-          .replace(
-            '<filterStr>',
-            buildGlobalSearchFilterString(
-              category.filterFields,
-              category.filterTemplate,
-              keywords,
-            ),
-          )
-          .replace('<keyword>', keyword),
-      );
+      const call = category.url
+        .replace(
+          '<filterStr>',
+          buildGlobalSearchFilterString(
+            category.filterFields,
+            category.filterTemplate,
+            keywords,
+          ),
+        )
+        .replace('<keyword>', keyword);
+      return axios.get(call);
     });
     return axios
       .all(calls)

diff --git a/src/utils/filtering/globalsearch/index.ts b/src/utils/filtering/globalsearch/index.ts
@@ -9,7 +9,12 @@ export function buildGlobalSearchFilterString(
 
   keywords.forEach((keyword: string) => {
     const fieldStrArray: string[] = fields.map((field: string) =>
-      template.replace('<field>', field).replace('<value>', `'${keyword}'`),
+      template
+        .replace('<field>', field)
+        .replace(
+          '<value>',
+          `'${encodeURIComponent(keyword.replace(/'/g, "''"))}'`,
+        ),
     );
     strArray.push(`(${fieldStrArray.join(` ${filteringUtils.or_operator} `)})`);
   });