mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25710 from nextcloud/backport/25707/stable19 

[stable19] Send emails on password reset to the displayname
This commit is contained in:
Joas Schilling 2021-02-23 11:58:09 +01:00 committed by GitHub
parent 33cebe106a 21e9e439e6
commit ed262743e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Controller/LostController.php
View File

@ -378,7 +378,7 @@ class LostController extends Controller {
try { try {
$message = $this->mailer->createMessage(); $message = $this->mailer->createMessage();
$message->setTo([$email => $user->getUID()]); $message->setTo([$email => $user->getDisplayName()]);
$message->setFrom([$this->from => $this->defaults->getName()]); $message->setFrom([$this->from => $this->defaults->getName()]);
$message->useTemplate($emailTemplate); $message->useTemplate($emailTemplate);
$this->mailer->send($message); $this->mailer->send($message);

9
tests/Core/Controller/LostControllerTest.php
View File

@ -94,6 +94,9 @@ class LostControllerTest extends \Test\TestCase {
$this->existingUser->expects($this->any()) $this->existingUser->expects($this->any())
->method('getUID') ->method('getUID')
->willReturn('ExistingUser'); ->willReturn('ExistingUser');
$this->existingUser->expects($this->any())
->method('getDisplayName')
->willReturn('Existing User');
$this->existingUser->expects($this->any()) $this->existingUser->expects($this->any())
->method('isEnabled') ->method('isEnabled')
->willReturn(true); ->willReturn(true);
@ -345,7 +348,7 @@ class LostControllerTest extends \Test\TestCase {
$message $message
->expects($this->at(0)) ->expects($this->at(0))
->method('setTo') ->method('setTo')
->with(['test@example.com' => 'ExistingUser']); ->with(['test@example.com' => 'Existing User']);
$message $message
->expects($this->at(1)) ->expects($this->at(1))
->method('setFrom') ->method('setFrom')
@ -423,7 +426,7 @@ class LostControllerTest extends \Test\TestCase {
$message $message
->expects($this->at(0)) ->expects($this->at(0))
->method('setTo') ->method('setTo')
->with(['test@example.com' => 'ExistingUser']); ->with(['test@example.com' => 'Existing User']);
$message $message
->expects($this->at(1)) ->expects($this->at(1))
->method('setFrom') ->method('setFrom')
@ -495,7 +498,7 @@ class LostControllerTest extends \Test\TestCase {
$message $message
->expects($this->at(0)) ->expects($this->at(0))
->method('setTo') ->method('setTo')
->with(['test@example.com' => 'ExistingUser']); ->with(['test@example.com' => 'Existing User']);
$message $message
->expects($this->at(1)) ->expects($this->at(1))
->method('setFrom') ->method('setFrom')