From 8a3547e2497ff77548a4d3944e0ee6546b1b6409 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Thu, 26 Sep 2013 07:08:44 +0000
Subject: [PATCH] Nettoyage AuthController
---
.../opac/controllers/AuthController.php | 27 ++++++++++++-------
.../opac/controllers/AuthControllerTest.php | 12 ++++++---
2 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/application/modules/opac/controllers/AuthController.php b/application/modules/opac/controllers/AuthController.php
index fc74006f256..217c80ff6e6 100644
--- a/application/modules/opac/controllers/AuthController.php
+++ b/application/modules/opac/controllers/AuthController.php
@@ -30,7 +30,7 @@ class AuthController extends ZendAfi_Controller_Action {
function indexAction() {
- $this->_redirect('opac/');
+ $this->_redirect('/opac');
}
@@ -254,8 +254,9 @@ class AuthController extends ZendAfi_Controller_Action {
}
-abstract class Auth_Strategy_Abstract {
+
+abstract class Auth_Strategy_Abstract {
protected $redirect_url='';
protected $disable_redirect=false;
@@ -307,6 +308,7 @@ abstract class Auth_Strategy_Abstract {
}
+ /** @codeCoverageIgnore */
public function handlePost() {
}
@@ -323,8 +325,9 @@ abstract class Auth_Strategy_Abstract {
}
-class Auth_Strategy_NotLogged extends Auth_Strategy_Abstract{
+
+class Auth_Strategy_NotLogged extends Auth_Strategy_Abstract{
public function handlePost() {
$this->redirect_url=$this->default_url;
if ($error=$this->controller->_authenticate()) {
@@ -332,15 +335,18 @@ class Auth_Strategy_NotLogged extends Auth_Strategy_Abstract{
}
}
-
}
+
+
+
class Auth_Strategy_Logged extends Auth_Strategy_Abstract{
}
-class Auth_Strategy_Cas_Abstract extends Auth_Strategy_Abstract{
+
+class Auth_Strategy_Cas_Abstract extends Auth_Strategy_Abstract{
public function urlServiceCas(){
$ticket=md5(Zend_Session::getId());
$queries=[];
@@ -355,8 +361,9 @@ class Auth_Strategy_Cas_Abstract extends Auth_Strategy_Abstract{
}
-class Auth_Strategy_Cas_Logged extends Auth_Strategy_Cas_Abstract{
+
+class Auth_Strategy_Cas_Logged extends Auth_Strategy_Cas_Abstract{
public function prepareLogin() {
if ($this->isCasDeconnected())
return $this->redirect_url='/opac';
@@ -367,15 +374,17 @@ class Auth_Strategy_Cas_Logged extends Auth_Strategy_Cas_Abstract{
protected function isCasDeconnected() {
return stristr($this->controller->getCasServerUrl(),'deconnexion=ok') != FALSE;
}
-
}
-class Auth_Strategy_Cas_NotLogged extends Auth_Strategy_Cas_Abstract{
+
+
+class Auth_Strategy_Cas_NotLogged extends Auth_Strategy_Cas_Abstract{
public function handlePost() {
if ($error=$this->controller->_authenticate())
return $this->controller->notify($error);
$this->redirect_url=$this->urlServiceCas();
}
+}
-}
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/tests/application/modules/opac/controllers/AuthControllerTest.php b/tests/application/modules/opac/controllers/AuthControllerTest.php
index 235f86cbd0b..7eb15033e52 100644
--- a/tests/application/modules/opac/controllers/AuthControllerTest.php
+++ b/tests/application/modules/opac/controllers/AuthControllerTest.php
@@ -70,6 +70,14 @@ class AuthControllerInviteLoggedTest extends PortailWithOneLoginModuleTestCase {
public function linkSeDeconnecterShouldBePresent() {
$this->assertXPath('//div[@id="boite_login"]//a[contains(@href, "auth/logout")]');
}
+
+
+ /** @test */
+ public function actionIndexShouldRedirectToOpac() {
+ $this->bootstrap();
+ $this->dispatch('/auth', true);
+ $this->assertRedirectTo('/opac');
+ }
}
@@ -128,10 +136,6 @@ class AuthControllerAbonneSIGBLoggedTest extends PortailWithOneLoginModuleTestCa
$this->dispatch('/opac/auth/login',true);
$this->assertXPathContentContains('//div[@class="barre_nav"]','Connexion',$this->_response->getBody());
}
-
-
-
-
}
--
GitLab