diff --git a/VERSIONS b/VERSIONS
index c1457b84f9631fd6eee6b6eae7e3607c502cb674..c7f5df4a3db7a37f308cb78416b0b9ccf873398b 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,3 +1,8 @@
+07/02/2019 - v8.0.2
+
+ - ticket #86474 : Compte lecteur : Correction de la compatibilité du multi-carte avec l'authentification par le SIGB uniquement
+
+
05/02/2019 - v8.0.1
- ticket #86381 : SIGB Nanook : Correction de l'authentification par SIGB uniquement
diff --git a/application/modules/opac/controllers/AbonneController.php b/application/modules/opac/controllers/AbonneController.php
index cfb930f01864d6b322febc2476c69a2bdf04b0af..e3ced754dd5164bb35d3c36aeec2578f8d636231 100644
--- a/application/modules/opac/controllers/AbonneController.php
+++ b/application/modules/opac/controllers/AbonneController.php
@@ -61,11 +61,12 @@ class AbonneController extends ZendAfi_Controller_Action {
protected function clearEmprunteurCache() {
- if (in_array($this->getRequest()->getActionName(), ['prets',
- 'reservations',
- 'fiche',
- 'loans-history']))
- Class_WebService_SIGB_EmprunteurCache::newInstance()->remove($this->_user);
+ if (!in_array($this->getRequest()->getActionName(),
+ ['prets', 'reservations', 'fiche', 'loans-history']))
+ return;
+
+ foreach((new Class_User_Cards($this->_user)) as $user)
+ Class_WebService_SIGB_EmprunteurCache::newInstance()->remove($user);
}
@@ -1224,14 +1225,13 @@ class AbonneController extends ZendAfi_Controller_Action {
$this->view->form = $form;
-
if (!$this->_request->isPost() || !$form->isValid($this->_request->getPost()))
return $this;
- if ((!$child = Class_Users::findFirstBy(['login' => $this->_getPost('login'),
- 'password' => $this->_getPost('password')]))
- || !$child->isAbonne()) {
+ $child = Class_Auth::getInstance()
+ ->authenticateLoginPassword($this->_getPost('login'), $this->_getPost('password'));
+ if (!$child || !$child->isAbonne()) {
$this->_helper->notify($this->_('Identifiant et/ou mot de passe incorrect'));
return $this->_redirect('/abonne/add-card');
}
diff --git a/library/Class/Auth.php b/library/Class/Auth.php
new file mode 100644
index 0000000000000000000000000000000000000000..e9a2c8b20a4ed91d094a7486d68c857f9ee5d038
--- /dev/null
+++ b/library/Class/Auth.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright (c) 2012-2018, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Class_Auth {
+ use Trait_Singleton;
+
+ public function authenticateLoginPassword($login, $password) {
+ $adapters = [new ZendAfi_Auth_Adapter_CommSigb(),
+ new ZendAfi_Auth_Adapter_DbTable()];
+
+ foreach ($adapters as $adapter) {
+ if ((new ZendAfi_Auth_TryHarder($this, $adapter))->tryHarder($login, $password))
+ return $adapter->getAuthenticatedUser();;
+
+ if ($adapter->shouldBreakChain())
+ return;
+ }
+ }
+
+
+ public function authenticate($adapter) {
+ return $adapter->authenticate();
+ }
+}
diff --git a/library/Class/User/Cards.php b/library/Class/User/Cards.php
index 97c7d9b53ee5c83dcee067ec11c91d428cf584ef..8e28acf9599a198aa0a5316f1622002caedd7361 100644
--- a/library/Class/User/Cards.php
+++ b/library/Class/User/Cards.php
@@ -32,7 +32,10 @@ class Class_User_Cards extends Storm_Model_Collection {
public function getLoansWithOutPNB($params = []) {
- return $this->_decorateOperationFrom(function($card) use ($params) { return $card->getLoansWithOutPNB($params); });
+ return $this->_decorateOperationFrom(
+ function($card) use ($params) {
+ return $card->getLoansWithOutPNB($params);
+ });
}
diff --git a/library/Class/Users.php b/library/Class/Users.php
index 5c917a7adea4143d91341b66749c80a8b0589684..d60433b86d97150983ae227dd2af6c518605bcdb 100644
--- a/library/Class/Users.php
+++ b/library/Class/Users.php
@@ -125,13 +125,16 @@ class UsersLoader extends Storm_Model_Loader {
public function isLogged($user) {
- if(!$user)
+ if (!$user)
return false;
- if(!$logged_user = Class_Users::getIdentity())
+ if (!$logged_user = Class_Users::getIdentity())
return false;
- return $user->getId() == $logged_user->getId();
+ if ($user->getId() == $logged_user->getId())
+ return true;
+
+ return $user->isChildOf($logged_user);
}
@@ -1902,4 +1905,13 @@ class Class_Users extends Storm_Model_Abstract {
public function isSIGBProvidesChangePasswordService() {
return ($sigb_com = $this->getSIGBComm()) && $sigb_com->providesChangePasswordService();
}
+
+
+ public function isChildOf($other) {
+ foreach($this->getParentCards() as $parent)
+ if ($parent->getId() == $other->getId())
+ return true;
+
+ return false;
+ }
}
diff --git a/library/ZendAfi/Auth/Adapter/Abstract.php b/library/ZendAfi/Auth/Adapter/Abstract.php
index 0f3b16eaf6cffc21ee6fe7210b2b257c0ca4d0c4..60702f343036d5c45a65082681a3a0d5ee7d6037 100644
--- a/library/ZendAfi/Auth/Adapter/Abstract.php
+++ b/library/ZendAfi/Auth/Adapter/Abstract.php
@@ -57,4 +57,10 @@ abstract class ZendAfi_Auth_Adapter_Abstract implements Zend_Auth_Adapter_Interf
public function getResultObject() {
return $this->_authenticated_user->toStdClass();
}
+
+
+ /** @return Class_Users */
+ public function getAuthenticatedUser() {
+ return $this->_authenticated_user;
+ }
}
diff --git a/library/startup.php b/library/startup.php
index 25d763e4cc05647d24e3e75da3e5f5f8391ad568..cf2decac515097b8d162dff0dbb1e394af31d8dd 100644
--- a/library/startup.php
+++ b/library/startup.php
@@ -81,7 +81,7 @@ class Bokeh_Engine {
function setupConstants() {
defineConstant('BOKEH_MAJOR_VERSION','8.0');
- defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.1');
+ defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.2');
defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
diff --git a/tests/application/modules/admin/controllers/ReferentPortailControllerTest.php b/tests/application/modules/admin/controllers/ReferentPortailControllerTest.php
index c91cb8c5cdc770063b7aea7454528f8223122be8..4ff3a9189faaacf66e2ebf37cb26d4071d4d3558 100644
--- a/tests/application/modules/admin/controllers/ReferentPortailControllerTest.php
+++ b/tests/application/modules/admin/controllers/ReferentPortailControllerTest.php
@@ -1,4 +1,4 @@
-b<?php
+<?php
/**
* Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
*