Merge branch 'jurisdiction_fix' into 'main'

fix:  Reworked how Jurisdiction is read

See merge request perun-proxy-aai/simplesamlphp/simplesamlphp-module-elixir!38

lib/ConsentHelper.php

@@ -5,54 +5,60 @@ namespace SimpleSAML\Module\elixir;
 class ConsentHelper
 {
     private const EU_EAA = [
-        'AT' => 'Austria',
-        'BE' => 'Belgium',
-        'BG' => 'Bulgaria',
-        'HR' => 'Croatia',
-        'CY' => 'Cyprus',
-        'CZ' => 'Czech Republic',
-        'DK' => 'Denmark',
-        'EE' => 'Estonia',
-        'FI' => 'Finland',
-        'FR' => 'France',
-        'DE' => 'Germany',
-        'EL' => 'Greece',
-        'HU' => 'Hungary',
-        'IE' => 'Ireland',
-        'IT' => 'Italy',
-        'LV' => 'Latvia',
-        'LT' => 'Lithuania',
-        'LU' => 'Luxembourg',
-        'MT' => 'Malta',
-        'NL' => 'Netherlands',
-        'PT' => 'Portugal',
-        'RO' => 'Romania',
-        'SK' => 'Slovakia',
-        'SI' => 'Slovenia',
-        'ES' => 'Spain',
-        'SE' => 'Sweden',
-        'NO' => 'Norway',
-        'IS' => 'Iceland',
-        'LI' => 'Liechtenstein',
-        'GB' => 'United Kingdom',
+        'AUT' => 'Austria',
+        'BEL' => 'Belgium',
+        'BGR' => 'Bulgaria',
+        'HRV' => 'Croatia',
+        'CYP' => 'Cyprus',
+        'CZE' => 'Czech Republic',
+        'DNK' => 'Denmark',
+        'EST' => 'Estonia',
+        'FIN' => 'Finland',
+        'FRA' => 'France',
+        'DEU' => 'Germany',
+        'GRC' => 'Greece',
+        'HUN' => 'Hungary',
+        'IRL' => 'Ireland',
+        'ITA' => 'Italy',
+        'LVA' => 'Latvia',
+        'LTU' => 'Lithuania',
+        'LUX' => 'Luxembourg',
+        'MLT' => 'Malta',
+        'NLD' => 'Netherlands',
+        'PRT' => 'Portugal',
+        'ROU' => 'Romania',
+        'SVK' => 'Slovakia',
+        'SVN' => 'Slovenia',
+        'ESP' => 'Spain',
+        'SWE' => 'Sweden',
+        'NOR' => 'Norway',
+        'ISL' => 'Iceland',
+        'LIE' => 'Liechtenstein',
+        'GBR' => 'United Kingdom',
     ];
 
+    private const JURISDICTION_INTERNATIONAL_ORG = 'International organisation';
+    private const JURISDICTION_EMBL = 'EMBL intergovernmental organisation';
+
     public function __construct()
     {
     }
 
     public static function getJurisdiction($dstMetadata): string
     {
-        $countryCodes = json_decode(file_get_contents('http://country.io/names.json'), true);
         $jurisdiction = empty($dstMetadata['jurisdiction']) ? '' : $dstMetadata['jurisdiction'];
-        if (empty($jurisdiction) || array_key_exists($jurisdiction, self::EU_EAA)) {
-            return '';
-        }
-        if ('INT' === $jurisdiction || 'EMBL' === $jurisdiction) {
+        $pattern = "/\(\K[A-Z]{3}/";
+        $jurisdictionCode = preg_match($pattern, $jurisdiction, $out) ? $out[0] : $jurisdiction;
+        if (
+            self::JURISDICTION_INTERNATIONAL_ORG === $jurisdictionCode
+            || self::JURISDICTION_EMBL === $jurisdictionCode
+        ) {
             return $jurisdiction;
+        } elseif (empty($jurisdictionCode) || array_key_exists($jurisdictionCode, self::EU_EAA)) {
+            return '';
         }
 
-        return 'in ' . $countryCodes[$jurisdiction];
+        return 'in ' . $jurisdiction;
     }
 
     public static function printUserAttributes(array $attributes, $translator)