Skip to content
Snippets Groups Projects
Commit 2be6cb07 authored by Henri-Damien LAURENT's avatar Henri-Damien LAURENT
Browse files

Merge branch 'hotline#182997_mise_en_place_connecteur_artevod' into 'master' 

hotline#182997 : ArteVod : Adding site_label and site_code to SSO Calls

See merge request !4819
parents c4bde3da 121af392
Branches
Tags
1 merge request!4819hotline#182997 : ArteVod : Adding site_label and site_code to SSO Calls
Pipeline #25316 passed with stage
in 14 minutes and 1 second
Hide whitespace changes
Inline Side-by-side
VERSIONS_HOTLINE/182997 0 → 100644
+ 1
− 0
View file @ 2be6cb07
- correctif #182997 : ArteVOD : Ajout des paramètres site_code et site_label dans l'appel SSO
\ No newline at end of file
library/digital_resources/ArteVod/Link.php
+ 7
− 5
View file @ 2be6cb07
......@@ -41,11 +41,13 @@ class ArteVod_Link {
'id' => $id_abon,
'id_encrypted' => $hash->encrypt($id_abon),
'd' => $hash->encrypt(date('dmY', $this->getCurrentTime())),
'prenom' =>$user->getPrenom(),
'nom' =>$user->getNom(),
'email' =>$user->getMail(),
'dnaiss' =>$user->getNaissance(),
'datout' =>$user->getValidSubscriptionEndDate(),
'prenom' => $user->getPrenom(),
'nom' => $user->getNom(),
'email' => $user->getMail(),
'dnaiss' => $user->getNaissance(),
'datout' => $user->getValidSubscriptionEndDate(),
'site_code' => $user->getLibraryId(),
'site_label' => $user->getLibelleBib(),
'referer' => Class_Url::getProtocol(). Class_AdminVar::getNomDomaine()], $with_params);
return $this->_config->getAdminVar( 'SSO_URL')
......
library/digital_resources/ArteVod/tests/ArteVodSSoTest.php
+ 15
− 2
View file @ 2be6cb07
......@@ -40,7 +40,10 @@ class ArteSSoWithUserAndAlbumTest extends ModelTestCase {
->setPrenom('James')
->setNom('Bond')
->setMail('jbond@007.fr')
->setDateFin('2023-09-12');
->setDateFin('2023-09-12')
->setBib($this->fixture(Class_Bib::class,
[ 'id' => 13,
'libelle' => 'Jolieville']));
Class_AdminVar::set('ArteVod_SSO_KEY', $this->_sso_key);
Class_AdminVar::set('NOM_DOMAINE', 'mymediatheque.com');
......@@ -58,6 +61,8 @@ class ArteSSoWithUserAndAlbumTest extends ModelTestCase {
.'&nom=Bond'
.'&email='.urlencode('jbond@007.fr')
.'&datout=2023-09-12'
.'&site_code=13'
.'&site_label=Jolieville'
.'&referer=http%3A%2F%2Fmymediatheque.com'
.'&return_url=' . urlencode('http://www.mediatheque-numerique.com/films/entre-les-murs'),
ArteVod_Config::getInstance()->getAlbumSSoUrl($this->_james_bond,
......@@ -78,6 +83,8 @@ class ArteSSoWithUserAndAlbumTest extends ModelTestCase {
.'&id_encrypted='. hash('sha256', '45' . $this->_sso_key)
.'&d='. hash('sha256', date('dmY'). $this->_sso_key)
.'&datout=2023-09-12'
.'&site_code=13'
.'&site_label=Jolieville'
.'&referer=http%3A%2F%2Fmymediatheque.com'
.'&return_url=' . urlencode('http://www.mediatheque-numerique.com/films/entre-les-murs'),
ArteVod_Config::getInstance()->getAlbumSSoUrl($this->_james_bond,
......@@ -99,6 +106,8 @@ class ArteSSoWithUserAndAlbumTest extends ModelTestCase {
.'&id_encrypted='. hash('sha256', '45' . $this->_sso_key)
.'&d='. hash('sha256', date('dmY'). $this->_sso_key)
.'&datout=2020-04-09'
.'&site_code=13'
.'&site_label=Jolieville'
.'&referer=http%3A%2F%2Fmymediatheque.com'
.'&return_url=' . urlencode('http://www.mediatheque-numerique.com/films/entre-les-murs'),
ArteVod_Config::getInstance()->getAlbumSSoUrl($this->_james_bond,
......@@ -122,6 +131,8 @@ class ArteSSoWithUserAndAlbumTest extends ModelTestCase {
.'&id_encrypted='. hash('sha256', '19' . $this->_sso_key)
.'&d='. hash('sha256', date('dmY') . $this->_sso_key)
.'&datout=2020-04-09'
.'&site_code=13'
.'&site_label=Jolieville'
.'&referer=http%3A%2F%2Fmymediatheque.com'
.'&return_url=' . urlencode('http://www.mediatheque-numerique.com/films/entre-les-murs'),
ArteVod_Config::getInstance()->getAlbumSSoUrl($this->_james_bond,
......@@ -145,6 +156,8 @@ class ArteSSoWithUserAndAlbumTest extends ModelTestCase {
.'&d='. hash('sha256', date('dmY') . $this->_sso_key)
.'&dnaiss=1975-01-01'
.'&datout=2020-04-09'
.'&site_code=13'
.'&site_label=Jolieville'
.'&referer=http%3A%2F%2Fmymediatheque.com'
.'&return_url=' . urlencode('http://www.mediatheque-numerique.com/films/entre-les-murs'),
ArteVod_Config::getInstance()->getAlbumSSoUrl($this->_james_bond,
......@@ -189,6 +202,6 @@ class ModulesControllerArteVodTest extends AbstractControllerTestCase {
Class_AdminVar::set('NOM_DOMAINE', 'mymediatheque.com');
$this->dispatch('/opac/modules/arte-vod');
$this->assertXpathContentContains('//script',
'document.location.href="https://portal.mediatheque-numerique.com/sso_login?sso_id=afi&id=1&id_encrypted=4739ee3bd29e4f415da8ba9298a087e0fdc9c61378420ba8fbbab298bd74c4df&d='.hash('sha256', date('dmY') . 123).'&prenom=Zoro&nom=AutoTest&datout=2020-04-09&referer=http%3A%2F%2Fmymediatheque.com&return_url=https%3A%2F%2Fvod.mediatheque-numerique.com%2Fmediatheques%2F123";');
'document.location.href="https://portal.mediatheque-numerique.com/sso_login?sso_id=afi&id=1&id_encrypted=4739ee3bd29e4f415da8ba9298a087e0fdc9c61378420ba8fbbab298bd74c4df&d='.hash('sha256', date('dmY') . 123).'&prenom=Zoro&nom=AutoTest&datout=2020-04-09&site_code=1&site_label=Tombouctou&referer=http%3A%2F%2Fmymediatheque.com&return_url=https%3A%2F%2Fvod.mediatheque-numerique.com%2Fmediatheques%2F123";');
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment