Add option from config to clean expired passwords

README.md

@@ -17,8 +17,7 @@ can be a little slow because we are a small company with only two developers. I
 Requirements
 ------------
 
-* [Zend Framework 2](https://github.com/zendframework/zf2) (latest master).
-* [ZfcBase](https://github.com/ZF-Commons/ZfcBase) (latest master).
+* [Laminas]() (latest master).
 * [ZfcUser](https://github.com/ZF-Commons/ZfcUser) (latest master).
 * [GoalioMailService](https://github.com/goalio/GoalioMailService) (latest master).
 
@@ -58,7 +57,6 @@ Installation
     return array(
         'modules' => array(
             // ...
-            'ZfcBase',
             'ZfcUser',
             'GoalioMailService',
             'GoalioForgotPassword'
@@ -71,9 +69,9 @@ Installation
 
 3. Make sure that the MailService is configured correctly.
 
-### Post-Install: Zend\Db
+### Post-Install: Laminas\Db
 
-1. If you do not already have a valid Zend\Db\Adapter\Adapter in your service
+1. If you do not already have a valid Laminas\Db\Adapter\Adapter in your service
    manager configuration, put the following in `./config/autoload/database.local.php`:
 
         <?php
@@ -88,8 +86,8 @@ Installation
         return array(
             'service_manager' => array(
                 'factories' => array(
-                    'Zend\Db\Adapter\Adapter' => function ($sm) use ($dbParams) {
-                        return new Zend\Db\Adapter\Adapter(array(
+                    'Laminas\Db\Adapter\Adapter' => function ($sm) use ($dbParams) {
+                        return new Laminas\Db\Adapter\Adapter(array(
                             'driver'    => 'pdo',
                             'dsn'       => 'mysql:dbname='.$dbParams['database'].';host='.$dbParams['hostname'],
                             'database'  => $dbParams['database'],
@@ -126,7 +124,7 @@ The following options are available:
 - **reset_expire** - Integer value in seconds when the login cookie should expire.
   Default is `86400` (24 hours).
 - **email_transport** - String value which transport class to use.
-  Default is `Zend\Mail\Transport\Sendmail`.
+  Default is `Laminas\Mail\Transport\Sendmail`.
 - **reset_email_subject_line** - String value which transport class to use.
   Default is `You requested to reset your password`.
 - **email_from_address** - Array

composer.json

@@ -8,6 +8,15 @@
         "zfcuser"
     ],
     "homepage": "https://github.com/goalio/GoalioForgotPassword",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "git@gitlab.di.lv:DIVI/divi-mail.git",
+            "trunk-path": "trunk",
+            "branches-path": "branches",
+            "tags-path": "tags"
+        }
+    ],
     "authors": [
         {
             "name": "Philipp Dobrigkeit",
@@ -16,8 +25,8 @@
         }
     ],
     "require": {
-        "goalio/goalio-mailservice": "1.*",
-        "zf-commons/zfc-user": "1.*"
+        "divi/divi-mail": "^1.0",
+        "zf-commons/zfc-user": "4.*"
     },
     "autoload": {
         "psr-0": {

config/goalioforgotpassword.global.php.dist

@@ -36,9 +36,9 @@ $settings = array(
     /**
      * Mail Transport to use
      *
-     * Default: 'Zend\Mail\Transport\Sendmail'
+     * Default: 'Laminas\Mail\Transport\Sendmail'
      */
-    //'email_transport' => 'Zend\Mail\Transport\Sendmail',
+    //'email_transport' => 'Laminas\Mail\Transport\Sendmail',
 
     /**
      * Password Model Entity Class

config/module.config.php

@@ -9,8 +9,8 @@
         ),
     ),
     'controllers' => array(
-        'invokables' => array(
-            'goalioforgotpassword_forgot' => 'GoalioForgotPassword\Controller\ForgotController',
+        'factories' => array(
+            'goalioforgotpassword_forgot' => 'GoalioForgotPassword\Factory\Controller\ForgotControllerFactory',
         ),
     ),
 

src/GoalioForgotPassword/Controller/ForgotController.php

@@ -2,11 +2,11 @@
 
 namespace GoalioForgotPassword\Controller;
 
-use Zend\Form\Form;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\Stdlib\ResponseInterface as Response;
-use Zend\Stdlib\Parameters;
-use Zend\View\Model\ViewModel;
+use Laminas\Form\Form;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\Stdlib\ResponseInterface as Response;
+use Laminas\Stdlib\Parameters;
+use Laminas\View\Model\ViewModel;
 use GoalioForgotPassword\Service\Password as PasswordService;
 use GoalioForgotPassword\Options\ForgotControllerOptionsInterface;
 
@@ -54,6 +54,15 @@ class ForgotController extends AbstractActionController
      */
     protected $zfcUserOptions;
 
+    public function __construct($passwordService, $forgotForm, $resetForm, $userService, $options, $zfcUserOptions) {
+        $this->passwordService = $passwordService;
+        $this->forgotForm = $forgotForm;
+        $this->resetForm = $resetForm;
+        $this->userService = $userService;
+        $this->options = $options;
+        $this->zfcUserOptions = $zfcUserOptions;
+    }
+
     /**
      * User page
      */
@@ -160,9 +169,6 @@ public function resetAction()
 
     public function getUserService()
     {
-        if (!$this->userService) {
-            $this->userService = $this->getServiceLocator()->get('zfcuser_user_service');
-        }
         return $this->userService;
     }
 
@@ -174,9 +180,6 @@ public function setUserService(UserService $userService)
 
     public function getPasswordService()
     {
-        if (!$this->passwordService) {
-            $this->passwordService = $this->getServiceLocator()->get('goalioforgotpassword_password_service');
-        }
         return $this->passwordService;
     }
 
@@ -188,9 +191,6 @@ public function setPasswordService(PasswordService $passwordService)
 
     public function getForgotForm()
     {
-        if (!$this->forgotForm) {
-            $this->setForgotForm($this->getServiceLocator()->get('goalioforgotpassword_forgot_form'));
-        }
         return $this->forgotForm;
     }
 
@@ -201,9 +201,6 @@ public function setForgotForm(Form $forgotForm)
 
     public function getResetForm()
     {
-        if (!$this->resetForm) {
-            $this->setResetForm($this->getServiceLocator()->get('goalioforgotpassword_reset_form'));
-        }
         return $this->resetForm;
     }
 
@@ -231,17 +228,11 @@ public function setOptions(ForgotControllerOptionsInterface $options)
      */
     public function getOptions()
     {
-        if (!$this->options instanceof ForgotControllerOptionsInterface) {
-            $this->setOptions($this->getServiceLocator()->get('goalioforgotpassword_module_options'));
-        }
         return $this->options;
     }
 
     public function getZfcUserOptions()
     {
-        if (!$this->zfcUserOptions instanceof PasswordOptionsInterface) {
-            $this->zfcUserOptions = $this->getServiceLocator()->get('zfcuser_module_options');
-        }
         return $this->zfcUserOptions;
     }
 }

src/GoalioForgotPassword/Factory/Controller/ForgotControllerFactory.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace GoalioForgotPassword\Factory\Controller;
+
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
+use \Interop\Container\ContainerInterface;
+use GoalioForgotPassword\Controller\ForgotController;
+
+/**
+ * Description of UserControllerFactory
+ *
+ * @author prautmanis
+ */
+class ForgotControllerFactory implements FactoryInterface{
+
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null) {
+
+        $controller = new ForgotController(
+                $container->get('goalioforgotpassword_password_service'),
+                $container->get('goalioforgotpassword_forgot_form'),
+                $container->get('goalioforgotpassword_reset_form'),
+                $container->get('zfcuser_user_service'),
+                $container->get('goalioforgotpassword_module_options'),
+                $container->get('zfcuser_module_options')
+                );
+
+        return $controller;
+    }
+
+    public function createService(ServiceLocatorInterface $serviceLocator) {
+        return $this->__invoke($serviceLocator,null);
+    }
+}

src/GoalioForgotPassword/Factory/Service/PasswordFactory.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace GoalioForgotPassword\Factory\Service;
+
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
+use Interop\Container\ContainerInterface;
+use GoalioForgotPassword\Service\Password;
+
+/**
+ * Description of UserControllerFactory
+ *
+ * @author prautmanis
+ */
+class PasswordFactory implements FactoryInterface{
+
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = NULL) {
+        $controller = new Password(
+                $container->get('goalioforgotpassword_module_options'),
+                $container->get('goalioforgotpassword_password_mapper'),
+                $container->get('zfcuser_user_mapper'),
+                $container->get('goaliomailservice_message'),
+                $container->get('zfcuser_module_options')
+                );
+
+        return $controller;
+    }
+
+    public function createService(ServiceLocatorInterface $serviceLocator) {
+        return $this->__invoke($serviceLocator,null);
+    }
+}

src/GoalioForgotPassword/Form/Forgot.php

@@ -2,18 +2,18 @@
 
 namespace GoalioForgotPassword\Form;
 
-use Zend\Form\Element;
-use ZfcBase\Form\ProvidesEventsForm;
+use Laminas\Form\Element;
+use Laminas\Form\Form;
 use GoalioForgotPassword\Options\ForgotOptionsInterface;
 
-class Forgot extends ProvidesEventsForm
+class Forgot extends Form
 {
     /**
      * @var AuthenticationOptionsInterface
      */
     protected $forgotOptions;
 
-    public function __construct($name = null, ForgotOptionsInterface $options)
+    public function __construct($name, ForgotOptionsInterface $options)
     {
         $this->setForgotOptions($options);
         parent::__construct($name);
@@ -36,7 +36,6 @@ public function __construct($name = null, ForgotOptionsInterface $options)
             'priority' => -100,
         ));
 
-        $this->getEventManager()->trigger('init', $this);
     }
 
     public function setForgotOptions(ForgotOptionsInterface $forgotOptions)

src/GoalioForgotPassword/Form/ForgotFilter.php

@@ -2,7 +2,7 @@
 
 namespace GoalioForgotPassword\Form;
 
-use Zend\InputFilter\InputFilter;
+use Laminas\InputFilter\InputFilter;
 use GoalioForgotPassword\Options\ForgotOptionsInterface;
 
 class ForgotFilter extends InputFilter
@@ -12,6 +12,8 @@ class ForgotFilter extends InputFilter
      */
     protected $options;
 
+    protected $emailValidator;
+
     public function __construct( $emailValidator, ForgotOptionsInterface $options)
     {
         $this->setOptions($options);

src/GoalioForgotPassword/Form/Reset.php

@@ -2,19 +2,18 @@
 
 namespace GoalioForgotPassword\Form;
 
-use Zend\Form\Form;
-use Zend\Form\Element;
-use ZfcBase\Form\ProvidesEventsForm;
+use Laminas\Form\Form;
+use Laminas\Form\Element;
 use GoalioForgotPassword\Options\ForgotOptionsInterface;
 
-class Reset extends ProvidesEventsForm
+class Reset extends Form
 {
     /**
      * @var ForgotOptionsInterface
      */
     protected $forgotOptions;
 
-    public function __construct($name = null, ForgotOptionsInterface $forgotOptions)
+    public function __construct($name, ForgotOptionsInterface $forgotOptions)
     {
         $this->setForgotOptions($forgotOptions);
         parent::__construct($name);
@@ -50,7 +49,6 @@ public function __construct($name = null, ForgotOptionsInterface $forgotOptions)
             'priority' => -100,
         ));
 
-        $this->getEventManager()->trigger('init', $this);
     }
 
     public function setForgotOptions(ForgotOptionsInterface $forgotOptions)

src/GoalioForgotPassword/Form/ResetFilter.php

@@ -2,23 +2,26 @@
 
 namespace GoalioForgotPassword\Form;
 
-use ZfcBase\InputFilter\ProvidesEventsInputFilter as InputFilter;
+use Laminas\InputFilter\InputFilter;
 use GoalioForgotPassword\Options\ForgotOptionsInterface;
 
 class ResetFilter extends InputFilter
 {
-    public function __construct(ForgotOptionsInterface $options)
+    protected $passwordValidator;
+    public function __construct(ForgotOptionsInterface $options, $passwordValidator, $config)
     {
+        $this->passwordValidator = $passwordValidator;
         $this->add(array(
             'name'       => 'newCredential',
             'required'   => true,
             'validators' => array(
                 array(
                     'name'    => 'StringLength',
                     'options' => array(
-                        'min' => 6,
+                        'min' => $config['minPasswordLength'],
                     ),
                 ),
+                $this->passwordValidator,
             ),
             'filters'   => array(
                 array('name' => 'StringTrim'),
@@ -32,7 +35,7 @@ public function __construct(ForgotOptionsInterface $options)
                 array(
                     'name'    => 'StringLength',
                     'options' => array(
-                        'min' => 6,
+                        'min' => $config['minPasswordLength'],
                     ),
                 ),
                 array(
@@ -41,12 +44,12 @@ public function __construct(ForgotOptionsInterface $options)
                         'token' => 'newCredential'
                     )
                 ),
+                $this->passwordValidator,
             ),
             'filters'   => array(
                 array('name' => 'StringTrim'),
             ),
         ));
 
-		$this->getEventManager()->trigger('init', $this);
     }
 }