From 2696f996d1ea15497f5203e6e0cf47e273c4d99c Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Wed, 25 Nov 2020 11:36:50 +0100
Subject: [PATCH] hotline #79470 BiblioOnDemand : fix SSO URLs encoding
---
VERSIONS_HOTLINE/79470 | 1 +
library/digital_resources/Bibliondemand/Config.php | 2 +-
.../digital_resources/Bibliondemand/tests/BibliondemandTest.php | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 VERSIONS_HOTLINE/79470
diff --git a/VERSIONS_HOTLINE/79470 b/VERSIONS_HOTLINE/79470
new file mode 100644
index 00000000000..ff086796469
--- /dev/null
+++ b/VERSIONS_HOTLINE/79470
@@ -0,0 +1 @@
+ - ticket #79470 : Bibiondemand : correction de l'encodage des URLs SSO
\ No newline at end of file
diff --git a/library/digital_resources/Bibliondemand/Config.php b/library/digital_resources/Bibliondemand/Config.php
index 244645286c4..76d50949836 100644
--- a/library/digital_resources/Bibliondemand/Config.php
+++ b/library/digital_resources/Bibliondemand/Config.php
@@ -61,7 +61,7 @@ class Bibliondemand_Config extends Class_DigitalResource_Config {
$url = Class_AdminVar::getValueOrDefault($this->withNameSpace('SSO_URL'));
return ($record_url = (new Class_Notice_Sso($record))->getFirstPrivateUrl())
- ? $url . '&' . http_build_query(['returnUrl' => '/sarasvati/ws/secure/redirect.ashx?url=' . $record_url])
+ ? $url . '&' . http_build_query(['returnUrl' => '/sarasvati/ws/secure/redirect.ashx?url=' . urlencode($record_url)])
: $url;
}
diff --git a/library/digital_resources/Bibliondemand/tests/BibliondemandTest.php b/library/digital_resources/Bibliondemand/tests/BibliondemandTest.php
index 1d2cb993a2f..5f05a83dd39 100644
--- a/library/digital_resources/Bibliondemand/tests/BibliondemandTest.php
+++ b/library/digital_resources/Bibliondemand/tests/BibliondemandTest.php
@@ -172,7 +172,7 @@ class ModulesControllerBibliondemandSsoTest extends AbstractControllerTestCase {
/** @test */
public function record21ShouldRedirectToBibliondemandSso() {
$this->dispatch('/modules/sso/id/21', true);
- $this->assertXPathContentContains('//script', 'document.location.href="http://numerique-pasdecalais.bibliondemand.com/logon.aspx?provider=SsoCas&sso-id=cg62-saintomer&returnUrl='. urlencode('/sarasvati/ws/secure/redirect.ashx?url=http://music.1dtouch.com/users/auth/assa?dest=albums/137962&bibid=CG62').'"',
+ $this->assertXPathContentContains('//script', 'document.location.href="http://numerique-pasdecalais.bibliondemand.com/logon.aspx?provider=SsoCas&sso-id=cg62-saintomer&returnUrl='. urlencode('/sarasvati/ws/secure/redirect.ashx?url=' . urlencode('http://music.1dtouch.com/users/auth/assa?dest=albums/137962&bibid=CG62')).'"',
$this->_response->getBody());
}
}
--
GitLab