Normalization and better search-data construction

- construct search data without using the array_merge function
- normalize the query
- normalize search data

Author: Dominik Frantisek Bucik

composer.json

@@ -32,6 +32,7 @@
         "ext-curl": "*",
         "ext-json": "*",
         "ext-openssl": "*",
+        "ext-iconv": "*",
         "web-token/jwt-key-mgmt": "^2.2",
         "web-token/jwt-signature": "^2.2",
         "web-token/jwt-signature-algorithm-rsa": "^2.2",

lib/Disco.php

@@ -2,6 +2,7 @@
 
 namespace SimpleSAML\Module\perun;
 
+use Normalizer;
 use SimpleSAML\Module\discopower\PowerIdPDisco;
 use SimpleSAML\Utils\HTTP;
 use SimpleSAML\Error\Exception;
@@ -793,13 +794,13 @@ private static function arrayFlatten($array): array
         if (is_array($array)) {
             foreach ($array as $key => $value) {
                 if (is_array($value)) {
-                    $return = array_merge($return, self::arrayFlatten($value));
+                    $return = [ ...$return, ...self::arrayFlatten($value)];
                 } else {
-                    $return[$key] = $value;
+                    $return = [ ...$return, $value];
                 }
             }
         } else {
-            $return = [ $array ];
+            $return = [$array];
         }
         return $return;
     }
@@ -817,11 +818,11 @@ private static function constructSearchData($idpMetadata): string
 
         foreach ($keys as $key) {
             if (!empty($idpMetadata[$key])) {
-                $dataSearchKeys = arra($dataSearchKeys, self::arrayFlatten($idpMetadata[$key]));
+                $dataSearchKeys = [...$dataSearchKeys, ...self::arrayFlatten($idpMetadata[$key])];
             }
         }
         $res .= (' ' . implode(' ', $dataSearchKeys));
 
-        return strtolower(str_replace('"', '', $res));
+        return strtolower(str_replace('"', '', iconv('UTF-8', 'US-ASCII//TRANSLIT', $res)));
     }
 }

www/res/js/disco.js

@@ -11,9 +11,15 @@ $(document).ready(function() {
         $("#entries").show();
     }
 
+    $("#showEntries").click(function() {
+        $("#last-used-idp-wrap").hide();
+        $("#entries").show();
+        $("#showEntries").hide();
+    });
+
     let forceShow = false
     $('#query').keyup(function() {
-        const filter = $(this).val().trim().toLowerCase();
+        const filter = $(this).val().trim().toLowerCase().normalize("NFD").replace(/\p{Diacritic}/gu, "")
         if (!filter) {
             hideAll();
             forceShow = false;