Skip to content

Commit

Permalink
Merge pull request #41038 from nextcloud/fix-#41005-Resend-welcome-email
Browse files Browse the repository at this point in the history
Fix: #41005 Resend welcome email
  • Loading branch information
skjnldsv authored Feb 23, 2024
2 parents 2f09291 + ef1d9c6 commit eef571e
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion apps/provisioning_api/lib/Controller/UsersController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
* @copyright Copyright (c) 2023, Ezhil Shanmugham <[email protected]>
*
* @author Arthur Schiwon <[email protected]>
* @author Bjoern Schiessle <[email protected]>
Expand All @@ -25,6 +26,7 @@
* @author Tom Needham <[email protected]>
* @author Vincent Petry <[email protected]>
* @author Kate Döen <[email protected]>
* @author Ezhil Shanmugham <[email protected]>
*
* @license AGPL-3.0
*
Expand Down Expand Up @@ -1546,7 +1548,12 @@ public function resendWelcomeMessage(string $userId): DataResponse {
}

try {
$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
if ($this->config->getUserValue($targetUser->getUID(), 'core', 'lostpassword')) {
$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, true);
} else {
$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
}

$this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
} catch (\Exception $e) {
$this->logger->error(
Expand Down

0 comments on commit eef571e

Please sign in to comment.