fix: multiple AttributeConsumingService

italia · Oct 5, 2023 · a4e9221 · a4e9221
2 parents 150e5c0 + 3bcb759
commit a4e9221
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "config": {
-        "version": "3.17.2",
+        "version": "3.17.3",
         "allow-plugins": {
             "simplesamlphp/composer-module-installer": true
         }

diff --git a/setup/Setup.php b/setup/Setup.php
@@ -1202,12 +1202,22 @@ public static function setup(Event $event) {
 
 
         // apply simplesamlphp patch for spid compliance
-        // needed only for templates
+        // needed only for templates and scripts, not for classes
         $filesystem->mirror(
             $config['installDir'] . "/setup/simplesamlphp/simplesamlphp/templates",
             $config['installDir'] . "/vendor/simplesamlphp/simplesamlphp/templates"
         );
 
+        $filesystem->mirror(
+            $config['installDir'] . "/setup/simplesamlphp/simplesamlphp/modules/saml/www/sp",
+            $config['installDir'] . "/vendor/simplesamlphp/simplesamlphp/modules/saml/www/sp"
+        );
+
+        $filesystem->mirror(
+            $config['installDir'] . "/setup/simplesamlphp/simplesamlphp/www/assets/icons",
+            $config['installDir'] . "/vendor/simplesamlphp/simplesamlphp/www/assets/icons"
+        );
+
         // write example files
         if ($config['addExamples']) {
             echo $colors->getColoredString("\nWrite example files to www (login.php)... ", "white");

diff --git a/setup/simplesamlphp/simplesamlphp/modules/saml/www/sp/metadata.php b/setup/simplesamlphp/simplesamlphp/modules/saml/www/sp/metadata.php
@@ -187,7 +187,7 @@
 }
 
 // add multiple AttributeConsumingService
-$metaArray20['AttributeConsumingService'] = $spconfig->getArray('AttributeConsumingService', $eps);
+$metaArray20['AttributeConsumingService'] = $spconfig->getArray('AttributeConsumingService', []);
 
 // add organization info
 $orgName = $spconfig->getLocalizedString('OrganizationName', null);