rel #33149 : fix SSO link and redirect

VERSIONS_HOTLINE/33149

+ - ticket #33149 : Correction SSO CAS LeKiosk
\ No newline at end of file

application/modules/opac/controllers/ModulesController.php

@@ -71,7 +71,7 @@ class ModulesController extends Zend_Controller_Action {
 
   public function lekioskAction() {
     $lekiosk = new Class_Systeme_ModulesMenu_LeKiosk();
-    $lekiosk->afterLoginRedirectTo($this->_request->getServer('HTTP_REFERER'));
+    $lekiosk->afterLoginRedirectTo(Class_Url::absolute($this->view->url()));
     $this->checkNotifyMessage($lekiosk, $lekiosk->getDynamiqueUrl());
   }
 

library/Class/LeKiosk/CasLink.php

@@ -27,7 +27,7 @@ class Class_LeKiosk_CasLink {
                          [
                           'cas_fournisseur' => Class_Url::absolute(['controller' => 'cas-server-v10'], null, true),
                           'id' => Class_AdminVar::get('LEKIOSK_ID'),
-                          'ReturnUrl' => $_SERVER['HTTP_REFERER']
+                          'ReturnUrl' => ''
                          ] );
   }
 }

tests/application/modules/opac/controllers/ModulesControllerTest.php

@@ -24,10 +24,10 @@ include_once('tests/fixtures/RessourcesNumeriquesFixtures.php');
 class ModulesControllerLoginRequiredTest extends AbstractControllerTestCase {
   public function datas() {
     return [
-            ['CVS', 'cvs'],
-            ['Vodeclic', 'vodeclic'],
-            ['ToutApprendre', 'toutapprendre'],
-            ['LeKiosk', 'lekiosk']
+            ['CVS', 'cvs', ''],
+            ['Vodeclic', 'vodeclic', ''],
+            ['ToutApprendre', 'toutapprendre', ''],
+            ['LeKiosk', 'lekiosk', ROOT_URL . BASE_URL . '/modules/lekiosk']
     ];
   }
 
@@ -36,14 +36,18 @@ class ModulesControllerLoginRequiredTest extends AbstractControllerTestCase {
    * @test
    * @dataProvider datas
    */
-  public function withoutLoginShouldRedirectToLogin($type, $action) {
-    call_user_func(['RessourcesNumeriquesFixtures', 'activate'.$type]);
+  public function withoutLoginShouldRedirectToLogin($type, $action, $redirect) {
+    call_user_func(['RessourcesNumeriquesFixtures', 'activate' . $type]);
+
     $_SERVER['HTTP_REFERER'] = '/opac/cms/articleview/id/23';
+    if (!$redirect)
+      $redirect = $_SERVER['HTTP_REFERER'];
+
     ZendAfi_Auth::getInstance()->clearIdentity();
 
     $this->dispatch('/opac/modules/' . $action);
 
-    $this->assertContains('/auth/login?redirect='.urlencode('/opac/cms/articleview/id/23'),
+    $this->assertContains('/auth/login?redirect='.urlencode($redirect),
                           $this->_response->getBody());
   }
 }
@@ -85,24 +89,54 @@ class ModulesControllerLeKioskUserWithGroupWithoutRightTest extends AbstractCont
 
 
 class ModulesControllerLeKioskUserWithGroupWithRightTest extends AbstractControllerTestCase {
+  protected $_storm_default_to_volatile = true;
+
   public function setUp() {
     parent::setUp();
+
     RessourcesNumeriquesFixtures::activateLeKiosk();
     $group = $this->fixture('Class_UserGroup', ['id' => 1])
                   ->addRight(Class_UserGroup::RIGHT_ACCES_LEKIOSK);
     Class_Users::getIdentity()->setUserGroups([$group]);
+
     $this->dispatch('/opac/modules/lekiosk', true);
   }
 
 
   /** @test */
-  public function shouldHaveAccessForbiddenMessage() {
+  public function shouldHaveAccessToLekiosk() {
     $this->assertContains('http://pro.lekiosk.com', $this->_response->getBody());
   }
 }
 
 
 
+class ModulesControllerLeKioskUserWithGroupWithRightCasTest extends AbstractControllerTestCase {
+  protected $_storm_default_to_volatile = true;
+
+  public function setUp() {
+    parent::setUp();
+
+    RessourcesNumeriquesFixtures::activateLeKiosk();
+    $group = $this->fixture('Class_UserGroup', ['id' => 1])
+                  ->addRight(Class_UserGroup::RIGHT_ACCES_LEKIOSK);
+    Class_Users::getIdentity()->setUserGroups([$group]);
+    Class_AdminVar::set('LEKIOSK_SSO_MODE', 'CAS');
+    $_SERVER['HTTP_REFERER'] = 'http://localhost/view/notice';
+
+    $this->dispatch('/opac/modules/lekiosk', true);
+  }
+
+
+  /** @test */
+  public function shouldHaveAccessToLekiosk() {
+    $this->assertContains('https://pro.lekiosk.com/AutentificationCas.aspx',
+                          $this->_response->getBody());
+  }
+}
+
+
+
 class ModulesControllerArteVodTest extends AbstractControllerTestCase {
   public function setUp() {
     parent::setUp();