Fix the user email issue while creating a user
When the user is created, the provisioning api was not adding the email address of the user when provided if the `send email to new user` is not set. Signed-off-by: Sujith Haridasan <sujith.h@gmail.com>
This commit is contained in:
parent
4f5a24bb50
commit
c998209ec1
|
@ -337,19 +337,21 @@ class UsersController extends AUserData {
|
|||
}
|
||||
|
||||
// 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);
|
||||
try {
|
||||
$emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
|
||||
$this->newUserMailHelper->sendMail($newUser, $emailTemplate);
|
||||
} catch (\Exception $e) {
|
||||
// Mail could be failing hard or just be plain not configured
|
||||
// Logging error as it is the hardest of the two
|
||||
$this->logger->logException($e, [
|
||||
'message' => "Unable to send the invitation mail to $email",
|
||||
'level' => ILogger::ERROR,
|
||||
'app' => 'ocs_api',
|
||||
]);
|
||||
if ($this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
|
||||
try {
|
||||
$emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
|
||||
$this->newUserMailHelper->sendMail($newUser, $emailTemplate);
|
||||
} catch (\Exception $e) {
|
||||
// Mail could be failing hard or just be plain not configured
|
||||
// Logging error as it is the hardest of the two
|
||||
$this->logger->logException($e, [
|
||||
'message' => "Unable to send the invitation mail to $email",
|
||||
'level' => ILogger::ERROR,
|
||||
'app' => 'ocs_api',
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -500,9 +500,13 @@ class UsersControllerTest extends TestCase {
|
|||
->method('userExists')
|
||||
->with('NewUser')
|
||||
->willReturn(false);
|
||||
$newUser = $this->createMock(IUser::class);
|
||||
$newUser->expects($this->once())
|
||||
->method('setEMailAddress');
|
||||
$this->userManager
|
||||
->expects($this->once())
|
||||
->method('createUser');
|
||||
->method('createUser')
|
||||
->willReturn($newUser);
|
||||
$this->logger
|
||||
->expects($this->once())
|
||||
->method('info')
|
||||
|
|
Loading…
Reference in New Issue