From adefbc91f828eec1f122ed50fcce6e690501dc38 Mon Sep 17 00:00:00 2001 From: pbarroca <pbarroca@afi-sa.fr> Date: Mon, 9 Jan 2017 11:03:13 +0100 Subject: [PATCH] hotline #51334 : add user mail and user barcode in SSO link --- VERSIONS_HOTLINE/51334 | 1 + library/Class/WebService/SIGB/CdScript/Service.php | 4 ++-- tests/library/Class/WebService/SIGB/CdScriptTest.php | 10 +++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 VERSIONS_HOTLINE/51334 diff --git a/VERSIONS_HOTLINE/51334 b/VERSIONS_HOTLINE/51334 new file mode 100644 index 00000000000..b50d238a88b --- /dev/null +++ b/VERSIONS_HOTLINE/51334 @@ -0,0 +1 @@ + - ticket #51334 : SIGB CDScript : Ajout du courriel et du numéro de carte dans le lien SSO \ No newline at end of file diff --git a/library/Class/WebService/SIGB/CdScript/Service.php b/library/Class/WebService/SIGB/CdScript/Service.php index a67bc9c6346..a55cf129827 100644 --- a/library/Class/WebService/SIGB/CdScript/Service.php +++ b/library/Class/WebService/SIGB/CdScript/Service.php @@ -74,11 +74,11 @@ class Class_Webservice_SIGB_CdScript_Service extends Class_WebService_SIGB_Abstr protected function getUserInfo($user) { - return '&user='. implode(':', [$user->getIdSigb(), + return '&user='. implode(':', [$user->getIdabon(), $user->getNom(), $user->getPrenom(), $user->getNaissance(), - '', + $user->getMail(), $user->getDateFin()]); } diff --git a/tests/library/Class/WebService/SIGB/CdScriptTest.php b/tests/library/Class/WebService/SIGB/CdScriptTest.php index 23fd6167544..3b52b876b94 100644 --- a/tests/library/Class/WebService/SIGB/CdScriptTest.php +++ b/tests/library/Class/WebService/SIGB/CdScriptTest.php @@ -57,6 +57,7 @@ class CdScriptServiceTest extends CdScriptTestCase { 'nom' => 'Le Pollux', 'prenom' => 'Paul', 'id_sigb' => '654987', + 'idabon' => '23901000323008', 'mail' => 'anemail@web.com', 'naissance' => '2002-12-14', 'password' => 'pollux', @@ -72,7 +73,8 @@ class CdScriptServiceTest extends CdScriptTestCase { 'id_bib' => 3, 'zone995' => 'a:3:{i:0;a:2:{s:4:"code";s:1:"a";s:6:"valeur";s:10:"Le Kiosque";}i:1;a:2:{s:4:"code";s:1:"b";s:6:"valeur";s:3:"kio";}i:2;a:2:{s:4:"code";s:1:"f";s:6:"valeur";s:3:"319";}}']); - $this->_sigb_le_kiosque = $this->_service->getNotice('456789')->getExemplaireByCodeBarre('456789'); + $this->_sigb_le_kiosque = $this->_service->getNotice('456789') + ->getExemplaireByCodeBarre('456789'); } @@ -90,7 +92,8 @@ class CdScriptServiceTest extends CdScriptTestCase { /** @test */ public function ressourceUrlShouldBeJumelBib2UserPaulAnd12oclok() { - $this->assertEquals('www.jumel39.fr/docnum.php?bib=2&res=kio&lien=456789&time=1446019200&user=654987:Le Pollux:Paul:2002-12-14::2015-12-14', $this->_service->getRessourceUrl($this->_le_kiosque)); + $this->assertEquals('www.jumel39.fr/docnum.php?bib=2&res=kio&lien=456789&time=1446019200&user=23901000323008:Le Pollux:Paul:2002-12-14:anemail@web.com:2015-12-14', + $this->_service->getRessourceUrl($this->_le_kiosque)); } @@ -102,7 +105,8 @@ class CdScriptServiceTest extends CdScriptTestCase { /** @test */ public function leKiosqueItemUrlShouldBeJumelLink() { - $this->assertEquals('www.jumel39.fr/docnum.php?bib=2&res=kio&lien=456789&time=1446019200&user=654987:Le Pollux:Paul:2002-12-14::2015-12-14', $this->_le_kiosque->getUrl()); + $this->assertEquals('www.jumel39.fr/docnum.php?bib=2&res=kio&lien=456789&time=1446019200&user=23901000323008:Le Pollux:Paul:2002-12-14:anemail@web.com:2015-12-14', + $this->_le_kiosque->getUrl()); } -- GitLab