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

Merge pull request #23203 from nextcloud/backport/23182/stable20 

[stable20] Fix the user email issue while creating a user
This commit is contained in:
Morris Jobke 2020-10-05 23:03:48 +02:00 committed by GitHub
parent 4f5a24bb50 c998209ec1
commit 20524cff33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/provisioning_api/lib/Controller/UsersController.php
View File

@ -337,8 +337,9 @@ class UsersController extends AUserData {
} }
// Send new user mail only if a mail is set // Send new user mail only if a mail is set
if ($email !== '' && $this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') { if ($email !== '') {
$newUser->setEMailAddress($email); $newUser->setEMailAddress($email);
if ($this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
try { try {
$emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken); $emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
$this->newUserMailHelper->sendMail($newUser, $emailTemplate); $this->newUserMailHelper->sendMail($newUser, $emailTemplate);
@ -352,6 +353,7 @@ class UsersController extends AUserData {
]); ]);
} }
} }
}
return new DataResponse(['id' => $userid]); return new DataResponse(['id' => $userid]);
} catch (HintException $e) { } catch (HintException $e) {

6
apps/provisioning_api/tests/Controller/UsersControllerTest.php
View File

@ -500,9 +500,13 @@ class UsersControllerTest extends TestCase {
->method('userExists') ->method('userExists')
->with('NewUser') ->with('NewUser')
->willReturn(false); ->willReturn(false);
$newUser = $this->createMock(IUser::class);
$newUser->expects($this->once())
->method('setEMailAddress');
$this->userManager $this->userManager
->expects($this->once()) ->expects($this->once())
->method('createUser'); ->method('createUser')
->willReturn($newUser);
$this->logger $this->logger
->expects($this->once()) ->expects($this->once())
->method('info') ->method('info')