Skip to content

Commit a4e9221

Browse files
authored
fix: multiple AttributeConsumingService
2 parents 150e5c0 + 3bcb759 commit a4e9221

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"config": {
3-
"version": "3.17.2",
3+
"version": "3.17.3",
44
"allow-plugins": {
55
"simplesamlphp/composer-module-installer": true
66
}

setup/Setup.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1202,12 +1202,22 @@ public static function setup(Event $event) {
12021202

12031203

12041204
// apply simplesamlphp patch for spid compliance
1205-
// needed only for templates
1205+
// needed only for templates and scripts, not for classes
12061206
$filesystem->mirror(
12071207
$config['installDir'] . "/setup/simplesamlphp/simplesamlphp/templates",
12081208
$config['installDir'] . "/vendor/simplesamlphp/simplesamlphp/templates"
12091209
);
12101210

1211+
$filesystem->mirror(
1212+
$config['installDir'] . "/setup/simplesamlphp/simplesamlphp/modules/saml/www/sp",
1213+
$config['installDir'] . "/vendor/simplesamlphp/simplesamlphp/modules/saml/www/sp"
1214+
);
1215+
1216+
$filesystem->mirror(
1217+
$config['installDir'] . "/setup/simplesamlphp/simplesamlphp/www/assets/icons",
1218+
$config['installDir'] . "/vendor/simplesamlphp/simplesamlphp/www/assets/icons"
1219+
);
1220+
12111221
// write example files
12121222
if ($config['addExamples']) {
12131223
echo $colors->getColoredString("\nWrite example files to www (login.php)... ", "white");

setup/simplesamlphp/simplesamlphp/modules/saml/www/sp/metadata.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
}
188188

189189
// add multiple AttributeConsumingService
190-
$metaArray20['AttributeConsumingService'] = $spconfig->getArray('AttributeConsumingService', $eps);
190+
$metaArray20['AttributeConsumingService'] = $spconfig->getArray('AttributeConsumingService', []);
191191

192192
// add organization info
193193
$orgName = $spconfig->getLocalizedString('OrganizationName', null);

0 commit comments

Comments
 (0)