From f01239443a24b1ac73237351d501106f062a1297 Mon Sep 17 00:00:00 2001 From: llaffont <llaffont@git-test.afi-sa.fr> Date: Fri, 29 Nov 2013 11:05:16 +0000 Subject: [PATCH] Correction auth. carte famille Nanook --- library/Class/WebService/SIGB/Nanook/Service.php | 3 +++ library/ZendAfi/Auth/Adapter/CommSigb.php | 1 + tests/library/Class/WebService/SIGB/NanookTest.php | 7 +++++++ 3 files changed, 11 insertions(+) diff --git a/library/Class/WebService/SIGB/Nanook/Service.php b/library/Class/WebService/SIGB/Nanook/Service.php index 04d8d2ceb70..0da8b3d1981 100644 --- a/library/Class/WebService/SIGB/Nanook/Service.php +++ b/library/Class/WebService/SIGB/Nanook/Service.php @@ -39,8 +39,11 @@ class Class_Webservice_SIGB_Nanook_Service extends Class_WebService_SIGB_Abstrac return Class_WebService_SIGB_Emprunteur::nullInstance(); $emprunteur= $this->ilsdiGetPatronInfo(['patronId' => $user->getIdSigb()], Class_WebService_SIGB_Nanook_PatronInfoReader::newInstance()); + if (!$emprunteur->getCodeBarres()) $emprunteur->setCodeBarres($user->getLogin()); + + $emprunteur->setPassword($user->getPassword()); return $emprunteur; } diff --git a/library/ZendAfi/Auth/Adapter/CommSigb.php b/library/ZendAfi/Auth/Adapter/CommSigb.php index facd521f079..9e499a784fa 100644 --- a/library/ZendAfi/Auth/Adapter/CommSigb.php +++ b/library/ZendAfi/Auth/Adapter/CommSigb.php @@ -81,6 +81,7 @@ class ZendAfi_Auth_Adapter_CommSigb implements Zend_Auth_Adapter_Interface { public function getUserFromSigb($user) { + xdebug_break(); $bibs = Class_IntBib::findAllWithWebServices(); foreach($bibs as $bib) { if (!$emprunteur = $bib->getSIGBComm()->getEmprunteur($user)) diff --git a/tests/library/Class/WebService/SIGB/NanookTest.php b/tests/library/Class/WebService/SIGB/NanookTest.php index 581e9c4da59..f47c22127d4 100644 --- a/tests/library/Class/WebService/SIGB/NanookTest.php +++ b/tests/library/Class/WebService/SIGB/NanookTest.php @@ -412,6 +412,12 @@ class NanookGetEmprunteurChristelDelpeyrouxTest extends NanookTestCase { } + /** @test */ + public function emprunteurPasswordShouldBe2002() { + $this->assertEquals('2002', $this->_emprunteur->getPassword()); + } + + /** @test */ public function idShouldBeOne() { $this->assertEquals('1', $this->_emprunteur->getId()); @@ -735,6 +741,7 @@ class NanookGetEmprunteurAuthenticateTest extends NanookTestCase { $this->assertNotNull($emprunteur); $this->assertEquals(1, $user->getIdSigb()); $this->assertFalse($emprunteur->isValid()); + $this->assertEmpty($emprunteur->getPassword()); } } -- GitLab