From 21e9e439e6eeb6e93a821ff09b269daeb39d8549 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 18 Feb 2021 12:38:43 +0100 Subject: [PATCH] Send emails on password reset to the displayname Signed-off-by: Joas Schilling --- core/Controller/LostController.php | 2 +- tests/Core/Controller/LostControllerTest.php | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php index 0a2e8d6b73..edecc1cd8c 100644 --- a/core/Controller/LostController.php +++ b/core/Controller/LostController.php @@ -378,7 +378,7 @@ class LostController extends Controller { try { $message = $this->mailer->createMessage(); - $message->setTo([$email => $user->getUID()]); + $message->setTo([$email => $user->getDisplayName()]); $message->setFrom([$this->from => $this->defaults->getName()]); $message->useTemplate($emailTemplate); $this->mailer->send($message); diff --git a/tests/Core/Controller/LostControllerTest.php b/tests/Core/Controller/LostControllerTest.php index 09f224131f..88651f4959 100644 --- a/tests/Core/Controller/LostControllerTest.php +++ b/tests/Core/Controller/LostControllerTest.php @@ -94,6 +94,9 @@ class LostControllerTest extends \Test\TestCase { $this->existingUser->expects($this->any()) ->method('getUID') ->willReturn('ExistingUser'); + $this->existingUser->expects($this->any()) + ->method('getDisplayName') + ->willReturn('Existing User'); $this->existingUser->expects($this->any()) ->method('isEnabled') ->willReturn(true); @@ -345,7 +348,7 @@ class LostControllerTest extends \Test\TestCase { $message ->expects($this->at(0)) ->method('setTo') - ->with(['test@example.com' => 'ExistingUser']); + ->with(['test@example.com' => 'Existing User']); $message ->expects($this->at(1)) ->method('setFrom') @@ -423,7 +426,7 @@ class LostControllerTest extends \Test\TestCase { $message ->expects($this->at(0)) ->method('setTo') - ->with(['test@example.com' => 'ExistingUser']); + ->with(['test@example.com' => 'Existing User']); $message ->expects($this->at(1)) ->method('setFrom') @@ -495,7 +498,7 @@ class LostControllerTest extends \Test\TestCase { $message ->expects($this->at(0)) ->method('setTo') - ->with(['test@example.com' => 'ExistingUser']); + ->with(['test@example.com' => 'Existing User']); $message ->expects($this->at(1)) ->method('setFrom')