Fixes #652, #683

src/Controller/Traits/PasswordManagementTrait.php

@@ -126,7 +126,8 @@ public function requestResetPassword()
                 'expiration' => Configure::read('Users.Token.expiration'),
                 'checkActive' => false,
                 'sendEmail' => true,
-                'ensureActive' => Configure::read('Users.Registration.ensureActive')
+                'ensureActive' => Configure::read('Users.Registration.ensureActive'),
+                'type' => 'password'
             ]);
             if ($resetUser) {
                 $msg = __d('CakeDC/Users', 'Please check your email to continue with password reset process');

src/Controller/Traits/UserValidationTrait.php

@@ -92,7 +92,7 @@ public function resendTokenValidation()
                 'expiration' => Configure::read('Users.Token.expiration'),
                 'checkActive' => true,
                 'sendEmail' => true,
-                'emailTemplate' => 'CakeDC/Users.validation'
+                'type' => 'email'
             ])) {
                 $this->Flash->success(__d(
                     'CakeDC/Users',

src/Model/Behavior/PasswordBehavior.php

@@ -70,7 +70,14 @@ public function resetToken($reference, array $options = [])
         $user->updateToken($expiration);
         $saveResult = $this->_table->save($user);
         if (Hash::get($options, 'sendEmail')) {
-            $this->sendResetPasswordEmail($user);
+            switch (Hash::get($options, 'type')) {
+                case 'email':
+                    $this->_sendValidationEmail($user);
+                    break;
+                case 'password':
+                    $this->_sendResetPasswordEmail($user);
+                    break;
+            }
         }
 
         return $saveResult;
@@ -82,13 +89,27 @@ public function resetToken($reference, array $options = [])
      * @param EntityInterface $user user
      * @return void
      */
-    protected function sendResetPasswordEmail($user)
+    protected function _sendResetPasswordEmail($user)
     {
         $this
             ->getMailer(Configure::read('Users.Email.mailerClass') ?: 'CakeDC/Users.Users')
             ->send('resetPassword', [$user]);
     }
 
+    /**
+     * Wrapper for mailer
+     *
+     * @param EntityInterface $user user
+     * @return void
+     */
+    protected function _sendValidationEmail($user)
+    {
+        $mailer = Configure::read('Users.Email.mailerClass') ?: 'CakeDC/Users.Users';
+        $this
+            ->getMailer($mailer)
+            ->send('validation', [$user]);
+    }
+
     /**
      * Get the user by email or username
      *

src/Model/Behavior/RegisterBehavior.php

@@ -194,27 +194,6 @@ public function getRegisterValidators($options)
         return $validator;
     }
 
-    /**
-     * @param EntityInterface $user User information
-     * @param array $options ['tokenExpiration]
-     * @return bool|EntityInterface
-     */
-    public function resendValidationEmail($user, $options)
-    {
-        if ($user->active) {
-            throw new UserAlreadyActiveException(__d('CakeDC/Users', "User account already validated"));
-        }
-
-        $tokenExpiration = Hash::get($options, 'token_expiration');
-        $user = $this->_updateActive($user, true, $tokenExpiration);
-        $userSaved = $this->_table->saveOrFail($user);
-        if ($userSaved) {
-            $this->_sendValidationEmail($userSaved);
-        }
-
-        return $userSaved;
-    }
-
     /**
      * Wrapper for mailer
      *

tests/TestCase/Model/Behavior/PasswordBehaviorTest.php

@@ -44,7 +44,7 @@ public function setUp()
         parent::setUp();
         $this->table = TableRegistry::getTableLocator()->get('CakeDC/Users.Users');
         $this->Behavior = $this->getMockBuilder('CakeDC\Users\Model\Behavior\PasswordBehavior')
-                ->setMethods(['sendResetPasswordEmail'])
+                ->setMethods(['_sendResetPasswordEmail'])
                 ->setConstructorArgs([$this->table])
                 ->getMock();
         Email::setConfigTransport('test', [
@@ -79,7 +79,7 @@ public function testResetToken()
         $user = $this->table->findByUsername('user-1')->first();
         $token = $user->token;
         $this->Behavior->expects($this->never())
-                ->method('sendResetPasswordEmail')
+                ->method('_sendResetPasswordEmail')
                 ->with($user);
         $result = $this->Behavior->resetToken('user-1', [
             'expiration' => 3600,
@@ -100,11 +100,12 @@ public function testResetTokenSendEmail()
         $token = $user->token;
         $tokenExpires = $user->token_expires;
         $this->Behavior->expects($this->once())
-                ->method('sendResetPasswordEmail');
+                ->method('_sendResetPasswordEmail');
         $result = $this->Behavior->resetToken('user-1', [
             'expiration' => 3600,
             'checkActive' => true,
-            'sendEmail' => true
+            'sendEmail' => true,
+            'type' => 'password'
         ]);
         $this->assertNotEquals($token, $result->token);
         $this->assertNotEquals($tokenExpires, $result->token_expires);
@@ -158,7 +159,7 @@ public function testResetTokenUserAlreadyActive()
         $this->table->expects($this->never())
                 ->method('save');
         $this->Behavior->expects($this->never())
-                ->method('sendResetPasswordEmail');
+                ->method('_sendResetPasswordEmail');
         $this->Behavior->resetToken('user-4', [
             'expiration' => 3600,
             'checkActive' => true,
@@ -229,7 +230,8 @@ public function testEmailOverride()
         $this->Behavior->resetToken('user-1', [
             'expiration' => 3600,
             'checkActive' => true,
-            'sendEmail' => true
+            'sendEmail' => true,
+            'type' => 'password'
         ]);
     }
 }

tests/TestCase/Model/Behavior/RegisterBehaviorTest.php

@@ -317,52 +317,4 @@ public function testRegisterUsingCustomRole()
         ]);
         $this->assertSame('emperor', $result['role']);
     }
-
-    /**
-     * Test resendValidationEmail method
-     *
-     * @return void
-     */
-    public function testResendValidationEmail()
-    {
-        $user = [
-            'username' => 'testuser',
-            'email' => 'testuser@test.com',
-            'password' => 'password',
-            'password_confirm' => 'password',
-            'first_name' => 'test',
-            'last_name' => 'user',
-            'tos' => 1
-        ];
-        $result = $this->Table->register($this->Table->newEntity(), $user, ['token_expiration' => 3600, 'validate_email' => 1]);
-        $this->assertFalse($result->active);
-        $originalExpiration = $result->token_expires;
-        $updatedResult = $this->Table->resendValidationEmail($result, ['token_expiration' => 4000]);
-        $this->assertNotEmpty($updatedResult);
-        $this->assertFalse($updatedResult->active);
-        $newExpiration = $updatedResult->token_expires;
-        $this->assertNotEquals($originalExpiration, $newExpiration);
-    }
-
-    /**
-     * Test resendValidationEmail method throw exception on active user
-     *
-     * @return void
-     */
-    public function testResendValidationEmailThrows()
-    {
-        $user = [
-            'username' => 'testuser',
-            'email' => 'testuser@test.com',
-            'password' => 'password',
-            'password_confirm' => 'password',
-            'first_name' => 'test',
-            'last_name' => 'user',
-            'tos' => 1
-        ];
-        $result = $this->Table->register($this->Table->newEntity(), $user, ['token_expiration' => 3600, 'validate_email' => 1]);
-        $activeUser = $this->Table->activateUser($result);
-        $this->expectException(UserAlreadyActiveException::class);
-        $updatedResult = $this->Table->resendValidationEmail($activeUser, ['token_expiration' => 4000]);
-    }
 }