Fixed integration tests. Allowed autocomplete custom was missing in t…

…he test cfg.
dataquest-dev · Nov 5, 2024 · 967734c · 967734c
1 parent 1d81001
commit 967734c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/dspace-api/src/test/data/dspaceFolder/config/local.cfg b/dspace-api/src/test/data/dspaceFolder/config/local.cfg
@@ -313,4 +313,5 @@ webui.supported.locales = en
 submit.type-bind.field = dc.type,dc.identifier.citation=>dc.title
 
 autocomplete.custom.separator.solr-subject_ac = \\|\\|\\|
-autocomplete.custom.separator.solr-title_ac = \\|\\|\\|
+autocomplete.custom.separator.solr-title_ac = \\|\\|\\|
+autocomplete.custom.allowed = solr-author_ac,solr-publisher_ac,solr-dataProvider_ac,solr-dctype_ac,solr-subject_ac,solr-handle_title_ac,json_static-iso_langs.json,solr-title_ac
diff --git a/...-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionRestController.java b/...-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionRestController.java
@@ -382,13 +382,16 @@ private boolean isAllowedSearching(String autocompleteCustom) {
         String[] allowedAutocompleteCustom = configurationService.getArrayProperty("autocomplete.custom.allowed",
                 new String[0]);
 
+        // Remove `?query` from the autocompleteCustom parameter if it contains this specific query parameter
+        String normalizedAutocompleteCustom = updateAutocompleteAndQuery(autocompleteCustom, null);
+
         // If the allowedAutocompleteCustom parameter is not defined, return false
         if (Objects.isNull(allowedAutocompleteCustom)) {
             return false;
         }
 
         // Convert the allowedAutocompleteCustom array to a list
         List<String> allowedAutocompleteCustomList = Arrays.asList(allowedAutocompleteCustom);
-        return allowedAutocompleteCustomList.contains(autocompleteCustom);
+        return allowedAutocompleteCustomList.contains(normalizedAutocompleteCustom);
     }
 }