diff --git a/VERSIONS_HOTLINE/94159 b/VERSIONS_HOTLINE/94159 new file mode 100644 index 0000000000000000000000000000000000000000..fe90e6df28261ee0b048e1d661e8f41021b4a537 --- /dev/null +++ b/VERSIONS_HOTLINE/94159 @@ -0,0 +1 @@ + - ticket #94159 : connecteur Skilleos : mise à jour de l'API \ No newline at end of file diff --git a/library/digital_resources/Skilleos/Config.php b/library/digital_resources/Skilleos/Config.php index d43d9e26dc623a76ff7afa8a1bfe7722995943aa..07276e1afcfb92a9f99296e298250db31da17fd5 100644 --- a/library/digital_resources/Skilleos/Config.php +++ b/library/digital_resources/Skilleos/Config.php @@ -20,7 +20,7 @@ */ class Skilleos_Config extends Class_DigitalResource_Config { - const SKILLEOS_URL = 'http://skilleos.com/sigb/sso/'; + const SKILLEOS_URL = 'https://moncompte.skilleos.com/sign/cas'; protected function _getConfig() { return [ @@ -65,7 +65,7 @@ class Skilleos_Config extends Class_DigitalResource_Config { protected function _getSsoUrl($user, $album) { $id = $album - ? $album->getIdOrigine() + ? '/' . $album->getIdOrigine() : ''; return static::SKILLEOS_URL . $id diff --git a/library/digital_resources/Skilleos/controllers/AuthController.php b/library/digital_resources/Skilleos/controllers/AuthController.php index 8928c9500bd5745ef47a1bf242c4373ca1a8f5aa..f87382e190dfd9d148c557545347d49d56b77ced 100644 --- a/library/digital_resources/Skilleos/controllers/AuthController.php +++ b/library/digital_resources/Skilleos/controllers/AuthController.php @@ -36,7 +36,8 @@ class Skilleos_Plugin_AuthController extends Class_DigitalResource_Controller { $attributes = ['sn' => $user->getNom(), 'mail' => $user->getMail(), - 'givenName' => $user->getPrenom()]; + 'givenName' => $user->getPrenom(), + 'bibId' => $user->getLibelleBib()]; return $this->_helper->casValidResponse($user, $ticket, $attributes); } } diff --git a/library/digital_resources/Skilleos/tests/SkilleosTest.php b/library/digital_resources/Skilleos/tests/SkilleosTest.php index adfed4a1ae22cf6b5c95129748ef4e65dce2db90..36de985143b4d8635158c0818c41873a32a36694 100644 --- a/library/digital_resources/Skilleos/tests/SkilleosTest.php +++ b/library/digital_resources/Skilleos/tests/SkilleosTest.php @@ -74,7 +74,7 @@ class SkilleosModulesControllerUserWithGroupWithRightTest public function shouldHaveAccessToSkilleosCas() { Class_AdminVar::set('Skilleos_SSO_MODE', 'CAS'); $this->dispatch('/opac/modules/skilleos', true); - $this->assertContains('http://skilleos.com/sigb/sso/?casid=QUEST&ticket='.(new Class_CasTicket())->getTicketForCurrentUser(), + $this->assertContains('https://moncompte.skilleos.com/sign/cas?casid=QUEST&ticket='.(new Class_CasTicket())->getTicketForCurrentUser(), $this->_response->getBody()); } @@ -100,7 +100,7 @@ class SkilleosModulesControllerUserWithGroupWithRightTest $this->dispatch('/Skilleos_Plugin/auth/servicevalidate/service/skilleos/ticket/' . $ticket, true); $this->assertContains('<cas:user>666</cas:user>',$this->_response->getBody()); - $this->assertContains('<cas:sn>jumper</cas:sn><cas:mail>jolly@jumper.com</cas:mail><cas:givenName>jolly</cas:givenName>',$this->_response->getBody()); + $this->assertContains('<cas:sn>jumper</cas:sn><cas:mail>jolly@jumper.com</cas:mail><cas:givenName>jolly</cas:givenName><cas:bibId>Tombouctou</cas:bibId>',$this->_response->getBody()); } @@ -249,7 +249,8 @@ class SkilleosServiceHarvestTest extends SkilleosServiceTestCase { /** @test */ public function urlOriginShouldBeSet() { - $this->assertEquals('http://skilleos.com/sigb/sso/', Class_Album::find(5)->getUrlOrigine()); + $this->assertEquals('https://moncompte.skilleos.com/sign/cas', + Class_Album::find(5)->getUrlOrigine()); } @@ -341,7 +342,7 @@ class SkilleosServiceHarvestTest extends SkilleosServiceTestCase { public function withAlbumIdShouldRedirectToSkilleos() { $this->dispatch('/opac/modules/skilleos/album_id/6',true); $ticket = (new Class_CasTicket())->getTicketForCurrentUser(); - $this->assertXPathContentContains('//script','/sigb/sso/175?casid=QUEST&ticket='.$ticket, $this->_response->getBody()); + $this->assertXPathContentContains('//script','/sign/cas/175?casid=QUEST&ticket='.$ticket, $this->_response->getBody()); } } @@ -453,6 +454,6 @@ class SkilleosDashboardTrySsoTest extends SkilleosServiceTestCase { /** @test */ public function shouldJavascriptRedirectToMoncompteDotSkilleos() { - $this->assertXPathContentContains('//script', 'document.location.href="http://skilleos.com/sigb/sso/?casid=QUEST&ticket'); + $this->assertXPathContentContains('//script', 'document.location.href="https://moncompte.skilleos.com/sign/cas?casid=QUEST&ticket'); } } \ No newline at end of file