' . $e->getMessage() . '
' . $e->getTraceAsString() . '
'; + } + } +} \ No newline at end of file diff --git a/src/UnicaenAuth/View/Helper/CasConnectViewHelper.php b/src/UnicaenAuth/View/Helper/CasConnectViewHelper.php new file mode 100644 index 0000000000000000000000000000000000000000..8cc460a280702a5c129c898a8e33dd1a7c9abb7b --- /dev/null +++ b/src/UnicaenAuth/View/Helper/CasConnectViewHelper.php @@ -0,0 +1,21 @@ +setType('cas'); + $this->setTitle("Authentification centralisée"); + } +} \ No newline at end of file diff --git a/src/UnicaenAuth/View/Helper/CasConnectViewHelperFactory.php b/src/UnicaenAuth/View/Helper/CasConnectViewHelperFactory.php new file mode 100644 index 0000000000000000000000000000000000000000..af671df0b853fd976472d7eb2dcde8ab89f36ff0 --- /dev/null +++ b/src/UnicaenAuth/View/Helper/CasConnectViewHelperFactory.php @@ -0,0 +1,29 @@ +get('unicaen-auth_module_options'); + $config = $moduleOptions->getCas(); + + $enabled = isset($config['enabled']) && (bool) $config['enabled']; + $description = $config['description'] ?? null; + + $helper = new CasConnectViewHelper(); + $helper->setEnabled($enabled); + $helper->setDescription($description); + + return $helper; + } +} \ No newline at end of file diff --git a/src/UnicaenAuth/View/Helper/ConnectViewHelper.php b/src/UnicaenAuth/View/Helper/ConnectViewHelper.php new file mode 100644 index 0000000000000000000000000000000000000000..b5eebed04c2e2c18d70150ba8991a13ad051a5cc --- /dev/null +++ b/src/UnicaenAuth/View/Helper/ConnectViewHelper.php @@ -0,0 +1,38 @@ +view->shibConnect($form); + case 'cas': + return $this->view->casConnect($form); + case 'db': + return $this->view->dbConnect($form); + case 'ldap': + return $this->view->ldapConnect($form); + } + + throw new RuntimeException("Aucune aide de vue pour le type '$type'"); + } +} \ No newline at end of file diff --git a/src/UnicaenAuth/View/Helper/DbConnectViewHelper.php b/src/UnicaenAuth/View/Helper/DbConnectViewHelper.php new file mode 100644 index 0000000000000000000000000000000000000000..6b0ec684c5cd21666c07ecedeaeeb23796d1988f --- /dev/null +++ b/src/UnicaenAuth/View/Helper/DbConnectViewHelper.php @@ -0,0 +1,21 @@ +setType('db'); + $this->setTitle("Avec un compte local"); + } +} \ No newline at end of file diff --git a/src/UnicaenAuth/View/Helper/DbConnectViewHelperFactory.php b/src/UnicaenAuth/View/Helper/DbConnectViewHelperFactory.php new file mode 100644 index 0000000000000000000000000000000000000000..eb4b8f40d695c8388dde27cad8e9c748edc4f5e2 --- /dev/null +++ b/src/UnicaenAuth/View/Helper/DbConnectViewHelperFactory.php @@ -0,0 +1,30 @@ +get('unicaen-auth_module_options'); + $config = $moduleOptions->getDb(); + + $enabled = isset($config['enabled']) && (bool) $config['enabled']; + $description = $config['description'] ?? null; + + $helper = new DbConnectViewHelper(); + $helper->setEnabled($enabled); + $helper->setDescription($description); + $helper->setPasswordReset(true); + + return $helper; + } +} \ No newline at end of file diff --git a/src/UnicaenAuth/View/Helper/LdapConnectViewHelper.php b/src/UnicaenAuth/View/Helper/LdapConnectViewHelper.php index dbccf4fc2b9dbd0a44bfa80e0cc0069dc8123c40..6cad097126af9eead52ddf8cce74ba7733f400fa 100644 --- a/src/UnicaenAuth/View/Helper/LdapConnectViewHelper.php +++ b/src/UnicaenAuth/View/Helper/LdapConnectViewHelper.php @@ -2,75 +2,17 @@ namespace UnicaenAuth\View\Helper; -use Zend\Form\Form; -use Zend\View\Helper\AbstractHelper; -use Zend\View\Renderer\PhpRenderer; -use Zend\View\Resolver\TemplatePathStack; - /** * Aide de vue dessinant le formulaire d'authentification LDAP, * si l'authentification LDAP est activée. * - * @method PhpRenderer getView() * @author Unicaen */ -class LdapConnectViewHelper extends AbstractHelper +class LdapConnectViewHelper extends AbstractConnectViewHelper { - /** - * @var bool - */ - protected $enabled = true; - - /** - * @var Form - */ - protected $form; - - /** - * @param bool $enabled - * @return $this - */ - public function setEnabled($enabled = true) - { - $this->enabled = $enabled; - - return $this; - } - - /** - * @param Form $form - * @return $this - */ - public function __invoke(Form $form) + public function __construct() { - $this->form = $form; - - $this->getView()->resolver()->attach( - new TemplatePathStack(['script_paths' => [__DIR__ . "/partial"]]) - ); - - return $this; - } - - /** - * @return string - */ - public function __toString() - { - if (! $this->enabled) { - return ''; - } - - try { - return $this->getView()->render("connect", [ - 'title' => null, - 'enabled' => $this->enabled, - 'form' => $this->form, - 'redirect' => null, - 'passwordReset' => false, - ]); - } catch (\Exception $e) { - return '' . $e->getMessage() . '
' . $e->getTraceAsString() . '
'; - } + $this->setType('ldap'); + $this->setTitle("Avec mon compte établissement"); } } \ No newline at end of file diff --git a/src/UnicaenAuth/View/Helper/LdapConnectViewHelperFactory.php b/src/UnicaenAuth/View/Helper/LdapConnectViewHelperFactory.php index 056875650838c1bf6ec94ce4665e6b9b87c360ec..aaef569227dffff3bc4d10c3b109e4d3dfcfa45d 100644 --- a/src/UnicaenAuth/View/Helper/LdapConnectViewHelperFactory.php +++ b/src/UnicaenAuth/View/Helper/LdapConnectViewHelperFactory.php @@ -15,12 +15,14 @@ class LdapConnectViewHelperFactory { /** @var ModuleOptions $moduleOptions */ $moduleOptions = $container->get('unicaen-auth_module_options'); - $ldapArrayConfig = $moduleOptions->getLdap(); + $config = $moduleOptions->getLdap(); - $ldapEnabled = isset($ldapArrayConfig['enabled']) && (bool) $ldapArrayConfig['enabled']; + $enabled = isset($config['enabled']) && (bool) $config['enabled']; + $description = $config['description'] ?? null; $helper = new LdapConnectViewHelper(); - $helper->setEnabled($ldapEnabled); + $helper->setEnabled($enabled); + $helper->setDescription($description); return $helper; } diff --git a/src/UnicaenAuth/View/Helper/LocalConnectViewHelper.php b/src/UnicaenAuth/View/Helper/LocalConnectViewHelper.php index b2475ed8867a5b22a1ebeec08e66631f330fb5a9..189a8037322edf3c106f87674b8f07509c547d47 100644 --- a/src/UnicaenAuth/View/Helper/LocalConnectViewHelper.php +++ b/src/UnicaenAuth/View/Helper/LocalConnectViewHelper.php @@ -2,10 +2,7 @@ namespace UnicaenAuth\View\Helper; -use Zend\Form\Form; -use Zend\View\Helper\AbstractHelper; use Zend\View\Renderer\PhpRenderer; -use Zend\View\Resolver\TemplatePathStack; /** * Aide de vue dessinant le formulaire d'authentification locale, @@ -13,64 +10,9 @@ use Zend\View\Resolver\TemplatePathStack; * * @method PhpRenderer getView() * @author Unicaen + * @deprecated Remplacé par DbConnectViewHelper */ -class LocalConnectViewHelper extends AbstractHelper +class LocalConnectViewHelper extends DbConnectViewHelper { - /** - * @var bool - */ - protected $enabled = true; - /** - * @var Form - */ - protected $form; - - /** - * @param bool $enabled - * @return $this - */ - public function setEnabled($enabled = true) - { - $this->enabled = $enabled; - - return $this; - } - - /** - * @param Form $form - * @return $this - */ - public function __invoke(Form $form) - { - $this->form = $form; - - $this->getView()->resolver()->attach( - new TemplatePathStack(['script_paths' => [__DIR__ . "/partial"]]) - ); - - return $this; - } - - /** - * @return string - */ - public function __toString() - { - if (! $this->enabled) { - return ''; - } - - try { - return $this->getView()->render("connect", [ - 'title' => "Avec un compte local", - 'enabled' => $this->enabled, - 'form' => $this->form, - 'redirect' => null, - 'passwordReset' => true, - ]); - } catch (\Exception $e) { - return '' . $e->getMessage() . '
' . $e->getTraceAsString() . '
'; - } - } } \ No newline at end of file diff --git a/src/UnicaenAuth/View/Helper/LocalConnectViewHelperFactory.php b/src/UnicaenAuth/View/Helper/LocalConnectViewHelperFactory.php index 79a43f683b202d5e8d2a1457d5ec86f932629001..4524addc157d3e05df0a7e644554b1488156bc0c 100644 --- a/src/UnicaenAuth/View/Helper/LocalConnectViewHelperFactory.php +++ b/src/UnicaenAuth/View/Helper/LocalConnectViewHelperFactory.php @@ -5,6 +5,11 @@ namespace UnicaenAuth\View\Helper; use Interop\Container\ContainerInterface; use UnicaenAuth\Options\ModuleOptions; +/** + * Class LocalConnectViewHelperFactory + * + * @deprecated + */ class LocalConnectViewHelperFactory { /** @@ -15,12 +20,15 @@ class LocalConnectViewHelperFactory { /** @var ModuleOptions $moduleOptions */ $moduleOptions = $container->get('unicaen-auth_module_options'); - $config = $moduleOptions->getLocal(); + $config = $moduleOptions->getDb(); $enabled = isset($config['enabled']) && (bool) $config['enabled']; + $description = $config['description'] ?? null; $helper = new LocalConnectViewHelper(); $helper->setEnabled($enabled); + $helper->setDescription($description); + $helper->setPasswordReset(true); return $helper; } diff --git a/src/UnicaenAuth/View/Helper/ShibConnectViewHelper.php b/src/UnicaenAuth/View/Helper/ShibConnectViewHelper.php index 44669aa08087f9a6bac65b3a3dd5cb2c719fb572..0130a573b4d86cd7911c77204be052a0ecd4e4b6 100644 --- a/src/UnicaenAuth/View/Helper/ShibConnectViewHelper.php +++ b/src/UnicaenAuth/View/Helper/ShibConnectViewHelper.php @@ -2,8 +2,6 @@ namespace UnicaenAuth\View\Helper; -use UnicaenAuth\Service\Traits\ShibServiceAwareTrait; -use Zend\View\Helper\AbstractHelper; use Zend\View\Renderer\PhpRenderer; /** @@ -13,36 +11,11 @@ use Zend\View\Renderer\PhpRenderer; * @method PhpRenderer getView() * @author Unicaen */ -class ShibConnectViewHelper extends AbstractHelper +class ShibConnectViewHelper extends AbstractConnectViewHelper { - use ShibServiceAwareTrait; - - /** - * @return string - */ - public function __toString() - { - try { - return $this->render(); - } catch (\Exception $e) { - return '' . $e->getMessage() . '
' . $e->getTraceAsString() . '
'; - } - } - - /** - * @return string - */ - private function render() + public function __construct() { - if (! $this->shibService->isShibbolethEnabled()) { - return ''; - } - - $shibUrl = $this->getView()->url('auth/shibboleth', [], ['query' => $this->getView()->queryParams()], true); - - return <<- get($name = 'identity')->setAttributes(['id' => $name, 'class' => 'form-control']); - echo $this->formLabel($identity); - echo $this->formInput($identity); - ?> -
-- get($name = 'credential')->setAttributes(['id' => $name, 'class' => 'form-control']); - echo $this->formLabel($identity); - echo $this->formInput($identity); - ?> - - Mot de passe oublié - -
- - + +- formButton($form->get('submit')->setAttribute('class', 'btn btn-primary')) ?> -
+flashMessenger('zfcuser-login-form')): ?> ++ get($name = 'identity')->setAttributes(['id' => $name, 'class' => 'form-control']); + echo $this->formLabel($identity); + echo $this->formInput($identity); + ?> +
+ +has($name = 'credential')): ?> ++ get($name = 'credential')->setAttributes(['id' => $name, 'class' => 'form-control']); + echo $this->formLabel($identity); + echo $this->formInput($identity); + ?> + + Mot de passe oublié + +
+ + + + + + + + ++ formButton($form->get('submit')->setAttribute('class', 'btn btn-primary')) ?> +
+ +form()->closeTag() ?> diff --git a/tests/config/autoload/unicaen-auth.local.php b/tests/config/autoload/unicaen-auth.local.php index 9d2948186a2ea65a24d3f7f9a931a6a62be42d9d..3ef83992db8e40fc898f2895255a2653d053940c 100644 --- a/tests/config/autoload/unicaen-auth.local.php +++ b/tests/config/autoload/unicaen-auth.local.php @@ -7,11 +7,10 @@ */ $settings = [ /** - * Paramètres de connexion au serveur CAS : - * - pour désactiver l'authentification CAS, le tableau 'cas' doit être vide. - * - pour l'activer, renseigner les paramètres. + * Paramètres de connexion au serveur CAS. */ 'cas' => [ +// 'enabled' => true, // 'connection' => array( // 'default' => array( // 'params' => array( diff --git a/view/unicaen-auth/auth/login-tabs.phtml b/view/unicaen-auth/auth/login-tabs.phtml new file mode 100644 index 0000000000000000000000000000000000000000..ac4587f664ccc9af7c5d8970a071c40c31572c1f --- /dev/null +++ b/view/unicaen-auth/auth/login-tabs.phtml @@ -0,0 +1,69 @@ + ['enabled'=>true, 'type'=>'local'], 'shib' => ['enabled'=>true]] + * @var string $type Type d'authentification dont il faut afficher le formulaire : ex: 'local', {@see Adapter\Shib::TYPE} + * @var Form $form Formulaire de connexion + * @var string $redirect URL demandée nécessitant authentification + * + * @method AbstractConnectViewHelper connect() + */ + +/** @var Form $form */ +$form->prepare(); +$form->setAttributes([ + 'class' => 'form-horizontal', + 'role' => 'form', +]); + +/** @var AbstractConnectViewHelper[] $helpers */ +$helpers = []; +foreach ($types as $t => $config) { + if (isset($config['type'])) { + if ($config['type'] === 'local') { + $substitut = $config['type']; + $helpers[$substitut] = $this->connect($t, $form); + $helpers[$substitut]->setTitle("Avec un compte local"); + } + } else { + $helpers[$t] = $this->connect($t, $form); + } +} +if ($type === null || ! array_key_exists($type, $helpers)) { + $type = key($helpers); +} +$activeHelper = null; +?> + + + +
'unicaen-auth' => [
...
- 'shibboleth' => [
+ 'shib' => [
'enable' => true,
],
],
@@ -30,7 +30,7 @@
'unicaen-auth' => [
...
- 'shibboleth' => [
+ 'shib' => [
'enable' => true,
'simulate' => [
'eppn' => $eppn = 'premierf@univ.fr',
diff --git a/view/zfc-user/user/login.phtml b/view/zfc-user/user/login.phtml
deleted file mode 100644
index 1f6e9a7bbb698210f3d695a242f4880c393e42ea..0000000000000000000000000000000000000000
--- a/view/zfc-user/user/login.phtml
+++ /dev/null
@@ -1,66 +0,0 @@
-headTitle("Connexion") ?>
-
-loginForm;
-$form->prepare();
-$form->setAttributes([
- 'action' => $this->url('zfcuser/login'),
- 'method' => 'post',
- 'class' => 'form-horizontal',
- 'role' => 'form']);
-?>
-
-
-
-
-
-
- translate("Connexion"); ?>
-
-
-
- localConnect($form);
- $ldapAuthHtml = (string) $this->ldapConnect($form);
- $shibAuthHtml = (string) $this->shibConnect($form);
- echo implode('
', array_filter([$ldapAuthHtml, $shibAuthHtml, $localAuthHtml]));
- ?>
-
-
-
-
-
-enableRegistration) : ?>
-
- translate("Not registered?"); ?> translate("Sign up!"); ?>
-
-
-
-
-
\ No newline at end of file