Reset password email is sent when requesting a new validation email

[jtraulle]

The $options array passes emailTemplate key but it is not used anymore in PasswordBehavior.php since the implementation of the new Mailer/UsersMailer.php class.

users/src/Controller/Traits/UserValidationTrait.php

Lines 91 to 96 in aafdf85

	if ($this->getUsersTable()->resetToken($reference, [
	'expiration' => Configure::read('Users.Token.expiration'),
	'checkActive' => true,
	'sendEmail' => true,
	'emailTemplate' => 'CakeDC/Users.validation'
	])) {

users/src/Model/Behavior/PasswordBehavior.php

Lines 70 to 73 in aafdf85

	$user->updateToken($expiration);
	$saveResult = $this->_table->save($user);
	if (Hash::get($options, 'sendEmail')) {
	$this->sendResetPasswordEmail($user);

users/src/Model/Behavior/PasswordBehavior.php

Lines 85 to 90 in aafdf85

	protected function sendResetPasswordEmail($user)
	{
	$this
	->getMailer(Configure::read('Users.Email.mailerClass') ?: 'CakeDC/Users.Users')
	->send('resetPassword', [$user]);
	}

users/src/Mailer/UsersMailer.php

Lines 52 to 60 in aafdf85

	$subject = __d('CakeDC/Users', '{0}Your reset password link', $firstName);
	// un-hide the token to be able to send it in the email content
	$user->setHidden(['password', 'token_expires', 'api_token']);
	$this
	->to($user['email'])
	->setSubject($subject)
	->setViewVars($user->toArray())
	->setTemplate('CakeDC/Users.resetPassword');

I'll see what I can do to propose a PR to fix this tomorrow 😉

[jtraulle]

Whooops, this is a duplicates of #652