Merge branch 'main' into feature/jti

poef · poef · commit 396585a0b4b9 · 2022-09-28T10:15:37.000+02:00
diff --git a/run-solid-test-suite.sh b/run-solid-test-suite.sh
@@ -6,8 +6,8 @@ function setup {
   docker build -t solid-nextcloud .
   docker build -t pubsub-server  https://github.com/pdsinterop/php-solid-pubsub-server.git#main
   docker pull michielbdejong/nextcloud-cookie
-  docker pull solidtestsuite/webid-provider-tests:v2.0.3
-  docker tag solidtestsuite/webid-provider-tests:v2.0.3 webid-provider-tests
+  docker pull solidtestsuite/webid-provider-tests:v2.1.0
+  docker tag solidtestsuite/webid-provider-tests:v2.1.0 webid-provider-tests
   docker pull solidtestsuite/solid-crud-tests:v6.0.0
   docker tag solidtestsuite/solid-crud-tests:v6.0.0 solid-crud-tests
   docker pull solidtestsuite/web-access-control-tests:v7.1.0
diff --git a/solid/lib/WellKnown/OpenIdConfigurationHandler.php b/solid/lib/WellKnown/OpenIdConfigurationHandler.php
@@ -117,6 +117,7 @@ private function respond($response) {
 			}
 		}
 		$result->setStatus($statusCode);
+		$result->addHeader('Access-Control-Allow-Origin', '*');
 		return $result;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ private function respond($response) {`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`$result->setStatus($statusCode);`
	`120`	`+ $result->addHeader('Access-Control-Allow-Origin', '*');`
`120`	`121`	`return $result;`
`121`	`122`	`}`
`122`	`123`	`}`