From 53c08c27dd04c3aff3e259e48a8fa0c9348bbaa6 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 17:30:52 +0100
Subject: [PATCH 01/23] fixup! feat(installation): implement
 InstallationCompletedEvent listener and related stubs

refactor: extract magic strings to class constants

Replace hardcoded magic strings with class constants for better maintainability:
- PostSetupJob: JOB_STATUS_DONE, JOB_STATUS_UNKNOWN, JOB_STATUS_CONFIG_KEY
- InstallationCompletedEventListener: JOB_STATUS_INIT, JOB_STATUS_CONFIG_KEY, ADMIN_CONFIG_PATH, ADMIN_USER_KEY

This improves code readability and reduces the risk of typos when using these values throughout the codebase.

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/BackgroundJob/PostSetupJob.php                  | 13 +++++++++----
 .../InstallationCompletedEventListener.php          |  9 ++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index abfdaf4..594d870 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -23,6 +23,11 @@
 use Psr\Log\LoggerInterface;
 
 class PostSetupJob extends TimedJob {
+	public const JOB_STATUS_INIT = 'INIT';
+	public const JOB_STATUS_DONE = 'DONE';
+	public const JOB_STATUS_UNKNOWN = 'UNKNOWN';
+	public const JOB_STATUS_CONFIG_KEY = 'post_install';
+
 	/**
 	 * @psalm-suppress PossiblyUnusedMethod - Constructor called by DI container
 	 */
@@ -48,14 +53,14 @@ public function __construct(
 	protected function run($argument): void {
 		// string post install variable
 		// used to check if job has already run
-		$jobStatus = $this->appConfig->getValueString(Application::APP_ID, 'post_install', 'UNKNOWN');
-		if ($jobStatus === 'DONE') {
+		$jobStatus = $this->appConfig->getValueString(Application::APP_ID, self::JOB_STATUS_CONFIG_KEY, self::JOB_STATUS_UNKNOWN);
+		if ($jobStatus === self::JOB_STATUS_DONE) {
 			$this->logger->debug('Job was already successful, remove job from jobList');
 			$this->jobList->remove($this);
 			return;
 		}
 
-		if ($jobStatus === 'UNKNOWN') {
+		if ($jobStatus === self::JOB_STATUS_UNKNOWN) {
 			$this->logger->debug('Could not load job status from database, wait for another retry');
 			return;
 		}
@@ -82,7 +87,7 @@ protected function sendInitialWelcomeMail(string $adminUserId): void {
 				$this->welcomeMailHelper->sendWelcomeMail($initAdminUser, true);
 			}
 		}
-		$this->appConfig->setValueString(Application::APP_ID, 'post_install', 'DONE');
+		$this->appConfig->setValueString(Application::APP_ID, self::JOB_STATUS_CONFIG_KEY, self::JOB_STATUS_DONE);
 		$this->jobList->remove($this);
 	}
 
diff --git a/lib/Listeners/InstallationCompletedEventListener.php b/lib/Listeners/InstallationCompletedEventListener.php
index 1bec805..ee83835 100644
--- a/lib/Listeners/InstallationCompletedEventListener.php
+++ b/lib/Listeners/InstallationCompletedEventListener.php
@@ -21,7 +21,10 @@
  * @template-implements IEventListener<Event>
  */
 class InstallationCompletedEventListener implements IEventListener {
-	private string $adminConfigPath = '/vault/secrets/adminconfig';
+	private const ADMIN_CONFIG_PATH = '/vault/secrets/adminconfig';
+	private const ADMIN_USER_KEY = 'NEXTCLOUD_ADMIN_USER';
+
+	private string $adminConfigPath = self::ADMIN_CONFIG_PATH;
 
 	private array $quotesArray = ['\\\'', '"', '\''];
 
@@ -37,7 +40,7 @@ public function __construct(
 
 	public function handle(Event $event): void {
 
-		$this->appConfig->setValueString(Application::APP_ID, 'post_install', 'INIT');
+		$this->appConfig->setValueString(Application::APP_ID, PostSetupJob::JOB_STATUS_CONFIG_KEY, PostSetupJob::JOB_STATUS_INIT);
 
 		$this->logger->debug('post Setup: init admin user');
 		$adminUserId = $this->initAdminUser();
@@ -66,7 +69,7 @@ protected function initAdminUser(): string {
 			}
 		}
 
-		$adminUser = $adminConfig['NEXTCLOUD_ADMIN_USER'] ?? '';
+		$adminUser = $adminConfig[self::ADMIN_USER_KEY] ?? '';
 		/** @psalm-suppress MixedArgumentTypeCoercion */
 		return str_replace($this->quotesArray, '', $adminUser);
 	}

From cc8776909e9a293b51dbd0768e315cf2edd29bc9 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 17:59:41 +0100
Subject: [PATCH 02/23] fixup! feat(installation): implement
 InstallationCompletedEvent listener and related stubs

refactor: use InstallationCompletedEvent properties instead of file parsing

Remove initAdminUser() method and config file reading logic in favor of using the event's built-in getAdminUsername() method. This eliminates the need for:
- Reading and parsing /vault/secrets/adminconfig
- Quote stripping logic
- ADMIN_CONFIG_PATH and ADMIN_USER_KEY constants

Updated stub to match the real implementation from https://github.com/nextcloud/server/pull/57522 including:
- Constructor with dataDirectory, adminUsername, and adminEmail parameters
- Getter methods: getDataDirectory(), getAdminUsername(), getAdminEmail()
- hasAdminUser() helper method

Benefits:
- Cleaner code with no file I/O operations
- No error handling needed for missing/malformed config files
- Uses official Nextcloud API instead of custom parsing
- Better type safety with proper event typing

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 .../InstallationCompletedEventListener.php    | 45 +++---------
 .../Events/InstallationCompletedEvent.php     | 48 +++++++++++++
 ...InstallationCompletedEventListenerTest.php | 69 ++++++++-----------
 3 files changed, 89 insertions(+), 73 deletions(-)

diff --git a/lib/Listeners/InstallationCompletedEventListener.php b/lib/Listeners/InstallationCompletedEventListener.php
index ee83835..7560995 100644
--- a/lib/Listeners/InstallationCompletedEventListener.php
+++ b/lib/Listeners/InstallationCompletedEventListener.php
@@ -15,18 +15,13 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\IAppConfig;
+use OCP\Install\Events\InstallationCompletedEvent;
 use Psr\Log\LoggerInterface;
 
 /**
- * @template-implements IEventListener<Event>
+ * @template-implements IEventListener<InstallationCompletedEvent>
  */
 class InstallationCompletedEventListener implements IEventListener {
-	private const ADMIN_CONFIG_PATH = '/vault/secrets/adminconfig';
-	private const ADMIN_USER_KEY = 'NEXTCLOUD_ADMIN_USER';
-
-	private string $adminConfigPath = self::ADMIN_CONFIG_PATH;
-
-	private array $quotesArray = ['\\\'', '"', '\''];
 
 	/**
 	 * @psalm-suppress PossiblyUnusedMethod - Constructor called by DI container
@@ -39,38 +34,20 @@ public function __construct(
 	}
 
 	public function handle(Event $event): void {
+		if (!$event instanceof InstallationCompletedEvent) {
+			return;
+		}
 
 		$this->appConfig->setValueString(Application::APP_ID, PostSetupJob::JOB_STATUS_CONFIG_KEY, PostSetupJob::JOB_STATUS_INIT);
 
-		$this->logger->debug('post Setup: init admin user');
-		$adminUserId = $this->initAdminUser();
-		$this->logger->debug('post Setup: admin user configured');
+		$adminUserId = $event->getAdminUsername();
+		if ($adminUserId === null) {
+			$this->logger->warning('No admin user provided in InstallationCompletedEvent');
+			return;
+		}
 
-		$this->logger->debug('post Setup: add send initial welcome mail job');
+		$this->logger->debug('post Setup: add send initial welcome mail job for user: ' . $adminUserId);
 		$this->jobList->add(PostSetupJob::class, $adminUserId);
 		$this->logger->debug('post Setup: job added');
 	}
-
-
-	protected function initAdminUser(): string {
-
-		// Read the configuration file line by line
-		$adminConfigLines = file($this->adminConfigPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-
-		// Initialize the associative array for the configuration
-		$adminConfig = [];
-
-		// Iterate through the lines and extract the variables
-		foreach ($adminConfigLines as $line) {
-			$parts = explode('=', $line, 2);
-			if (count($parts) === 2) {
-				[$key, $value] = $parts;
-				$adminConfig[trim($key)] = trim($value);
-			}
-		}
-
-		$adminUser = $adminConfig[self::ADMIN_USER_KEY] ?? '';
-		/** @psalm-suppress MixedArgumentTypeCoercion */
-		return str_replace($this->quotesArray, '', $adminUser);
-	}
 }
diff --git a/tests/stubs/OCP/Install/Events/InstallationCompletedEvent.php b/tests/stubs/OCP/Install/Events/InstallationCompletedEvent.php
index 2058b51..604cc03 100644
--- a/tests/stubs/OCP/Install/Events/InstallationCompletedEvent.php
+++ b/tests/stubs/OCP/Install/Events/InstallationCompletedEvent.php
@@ -14,6 +14,54 @@
 /**
  * Mock class for InstallationCompletedEvent
  * This is a stub for testing purposes when the actual class is not available in the OCP package
+ *
+ * @since 33.0.0
  */
 class InstallationCompletedEvent extends Event {
+	/**
+	 * @since 33.0.0
+	 */
+	public function __construct(
+		private string $dataDirectory,
+		private ?string $adminUsername = null,
+		private ?string $adminEmail = null,
+	) {
+		parent::__construct();
+	}
+
+	/**
+	 * Get the configured data directory path
+	 *
+	 * @since 33.0.0
+	 */
+	public function getDataDirectory(): string {
+		return $this->dataDirectory;
+	}
+
+	/**
+	 * Get the admin username if an admin user was created
+	 *
+	 * @since 33.0.0
+	 */
+	public function getAdminUsername(): ?string {
+		return $this->adminUsername;
+	}
+
+	/**
+	 * Get the admin email if configured
+	 *
+	 * @since 33.0.0
+	 */
+	public function getAdminEmail(): ?string {
+		return $this->adminEmail;
+	}
+
+	/**
+	 * Check if an admin user was created during installation
+	 *
+	 * @since 33.0.0
+	 */
+	public function hasAdminUser(): bool {
+		return $this->adminUsername !== null;
+	}
 }
diff --git a/tests/unit/Listeners/InstallationCompletedEventListenerTest.php b/tests/unit/Listeners/InstallationCompletedEventListenerTest.php
index 1c9387e..84bca29 100644
--- a/tests/unit/Listeners/InstallationCompletedEventListenerTest.php
+++ b/tests/unit/Listeners/InstallationCompletedEventListenerTest.php
@@ -14,6 +14,7 @@
 use OCP\BackgroundJob\IJobList;
 use OCP\EventDispatcher\Event;
 use OCP\IAppConfig;
+use OCP\Install\Events\InstallationCompletedEvent;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Test\TestCase;
@@ -24,8 +25,6 @@ class InstallationCompletedEventListenerTest extends TestCase {
 	private IJobList&MockObject $jobList;
 	private InstallationCompletedEventListener $listener;
 
-	private string $testAdminConfigPath;
-
 	protected function setUp(): void {
 		parent::setUp();
 
@@ -33,45 +32,25 @@ protected function setUp(): void {
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->jobList = $this->createMock(IJobList::class);
 
-		// Create temporary test config file
-		$this->testAdminConfigPath = sys_get_temp_dir() . '/test_adminconfig_' . uniqid();
-
 		$this->listener = new InstallationCompletedEventListener(
 			$this->appConfig,
 			$this->logger,
 			$this->jobList
 		);
-
-		// Use reflection to override config path for testing
-		$adminPathProperty = new \ReflectionProperty(InstallationCompletedEventListener::class, 'adminConfigPath');
-		$adminPathProperty->setAccessible(true);
-		$adminPathProperty->setValue($this->listener, $this->testAdminConfigPath);
-	}
-
-	protected function tearDown(): void {
-		// Clean up temporary file
-		if (file_exists($this->testAdminConfigPath)) {
-			unlink($this->testAdminConfigPath);
-		}
-
-		parent::tearDown();
 	}
 
 	public function testHandleSetsAppConfigAndAddsJob(): void {
-		// Create test config file
-		$adminConfig = <<<'EOT'
-NEXTCLOUD_ADMIN_USER=admin
-EOT;
-		file_put_contents($this->testAdminConfigPath, $adminConfig);
-
-		$event = $this->createMock(Event::class);
+		$event = new InstallationCompletedEvent(
+			'/var/www/html/data',
+			'admin',
+			'admin@example.com'
+		);
 
 		// Expect app config to be set for 'post_install'
 		$this->appConfig->expects($this->once())
 			->method('setValueString')
 			->with('ncw_tools', 'post_install', 'INIT');
 
-
 		// Expect job to be added
 		$this->jobList->expects($this->once())
 			->method('add')
@@ -84,24 +63,36 @@ public function testHandleSetsAppConfigAndAddsJob(): void {
 		$this->listener->handle($event);
 	}
 
-	public function testHandleWithQuotedValues(): void {
-		// Create test config file with quoted values
-		$adminConfig = <<<'EOT'
-NEXTCLOUD_ADMIN_USER="admin"
-EOT;
-		file_put_contents($this->testAdminConfigPath, $adminConfig);
-
-		$event = $this->createMock(Event::class);
+	public function testHandleWithoutAdminUser(): void {
+		$event = new InstallationCompletedEvent(
+			'/var/www/html/data'
+		);
 
 		$this->appConfig->expects($this->once())
 			->method('setValueString')
 			->with('ncw_tools', 'post_install', 'INIT');
 
-		// Expect job to be added with admin user (quotes should be stripped)
-		$this->jobList->expects($this->once())
-			->method('add')
-			->with(PostSetupJob::class, 'admin');
+		// Expect warning when no admin user
+		$this->logger->expects($this->once())
+			->method('warning')
+			->with('No admin user provided in InstallationCompletedEvent');
+
+		// Job should NOT be added
+		$this->jobList->expects($this->never())
+			->method('add');
+
+		$this->listener->handle($event);
+	}
+
+	public function testHandleWithWrongEventType(): void {
+		$event = $this->createMock(Event::class);
+
+		// Should not process non-InstallationCompletedEvent events
+		$this->appConfig->expects($this->never())
+			->method('setValueString');
 
+		$this->jobList->expects($this->never())
+			->method('add');
 
 		$this->listener->handle($event);
 	}

From dd7947f2477e08fe207e98bdd3c4828ae62f2d6f Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:03:22 +0100
Subject: [PATCH 03/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

refactor: simplify isUrlAvailable method

Extract status code to a variable to avoid duplicate method calls and improve readability.

Changed from:
  return response.getStatusCode() >= 200 && response.getStatusCode() < 300;

To:
  statusCode = response.getStatusCode();
  return statusCode >= 200 && statusCode < 300;

Benefits:
- Avoids redundant method call
- Slightly better performance
- Clearer intent with named variable

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/BackgroundJob/PostSetupJob.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index 594d870..f60d6f5 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -92,13 +92,12 @@ protected function sendInitialWelcomeMail(string $adminUserId): void {
 	}
 
 	private function isUrlAvailable(IClient $client, string $baseUrl): bool {
-
 		$url = $baseUrl . '/status.php';
 		try {
 			$this->logger->debug('Check URL: ' . $url);
 			$response = $client->get($url);
-			return $response->getStatusCode() >= 200 && $response->getStatusCode() < 300;
-
+			$statusCode = $response->getStatusCode();
+			return $statusCode >= 200 && $statusCode < 300;
 		} catch (\Exception $ex) {
 			$this->logger->debug('Exception for ' . $url . '. Reason: ' . $ex->getMessage());
 			return false;

From 3abb0bfbcf8f0cec81258f03c06572d60fb98b9f Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:04:38 +0100
Subject: [PATCH 04/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

refactor: remove redundant null check and improve control flow

Changed sendInitialWelcomeMail to use early return pattern when user doesn't exist, removing the redundant null check after userExists().

The userManager.get() can still return null in edge cases (e.g., user deleted between exists check and get), so we keep that null check but simplify the control flow.

Benefits:
- Clearer intent with early returns
- Job will now retry if user doesn't exist (doesn't mark as DONE)
- Removes unnecessary else block
- More consistent error handling

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/BackgroundJob/PostSetupJob.php            | 11 ++++++-----
 tests/unit/BackgroundJob/PostSetupJobTest.php |  7 +++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index f60d6f5..ecd6755 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -81,11 +81,12 @@ protected function sendInitialWelcomeMail(string $adminUserId): void {
 		}
 		if (! $this->userManager->userExists($adminUserId)) {
 			$this->logger->warning('Could not find install user, skip sending welcome mail');
-		} else {
-			$initAdminUser = $this->userManager->get($adminUserId);
-			if ($initAdminUser !== null) {
-				$this->welcomeMailHelper->sendWelcomeMail($initAdminUser, true);
-			}
+			return;
+		}
+
+		$initAdminUser = $this->userManager->get($adminUserId);
+		if ($initAdminUser !== null) {
+			$this->welcomeMailHelper->sendWelcomeMail($initAdminUser, true);
 		}
 		$this->appConfig->setValueString(Application::APP_ID, self::JOB_STATUS_CONFIG_KEY, self::JOB_STATUS_DONE);
 		$this->jobList->remove($this);
diff --git a/tests/unit/BackgroundJob/PostSetupJobTest.php b/tests/unit/BackgroundJob/PostSetupJobTest.php
index 9f1e8b3..85decc0 100644
--- a/tests/unit/BackgroundJob/PostSetupJobTest.php
+++ b/tests/unit/BackgroundJob/PostSetupJobTest.php
@@ -136,10 +136,9 @@ public function testRunWithPendingStatus(): void {
 			->method('warning')
 			->with('Could not find install user, skip sending welcome mail');
 
-		// setValueString is called even when user doesn't exist
-		$this->appConfig->expects($this->once())
-			->method('setValueString')
-			->with('ncw_tools', 'post_install', 'DONE');
+		// setValueString should NOT be called when user doesn't exist (job will retry)
+		$this->appConfig->expects($this->never())
+			->method('setValueString');
 
 		// Use reflection to call protected method
 		$reflection = new \ReflectionClass($this->job);

From e374051a7e70d04f0de486e52950b73a4bc6b1de Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:07:21 +0100
Subject: [PATCH 05/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

refactor: inject ITimeFactory via DI instead of direct instantiation

Replace direct instantiation of TimeFactory with dependency injection using ITimeFactory interface in WelcomeMailHelper.

Changed from:
  new TimeFactory()

To:
  Constructor parameter: private ITimeFactory timeFactory
  Usage: this->timeFactory

Benefits:
- Better testability with mock injection
- Follows dependency injection pattern consistently
- Uses interface instead of concrete implementation
- Aligns with Nextcloud DI container best practices

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/Helper/WelcomeMailHelper.php            | 5 +++--
 tests/unit/Helper/WelcomeMailHelperTest.php | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/Helper/WelcomeMailHelper.php b/lib/Helper/WelcomeMailHelper.php
index b318657..cbde8b1 100644
--- a/lib/Helper/WelcomeMailHelper.php
+++ b/lib/Helper/WelcomeMailHelper.php
@@ -9,8 +9,8 @@
 
 namespace OCA\NcwTools\Helper;
 
-use OC\AppFramework\Utility\TimeFactory;
 use OCA\Settings\Mailer\NewUserMailHelper;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Defaults;
 use OCP\IConfig;
 use OCP\IURLGenerator;
@@ -33,6 +33,7 @@ public function __construct(
 		private IFactory $l10NFactory,
 		private ISecureRandom $secureRandom,
 		private IConfig $config,
+		private ITimeFactory $timeFactory,
 	) {
 	}
 
@@ -48,7 +49,7 @@ public function sendWelcomeMail(IUser $user, bool $generatePasswordResetToken):
 			$this->l10NFactory,
 			$this->mailer,
 			$this->secureRandom,
-			new TimeFactory(),
+			$this->timeFactory,
 			$this->config,
 			$this->crypto,
 			Util::getDefaultEmailAddress('no-reply')
diff --git a/tests/unit/Helper/WelcomeMailHelperTest.php b/tests/unit/Helper/WelcomeMailHelperTest.php
index 1695ba4..f922df8 100644
--- a/tests/unit/Helper/WelcomeMailHelperTest.php
+++ b/tests/unit/Helper/WelcomeMailHelperTest.php
@@ -10,6 +10,7 @@
 namespace OCA\NcwTools\Tests\Unit\Helper;
 
 use OCA\NcwTools\Helper\WelcomeMailHelper;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Defaults;
 use OCP\IConfig;
 use OCP\IL10N;
@@ -32,6 +33,7 @@ class WelcomeMailHelperTest extends TestCase {
 	private IFactory&MockObject $l10NFactory;
 	private ISecureRandom&MockObject $secureRandom;
 	private IConfig&MockObject $config;
+	private ITimeFactory&MockObject $timeFactory;
 	private WelcomeMailHelper $welcomeMailHelper;
 
 	protected function setUp(): void {
@@ -44,6 +46,7 @@ protected function setUp(): void {
 		$this->l10NFactory = $this->createMock(IFactory::class);
 		$this->secureRandom = $this->createMock(ISecureRandom::class);
 		$this->config = $this->createMock(IConfig::class);
+		$this->timeFactory = $this->createMock(ITimeFactory::class);
 
 		// Mock IL10N for l10NFactory
 		$l10n = $this->createMock(IL10N::class);
@@ -98,7 +101,8 @@ protected function setUp(): void {
 			$this->urlGenerator,
 			$this->l10NFactory,
 			$this->secureRandom,
-			$this->config
+			$this->config,
+			$this->timeFactory
 		);
 	}
 
@@ -147,6 +151,7 @@ public function testConstructorInitializesCorrectly(): void {
 			$this->l10NFactory,
 			$this->secureRandom,
 			$this->config,
+			$this->timeFactory
 		);
 
 		$this->assertInstanceOf(WelcomeMailHelper::class, $helper);

From 8140ffda1bfc2440cf2814b8292c69429ed5eabd Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:10:55 +0100
Subject: [PATCH 06/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

fix: add validation for overwrite.cli.url configuration

Add check to ensure overwrite.cli.url is configured before attempting to use it.

If the URL is not set or empty, the job will log a warning and return early, allowing the job to retry on the next cron run in case the configuration is added later.

This prevents potential issues with empty URLs being passed to the HTTP client.

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/BackgroundJob/PostSetupJob.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index ecd6755..1172238 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -72,9 +72,14 @@ protected function run($argument): void {
 	}
 
 	protected function sendInitialWelcomeMail(string $adminUserId): void {
-
 		$client = $this->clientService->newClient();
 		$overwriteUrl = (string)$this->config->getSystemValue('overwrite.cli.url');
+
+		if (empty($overwriteUrl)) {
+			$this->logger->warning('overwrite.cli.url is not configured, skip sending welcome mail');
+			return;
+		}
+
 		if (! $this->isUrlAvailable($client, $overwriteUrl)) {
 			$this->logger->debug('domain is not ready yet, retry with cron until ' . $overwriteUrl . ' is accessible');
 			return;

From 95762ba417102299a8af272d8b34e6c54e1af0ab Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:17:24 +0100
Subject: [PATCH 07/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

refactor: improve logging with structured context in isUrlAvailable

Replace string concatenation with structured logging arrays for better observability:
- Use context arrays instead of string concatenation
- Change exception logging from debug to info level (more appropriate for network errors)
- Improve log message wording: 'Checking URL availability' instead of 'Check URL:'
- Add structured context: url and exception message

Benefits:
- Better log aggregation and filtering in production
- Proper log level for transient network issues
- Easier to parse and analyze logs

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/BackgroundJob/PostSetupJob.php            |  7 +++++--
 tests/unit/BackgroundJob/PostSetupJobTest.php | 16 ++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index 1172238..56c7f4b 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -100,12 +100,15 @@ protected function sendInitialWelcomeMail(string $adminUserId): void {
 	private function isUrlAvailable(IClient $client, string $baseUrl): bool {
 		$url = $baseUrl . '/status.php';
 		try {
-			$this->logger->debug('Check URL: ' . $url);
+			$this->logger->debug('Checking URL availability', ['url' => $url]);
 			$response = $client->get($url);
 			$statusCode = $response->getStatusCode();
 			return $statusCode >= 200 && $statusCode < 300;
 		} catch (\Exception $ex) {
-			$this->logger->debug('Exception for ' . $url . '. Reason: ' . $ex->getMessage());
+			$this->logger->info('URL not yet accessible', [
+				'url' => $url,
+				'exception' => $ex->getMessage(),
+			]);
 			return false;
 		}
 	}
diff --git a/tests/unit/BackgroundJob/PostSetupJobTest.php b/tests/unit/BackgroundJob/PostSetupJobTest.php
index 85decc0..ba860f5 100644
--- a/tests/unit/BackgroundJob/PostSetupJobTest.php
+++ b/tests/unit/BackgroundJob/PostSetupJobTest.php
@@ -168,15 +168,19 @@ public function testRunWithUrlNotAvailable(): void {
 			->method('newClient')
 			->willReturn($client);
 
-		// Expect 5 debug calls:
+		// Expect 4 debug calls:
 		// 1. "Post install job started"
-		// 2. "Check URL: ..."
-		// 3. "Exception for..."
-		// 4. "domain is not ready yet..."
-		// 5. "Post install job finished"
-		$this->logger->expects($this->exactly(5))
+		// 2. "Checking URL availability"
+		// 3. "domain is not ready yet..."
+		// 4. "Post install job finished"
+		$this->logger->expects($this->exactly(4))
 			->method('debug');
 
+		// Expect 1 info call for the exception
+		$this->logger->expects($this->once())
+			->method('info')
+			->with('URL not yet accessible', $this->anything());
+
 		$this->appConfig->expects($this->never())
 			->method('setValueString');
 

From b60934dccc4212b91f080e22be2055d115516457 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:18:51 +0100
Subject: [PATCH 08/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

refactor: improve log messages with context and appropriate levels

Enhanced logging throughout PostSetupJob with structured context and proper log levels:

Log level improvements:
- Changed job completion to info (was debug) - important milestone
- Changed job status unknown to warning (was debug) - indicates potential issue
- Changed URL unavailability to info (was debug) - transient expected condition

Message improvements:
- 'Post-installation job' instead of 'Post install job' for consistency
- 'Admin user not found, cannot send welcome email' instead of 'Could not find install user, skip sending welcome mail'
- 'System not ready, will retry' instead of 'domain is not ready yet, retry with cron until...'
- 'System URL not configured' instead of 'overwrite.cli.url is not configured'

Added structured context:
- adminUserId in all relevant log messages
- config_key for configuration errors
- url for availability checks

Benefits:
- Better log filtering and analysis in production
- Clearer user-facing messages
- Consistent terminology (email vs mail, system vs domain)
- Proper log levels for different scenarios

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/BackgroundJob/PostSetupJob.php            | 22 +++++++----
 tests/unit/BackgroundJob/PostSetupJobTest.php | 37 ++++++++-----------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index 56c7f4b..17ca11a 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -55,20 +55,20 @@ protected function run($argument): void {
 		// used to check if job has already run
 		$jobStatus = $this->appConfig->getValueString(Application::APP_ID, self::JOB_STATUS_CONFIG_KEY, self::JOB_STATUS_UNKNOWN);
 		if ($jobStatus === self::JOB_STATUS_DONE) {
-			$this->logger->debug('Job was already successful, remove job from jobList');
+			$this->logger->info('Post-installation job already completed, removing from queue');
 			$this->jobList->remove($this);
 			return;
 		}
 
 		if ($jobStatus === self::JOB_STATUS_UNKNOWN) {
-			$this->logger->debug('Could not load job status from database, wait for another retry');
+			$this->logger->warning('Job status unknown, waiting for initialization');
 			return;
 		}
 
-		$this->logger->debug('Post install job started');
 		$initAdminId = (string)$argument;
+		$this->logger->info('Starting post-installation job', ['adminUserId' => $initAdminId]);
 		$this->sendInitialWelcomeMail($initAdminId);
-		$this->logger->debug('Post install job finished');
+		$this->logger->info('Post-installation job completed', ['adminUserId' => $initAdminId]);
 	}
 
 	protected function sendInitialWelcomeMail(string $adminUserId): void {
@@ -76,16 +76,24 @@ protected function sendInitialWelcomeMail(string $adminUserId): void {
 		$overwriteUrl = (string)$this->config->getSystemValue('overwrite.cli.url');
 
 		if (empty($overwriteUrl)) {
-			$this->logger->warning('overwrite.cli.url is not configured, skip sending welcome mail');
+			$this->logger->warning('System URL not configured, cannot send welcome email', [
+				'adminUserId' => $adminUserId,
+				'config_key' => 'overwrite.cli.url',
+			]);
 			return;
 		}
 
 		if (! $this->isUrlAvailable($client, $overwriteUrl)) {
-			$this->logger->debug('domain is not ready yet, retry with cron until ' . $overwriteUrl . ' is accessible');
+			$this->logger->info('System not ready, will retry sending welcome email', [
+				'adminUserId' => $adminUserId,
+				'url' => $overwriteUrl,
+			]);
 			return;
 		}
 		if (! $this->userManager->userExists($adminUserId)) {
-			$this->logger->warning('Could not find install user, skip sending welcome mail');
+			$this->logger->warning('Admin user not found, cannot send welcome email', [
+				'adminUserId' => $adminUserId,
+			]);
 			return;
 		}
 
diff --git a/tests/unit/BackgroundJob/PostSetupJobTest.php b/tests/unit/BackgroundJob/PostSetupJobTest.php
index ba860f5..e9930ab 100644
--- a/tests/unit/BackgroundJob/PostSetupJobTest.php
+++ b/tests/unit/BackgroundJob/PostSetupJobTest.php
@@ -66,8 +66,8 @@ public function testRunWithJobAlreadyDone(): void {
 			->willReturn('DONE');
 
 		$this->logger->expects($this->once())
-			->method('debug')
-			->with('Job was already successful, remove job from jobList');
+			->method('info')
+			->with('Post-installation job already completed, removing from queue');
 
 		// Use reflection to call protected method
 		$reflection = new \ReflectionClass($this->job);
@@ -83,8 +83,8 @@ public function testRunWithUnknownStatus(): void {
 			->willReturn('UNKNOWN');
 
 		$this->logger->expects($this->once())
-			->method('debug')
-			->with('Could not load job status from database, wait for another retry');
+			->method('warning')
+			->with('Job status unknown, waiting for initialization');
 
 		// Use reflection to call protected method
 		$reflection = new \ReflectionClass($this->job);
@@ -124,17 +124,13 @@ public function testRunWithPendingStatus(): void {
 			->with('test-admin')
 			->willReturn(false);
 
-		// Expect 4 debug calls:
-		// 1. "Post install job started"
-		// 2. "Check URL: ..."
-		// 3. (conditional - only if URL check fails) "domain is not ready yet..."
-		// 4. "Post install job finished"
+		// Expect info logs for job start/completion and system ready
 		$this->logger->expects($this->atLeastOnce())
-			->method('debug');
+			->method('info');
 
 		$this->logger->expects($this->once())
 			->method('warning')
-			->with('Could not find install user, skip sending welcome mail');
+			->with('Admin user not found, cannot send welcome email', $this->anything());
 
 		// setValueString should NOT be called when user doesn't exist (job will retry)
 		$this->appConfig->expects($this->never())
@@ -168,18 +164,17 @@ public function testRunWithUrlNotAvailable(): void {
 			->method('newClient')
 			->willReturn($client);
 
-		// Expect 4 debug calls:
-		// 1. "Post install job started"
-		// 2. "Checking URL availability"
-		// 3. "domain is not ready yet..."
-		// 4. "Post install job finished"
-		$this->logger->expects($this->exactly(4))
-			->method('debug');
+		// Expect info calls for:
+		// 1. "Starting post-installation job"
+		// 2. "URL not yet accessible" (from exception)
+		// 3. "System not ready, will retry sending welcome email"
+		// 4. "Post-installation job completed"
+		$this->logger->expects($this->atLeastOnce())
+			->method('info');
 
-		// Expect 1 info call for the exception
+		// Expect 1 debug call for URL checking
 		$this->logger->expects($this->once())
-			->method('info')
-			->with('URL not yet accessible', $this->anything());
+			->method('debug');
 
 		$this->appConfig->expects($this->never())
 			->method('setValueString');

From 7e715c35a07585d2c7e32515827cfb38892ed857 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:19:38 +0100
Subject: [PATCH 09/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

fix: handle null user retrieval and prevent marking job as done

Fix edge case where userManager.get() returns null after userExists() check.

Previously, if the user was deleted between userExists() and get() calls, the job would still mark itself as DONE without sending the email. Now the job will:
- Log an error message with context
- Return early without marking as DONE
- Retry on next cron run

This ensures the welcome email is eventually sent if the user becomes available again.

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/BackgroundJob/PostSetupJob.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index 17ca11a..03d36db 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -98,9 +98,14 @@ protected function sendInitialWelcomeMail(string $adminUserId): void {
 		}
 
 		$initAdminUser = $this->userManager->get($adminUserId);
-		if ($initAdminUser !== null) {
-			$this->welcomeMailHelper->sendWelcomeMail($initAdminUser, true);
+		if ($initAdminUser === null) {
+			$this->logger->error('Failed to retrieve admin user, will retry', [
+				'adminUserId' => $adminUserId,
+			]);
+			return;
 		}
+
+		$this->welcomeMailHelper->sendWelcomeMail($initAdminUser, true);
 		$this->appConfig->setValueString(Application::APP_ID, self::JOB_STATUS_CONFIG_KEY, self::JOB_STATUS_DONE);
 		$this->jobList->remove($this);
 	}

From ac6a432c85d84dbb78c68cfe9b83ea28a1a39fc3 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:24:40 +0100
Subject: [PATCH 10/23] fixup! feat(installation): implement
 InstallationCompletedEvent listener and related stubs

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/Listeners/InstallationCompletedEventListener.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Listeners/InstallationCompletedEventListener.php b/lib/Listeners/InstallationCompletedEventListener.php
index 7560995..a6f1f6f 100644
--- a/lib/Listeners/InstallationCompletedEventListener.php
+++ b/lib/Listeners/InstallationCompletedEventListener.php
@@ -46,8 +46,8 @@ public function handle(Event $event): void {
 			return;
 		}
 
-		$this->logger->debug('post Setup: add send initial welcome mail job for user: ' . $adminUserId);
+		$this->logger->info('Scheduling welcome email job', ['adminUserId' => $adminUserId]);
 		$this->jobList->add(PostSetupJob::class, $adminUserId);
-		$this->logger->debug('post Setup: job added');
+		$this->logger->debug('Welcome email job scheduled successfully', ['adminUserId' => $adminUserId]);
 	}
 }

From be0e3a6f5f838d957177ff583a722d4e9ef9583d Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:26:08 +0100
Subject: [PATCH 11/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/BackgroundJob/PostSetupJob.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index 03d36db..b469dbb 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -105,7 +105,16 @@ protected function sendInitialWelcomeMail(string $adminUserId): void {
 			return;
 		}
 
-		$this->welcomeMailHelper->sendWelcomeMail($initAdminUser, true);
+		try {
+			$this->welcomeMailHelper->sendWelcomeMail($initAdminUser, true);
+		} catch (\Throwable $e) {
+			$this->logger->error('Failed to send welcome email, will retry', [
+				'adminUserId' => $adminUserId,
+				'exception' => $e->getMessage(),
+			]);
+			return;
+		}
+
 		$this->appConfig->setValueString(Application::APP_ID, self::JOB_STATUS_CONFIG_KEY, self::JOB_STATUS_DONE);
 		$this->jobList->remove($this);
 	}

From 196f8d8c599ff53ef3d730da11ba5815c82ece47 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:26:48 +0100
Subject: [PATCH 12/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/BackgroundJob/PostSetupJob.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index b469dbb..10e6004 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -27,6 +27,7 @@ class PostSetupJob extends TimedJob {
 	public const JOB_STATUS_DONE = 'DONE';
 	public const JOB_STATUS_UNKNOWN = 'UNKNOWN';
 	public const JOB_STATUS_CONFIG_KEY = 'post_install';
+	private const RETRY_INTERVAL_SECONDS = 2;
 
 	/**
 	 * @psalm-suppress PossiblyUnusedMethod - Constructor called by DI container
@@ -42,8 +43,7 @@ public function __construct(
 		private WelcomeMailHelper $welcomeMailHelper,
 	) {
 		parent::__construct($timeFactory);
-		// Interval every 2 seconds
-		$this->setInterval(2);
+		$this->setInterval(self::RETRY_INTERVAL_SECONDS);
 		$this->setTimeSensitivity(IJob::TIME_SENSITIVE);
 	}
 

From 9742e89ce8028a6e911bc5e475277e0f870450b4 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:28:19 +0100
Subject: [PATCH 13/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/BackgroundJob/PostSetupJob.php | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index 10e6004..f619196 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -48,7 +48,12 @@ public function __construct(
 	}
 
 	/**
-	 * @param mixed $argument
+	 * Execute the post-installation job
+	 *
+	 * Checks if the job has already completed and sends the initial welcome email
+	 * to the admin user. The job will retry until successful or marked as done.
+	 *
+	 * @param mixed $argument The admin user ID as a string
 	 */
 	protected function run($argument): void {
 		// string post install variable
@@ -71,6 +76,15 @@ protected function run($argument): void {
 		$this->logger->info('Post-installation job completed', ['adminUserId' => $initAdminId]);
 	}
 
+	/**
+	 * Send initial welcome email to the admin user
+	 *
+	 * Validates system URL configuration, checks URL availability, verifies user exists,
+	 * and sends the welcome email with a password reset token. On success, marks the job
+	 * as done and removes it from the queue. Failures are logged and will trigger a retry.
+	 *
+	 * @param string $adminUserId The admin user ID to send the welcome email to
+	 */
 	protected function sendInitialWelcomeMail(string $adminUserId): void {
 		$client = $this->clientService->newClient();
 		$overwriteUrl = (string)$this->config->getSystemValue('overwrite.cli.url');
@@ -119,6 +133,16 @@ protected function sendInitialWelcomeMail(string $adminUserId): void {
 		$this->jobList->remove($this);
 	}
 
+	/**
+	 * Check if the system URL is accessible
+	 *
+	 * Performs an HTTP GET request to the status.php endpoint to verify the system
+	 * is ready. Returns true if the response status code is in the 2xx range.
+	 *
+	 * @param IClient $client The HTTP client to use for the request
+	 * @param string $baseUrl The base URL to check (e.g., https://example.com)
+	 * @return bool True if the URL is accessible, false otherwise
+	 */
 	private function isUrlAvailable(IClient $client, string $baseUrl): bool {
 		$url = $baseUrl . '/status.php';
 		try {

From 6ace281fcae45bf18c634f50fe06c66710bc3330 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:28:32 +0100
Subject: [PATCH 14/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/Helper/WelcomeMailHelper.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/Helper/WelcomeMailHelper.php b/lib/Helper/WelcomeMailHelper.php
index cbde8b1..8c209e6 100644
--- a/lib/Helper/WelcomeMailHelper.php
+++ b/lib/Helper/WelcomeMailHelper.php
@@ -38,6 +38,15 @@ public function __construct(
 	}
 
 	/**
+	 * Send a welcome email to a user with optional password reset token
+	 *
+	 * Creates a NewUserMailHelper instance and uses it to generate and send
+	 * the welcome email template to the specified user.
+	 *
+	 * @param IUser $user The user to send the welcome email to
+	 * @param bool $generatePasswordResetToken Whether to include a password reset token in the email
+	 * @throws \Exception If email generation or sending fails
+	 *
 	 * @psalm-suppress UndefinedClass - Using internal Nextcloud classes
 	 * @psalm-suppress MixedAssignment
 	 * @psalm-suppress MixedMethodCall

From 9c65cc171751f9f5b9bc1509fd69128ce7cffc96 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:28:47 +0100
Subject: [PATCH 15/23] fixup! feat(installation): implement
 InstallationCompletedEvent listener and related stubs

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/Listeners/InstallationCompletedEventListener.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/Listeners/InstallationCompletedEventListener.php b/lib/Listeners/InstallationCompletedEventListener.php
index a6f1f6f..6d151ce 100644
--- a/lib/Listeners/InstallationCompletedEventListener.php
+++ b/lib/Listeners/InstallationCompletedEventListener.php
@@ -33,6 +33,14 @@ public function __construct(
 	) {
 	}
 
+	/**
+	 * Handle the InstallationCompletedEvent
+	 *
+	 * When installation completes, this listener schedules a PostSetupJob
+	 * to send the initial welcome email to the admin user.
+	 *
+	 * @param Event $event The event to handle (must be InstallationCompletedEvent)
+	 */
 	public function handle(Event $event): void {
 		if (!$event instanceof InstallationCompletedEvent) {
 			return;

From 70a03f1933f37771c83bedc963495cb8d4a93791 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:37:40 +0100
Subject: [PATCH 16/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/BackgroundJob/PostSetupJob.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index f619196..c736780 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -27,7 +27,6 @@ class PostSetupJob extends TimedJob {
 	public const JOB_STATUS_DONE = 'DONE';
 	public const JOB_STATUS_UNKNOWN = 'UNKNOWN';
 	public const JOB_STATUS_CONFIG_KEY = 'post_install';
-	private const RETRY_INTERVAL_SECONDS = 2;
 
 	/**
 	 * @psalm-suppress PossiblyUnusedMethod - Constructor called by DI container
@@ -43,7 +42,8 @@ public function __construct(
 		private WelcomeMailHelper $welcomeMailHelper,
 	) {
 		parent::__construct($timeFactory);
-		$this->setInterval(self::RETRY_INTERVAL_SECONDS);
+		$retryInterval = $this->config->getSystemValueInt('ncw_tools.post_setup_job.retry_interval', 2);
+		$this->setInterval($retryInterval);
 		$this->setTimeSensitivity(IJob::TIME_SENSITIVE);
 	}
 

From 05d6424674054d1ee69470f293be3edc5e948605 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:41:59 +0100
Subject: [PATCH 17/23] fixup! feat(installation): implement post setup job and
 welcome email functionality

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 README.md                                     | 16 +++++
 lib/BackgroundJob/PostSetupJob.php            |  4 ++
 tests/unit/BackgroundJob/PostSetupJobTest.php | 69 +++++++++++++++++++
 3 files changed, 89 insertions(+)

diff --git a/README.md b/README.md
index 9bb359e..a692717 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,22 @@ NCW Tools enhances Nextcloud with advanced system utilities including event list
    php occ app:enable ncw_tools
    ```
 
+## Configuration
+
+### Post-Installation Job Retry Interval
+
+The app includes a background job that sends a welcome email to the admin user after installation. You can configure how often this job retries by setting the following system configuration value in your `config/config.php`:
+
+```php
+'ncw_tools.post_setup_job.retry_interval' => 5, // Retry every 5 seconds (default: 2)
+```
+
+**Configuration Options:**
+- **Key:** `ncw_tools.post_setup_job.retry_interval`
+- **Type:** Integer (seconds)
+- **Default:** `2` seconds
+- **Description:** Interval in seconds between retry attempts for the post-installation welcome email job
+
 ## Development
 
 ### Prerequisites
diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index c736780..a7b1652 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -45,6 +45,10 @@ public function __construct(
 		$retryInterval = $this->config->getSystemValueInt('ncw_tools.post_setup_job.retry_interval', 2);
 		$this->setInterval($retryInterval);
 		$this->setTimeSensitivity(IJob::TIME_SENSITIVE);
+		$this->logger->debug('PostSetupJob initialized', [
+			'retryInterval' => $retryInterval,
+			'timeSensitivity' => 'TIME_SENSITIVE',
+		]);
 	}
 
 	/**
diff --git a/tests/unit/BackgroundJob/PostSetupJobTest.php b/tests/unit/BackgroundJob/PostSetupJobTest.php
index e9930ab..dbb1ef6 100644
--- a/tests/unit/BackgroundJob/PostSetupJobTest.php
+++ b/tests/unit/BackgroundJob/PostSetupJobTest.php
@@ -47,6 +47,19 @@ protected function setUp(): void {
 		$this->jobList = $this->createMock(IJobList::class);
 		$this->welcomeMailHelper = $this->createMock(WelcomeMailHelper::class);
 
+		// Default config expectation for retry interval
+		$this->config->expects($this->any())
+			->method('getSystemValueInt')
+			->with('ncw_tools.post_setup_job.retry_interval', 2)
+			->willReturn(2);
+
+		// Expect debug log in constructor
+		$this->logger->expects($this->any())
+			->method('debug')
+			->willReturnCallback(function ($message, $context = []) {
+				// Allow any debug messages
+			});
+
 		$this->job = new PostSetupJob(
 			$this->logger,
 			$this->appConfig,
@@ -246,4 +259,60 @@ public function testRunWithSuccessfulMailSend(): void {
 		$method->setAccessible(true);
 		$method->invoke($this->job, 'test-admin');
 	}
+
+	public function testConstructorUsesDefaultRetryInterval(): void {
+		$logger = $this->createMock(LoggerInterface::class);
+		$config = $this->createMock(IConfig::class);
+
+		$config->expects($this->once())
+			->method('getSystemValueInt')
+			->with('ncw_tools.post_setup_job.retry_interval', 2)
+			->willReturn(2);
+
+		$logger->expects($this->once())
+			->method('debug')
+			->with('PostSetupJob initialized', [
+				'retryInterval' => 2,
+				'timeSensitivity' => 'TIME_SENSITIVE',
+			]);
+
+		new PostSetupJob(
+			$logger,
+			$this->appConfig,
+			$config,
+			$this->userManager,
+			$this->clientService,
+			$this->timeFactory,
+			$this->jobList,
+			$this->welcomeMailHelper
+		);
+	}
+
+	public function testConstructorUsesCustomRetryInterval(): void {
+		$logger = $this->createMock(LoggerInterface::class);
+		$config = $this->createMock(IConfig::class);
+
+		$config->expects($this->once())
+			->method('getSystemValueInt')
+			->with('ncw_tools.post_setup_job.retry_interval', 2)
+			->willReturn(10);
+
+		$logger->expects($this->once())
+			->method('debug')
+			->with('PostSetupJob initialized', [
+				'retryInterval' => 10,
+				'timeSensitivity' => 'TIME_SENSITIVE',
+			]);
+
+		new PostSetupJob(
+			$logger,
+			$this->appConfig,
+			$config,
+			$this->userManager,
+			$this->clientService,
+			$this->timeFactory,
+			$this->jobList,
+			$this->welcomeMailHelper
+		);
+	}
 }

From 5ace7f18afdc55894e0aa5efb3d4b13a08bcd4ab Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:44:47 +0100
Subject: [PATCH 18/23] chore: add .editorconfig for consistent coding style

Add EditorConfig file to maintain consistent coding styles across
different editors and IDEs. Configures indent styles for PHP (tabs),
JSON/YAML (spaces), and other file types.

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 .editorconfig | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..fb432f3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,47 @@
+# SPDX-FileCopyrightText: 2026 STRATO GmbH
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# PHP files
+[*.php]
+indent_style = tab
+indent_size = 4
+
+# JSON files
+[*.json]
+indent_style = space
+indent_size = 2
+
+# YAML files
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+# XML files
+[*.xml]
+indent_style = tab
+indent_size = 4
+
+# Markdown files
+[*.md]
+trim_trailing_whitespace = false
+
+# Shell scripts
+[*.sh]
+indent_style = tab
+indent_size = 4
+
+# Makefile
+[Makefile]
+indent_style = tab

From 736a3d4291fea5e67c68d135192a3637f2566412 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:52:39 +0100
Subject: [PATCH 19/23] style(psalm): format XML for consistency and
 readability

---
 psalm.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/psalm.xml b/psalm.xml
index 2840bda..13ca407 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="1"
-    resolveFromConfigFile="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    findUnusedBaselineEntry="true"
-    findUnusedCode="true"
+	errorLevel="1"
+	resolveFromConfigFile="true"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="https://getpsalm.org/schema/config"
+	xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+	findUnusedBaselineEntry="true"
+	findUnusedCode="true"
 	phpVersion="8.1"
 >
-    <projectFiles>
-        <directory name="lib" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
+	<projectFiles>
+		<directory name="lib"/>
+		<ignoreFiles>
+			<directory name="vendor"/>
+		</ignoreFiles>
+	</projectFiles>
 	<extraFiles>
 		<directory name="vendor"/>
 		<directory name="tests/stubs"/>

From f32cb892ae8c04d9d18dfc7fc3275ddc97ba402d Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Wed, 21 Jan 2026 18:49:10 +0100
Subject: [PATCH 20/23] chore: add psalm baseline file

Add psalm-baseline.xml to track suppressed static analysis issues.
The baseline is currently empty as all issues are properly annotated
with @psalm-suppress directives.

Existing suppressions are kept because they are legitimate:
- PossiblyUnusedMethod: Constructors and methods called by DI container
- UndefinedClass: Internal Nextcloud classes not in stubs
- MixedAssignment/MixedMethodCall: Unavoidable when using internal classes

Baseline file enables tracking if new issues are introduced while
maintaining existing suppressions.

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 psalm-baseline.xml | 2 ++
 psalm.xml          | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 psalm-baseline.xml

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
new file mode 100644
index 0000000..5c064bb
--- /dev/null
+++ b/psalm-baseline.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0"/>
diff --git a/psalm.xml b/psalm.xml
index 13ca407..b6737bc 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -8,6 +8,7 @@
 	findUnusedBaselineEntry="true"
 	findUnusedCode="true"
 	phpVersion="8.1"
+	errorBaseline="psalm-baseline.xml"
 >
 	<projectFiles>
 		<directory name="lib"/>

From 9d3971898394d5067287222255a516fdd51e3b85 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Thu, 22 Jan 2026 09:33:30 +0100
Subject: [PATCH 21/23] refactor: add NewUserMailHelper stub and move psalm
 suppressions to config

Add stub for OCA\Settings\Mailer\NewUserMailHelper based on Nextcloud
server stable31 version. This eliminates UndefinedClass, MixedAssignment,
and MixedMethodCall errors, improving type inference to 100%.

Move all psalm suppressions from inline @psalm-suppress annotations to
centralized issueHandlers in psalm.xml, following Nextcloud best practices
as demonstrated in the mail app.

Benefits:
- 100% type inference (up from 99.3151%)
- Cleaner code without annotation clutter
- Centralized configuration easier to maintain
- Consistent with Nextcloud ecosystem standards

Stub source:
https://github.com/nextcloud/server/blob/stable31/apps/settings/lib/Mailer/NewUserMailHelper.php

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/AppInfo/Application.php                   |  4 --
 lib/BackgroundJob/PostSetupJob.php            |  3 -
 lib/Helper/WelcomeMailHelper.php              |  7 --
 .../InstallationCompletedEventListener.php    |  3 -
 psalm.xml                                     | 15 ++++
 .../OCA/Settings/Mailer/NewUserMailHelper.php | 68 +++++++++++++++++++
 6 files changed, 83 insertions(+), 17 deletions(-)
 create mode 100644 tests/stubs/OCA/Settings/Mailer/NewUserMailHelper.php

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index adb66b9..a8c6535 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -16,13 +16,9 @@
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Install\Events\InstallationCompletedEvent;
 
-/**
- * @psalm-suppress UnusedClass
- */
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'ncw_tools';
 
-	/** @psalm-suppress PossiblyUnusedMethod */
 	public function __construct() {
 		parent::__construct(self::APP_ID);
 	}
diff --git a/lib/BackgroundJob/PostSetupJob.php b/lib/BackgroundJob/PostSetupJob.php
index a7b1652..1f09855 100644
--- a/lib/BackgroundJob/PostSetupJob.php
+++ b/lib/BackgroundJob/PostSetupJob.php
@@ -28,9 +28,6 @@ class PostSetupJob extends TimedJob {
 	public const JOB_STATUS_UNKNOWN = 'UNKNOWN';
 	public const JOB_STATUS_CONFIG_KEY = 'post_install';
 
-	/**
-	 * @psalm-suppress PossiblyUnusedMethod - Constructor called by DI container
-	 */
 	public function __construct(
 		private LoggerInterface $logger,
 		private IAppConfig $appConfig,
diff --git a/lib/Helper/WelcomeMailHelper.php b/lib/Helper/WelcomeMailHelper.php
index 8c209e6..e9b0356 100644
--- a/lib/Helper/WelcomeMailHelper.php
+++ b/lib/Helper/WelcomeMailHelper.php
@@ -22,9 +22,6 @@
 use OCP\Util;
 
 class WelcomeMailHelper {
-	/**
-	 * @psalm-suppress PossiblyUnusedMethod - Constructor called by DI container
-	 */
 	public function __construct(
 		private Defaults $defaults,
 		private ICrypto $crypto,
@@ -46,10 +43,6 @@ public function __construct(
 	 * @param IUser $user The user to send the welcome email to
 	 * @param bool $generatePasswordResetToken Whether to include a password reset token in the email
 	 * @throws \Exception If email generation or sending fails
-	 *
-	 * @psalm-suppress UndefinedClass - Using internal Nextcloud classes
-	 * @psalm-suppress MixedAssignment
-	 * @psalm-suppress MixedMethodCall
 	 */
 	public function sendWelcomeMail(IUser $user, bool $generatePasswordResetToken): void {
 		$newUserMailHelper = new NewUserMailHelper(
diff --git a/lib/Listeners/InstallationCompletedEventListener.php b/lib/Listeners/InstallationCompletedEventListener.php
index 6d151ce..0da1374 100644
--- a/lib/Listeners/InstallationCompletedEventListener.php
+++ b/lib/Listeners/InstallationCompletedEventListener.php
@@ -23,9 +23,6 @@
  */
 class InstallationCompletedEventListener implements IEventListener {
 
-	/**
-	 * @psalm-suppress PossiblyUnusedMethod - Constructor called by DI container
-	 */
 	public function __construct(
 		private IAppConfig $appConfig,
 		private LoggerInterface $logger,
diff --git a/psalm.xml b/psalm.xml
index b6737bc..6f28d5e 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -20,4 +20,19 @@
 		<directory name="vendor"/>
 		<directory name="tests/stubs"/>
 	</extraFiles>
+	<issueHandlers>
+		<UnusedClass>
+			<errorLevel type="suppress">
+				<referencedClass name="OCA\NcwTools\AppInfo\Application" />
+			</errorLevel>
+		</UnusedClass>
+		<PossiblyUnusedMethod>
+			<errorLevel type="suppress">
+				<referencedMethod name="OCA\NcwTools\AppInfo\Application::__construct" />
+				<referencedMethod name="OCA\NcwTools\BackgroundJob\PostSetupJob::__construct" />
+				<referencedMethod name="OCA\NcwTools\Helper\WelcomeMailHelper::__construct" />
+				<referencedMethod name="OCA\NcwTools\Listeners\InstallationCompletedEventListener::__construct" />
+			</errorLevel>
+		</PossiblyUnusedMethod>
+	</issueHandlers>
 </psalm>
diff --git a/tests/stubs/OCA/Settings/Mailer/NewUserMailHelper.php b/tests/stubs/OCA/Settings/Mailer/NewUserMailHelper.php
new file mode 100644
index 0000000..f7d1c40
--- /dev/null
+++ b/tests/stubs/OCA/Settings/Mailer/NewUserMailHelper.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 STRATO GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ *
+ * Stub based on Nextcloud server stable31
+ * https://github.com/nextcloud/server/blob/stable31/apps/settings/lib/Mailer/NewUserMailHelper.php
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Settings\Mailer;
+
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Defaults;
+use OCP\IConfig;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\L10N\IFactory;
+use OCP\Mail\IEMailTemplate;
+use OCP\Mail\IMailer;
+use OCP\Security\ICrypto;
+use OCP\Security\ISecureRandom;
+
+class NewUserMailHelper {
+	/**
+	 * @param Defaults $themingDefaults
+	 * @param IURLGenerator $urlGenerator
+	 * @param IFactory $l10nFactory
+	 * @param IMailer $mailer
+	 * @param ISecureRandom $secureRandom
+	 * @param ITimeFactory $timeFactory
+	 * @param IConfig $config
+	 * @param ICrypto $crypto
+	 * @param string $fromAddress
+	 */
+	public function __construct(
+		private Defaults $themingDefaults,
+		private IURLGenerator $urlGenerator,
+		private IFactory $l10nFactory,
+		private IMailer $mailer,
+		private ISecureRandom $secureRandom,
+		private ITimeFactory $timeFactory,
+		private IConfig $config,
+		private ICrypto $crypto,
+		private $fromAddress,
+	) {
+	}
+
+	/**
+	 * @param IUser $user
+	 * @param bool $generatePasswordResetToken
+	 * @return IEMailTemplate
+	 */
+	public function generateTemplate(IUser $user, $generatePasswordResetToken = false) {
+	}
+
+	/**
+	 * Sends a welcome mail to $user
+	 *
+	 * @param IUser $user
+	 * @param IEMailTemplate $emailTemplate
+	 * @throws \Exception If mail could not be sent
+	 */
+	public function sendMail(IUser $user, IEMailTemplate $emailTemplate): void {
+	}
+}

From f5b63ce7fb015db05960ea507cb3b9539ab11697 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Thu, 22 Jan 2026 09:38:14 +0100
Subject: [PATCH 22/23] test: improve NewUserMailHelper usage verification in
 tests

Enhanced WelcomeMailHelper tests to properly verify NewUserMailHelper
interaction and behavior:

- Verify password reset token generation and storage when requested
- Verify no token generation when not requested
- Verify email sending through NewUserMailHelper.sendMail()
- Verify no email sent to users without email addresses
- Added proper expectations for l10nFactory.getUserLanguage()
- Added proper expectations for timeFactory.getTime() and config.setUserValue()

Test coverage increased from 3 tests with 7 assertions to 4 tests with
11 assertions. All tests verify actual NewUserMailHelper behavior through
the stub, not just execution without exceptions.

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 tests/unit/Helper/WelcomeMailHelperTest.php | 107 +++++++++++++++-----
 1 file changed, 79 insertions(+), 28 deletions(-)

diff --git a/tests/unit/Helper/WelcomeMailHelperTest.php b/tests/unit/Helper/WelcomeMailHelperTest.php
index f922df8..7c85769 100644
--- a/tests/unit/Helper/WelcomeMailHelperTest.php
+++ b/tests/unit/Helper/WelcomeMailHelperTest.php
@@ -108,38 +108,89 @@ protected function setUp(): void {
 
 	public function testSendWelcomeMailWithPasswordResetToken(): void {
 		$user = $this->createMock(IUser::class);
-		$user->expects($this->atLeastOnce())
-			->method('getUID')
-			->willReturn('testuser');
-		$user->expects($this->atLeastOnce())
-			->method('getEMailAddress')
-			->willReturn('testuser@example.com');
-
-		// The method should not throw any exceptions
-		try {
-			$this->welcomeMailHelper->sendWelcomeMail($user, true);
-			$this->assertTrue(true); // Explicit assertion that we got here without exception
-		} catch (\Exception $e) {
-			$this->fail('sendWelcomeMail should not throw exceptions: ' . $e->getMessage());
-		}
+		$user->method('getUID')->willReturn('testuser');
+		$user->method('getDisplayName')->willReturn('Test User');
+		$user->method('getEMailAddress')->willReturn('testuser@example.com');
+		$user->method('getBackendClassName')->willReturn('Database');
+
+		// Mock l10n for getUserLanguage
+		$this->l10NFactory->expects($this->once())
+			->method('getUserLanguage')
+			->with($user)
+			->willReturn('en');
+
+		// Mock time factory for password reset token generation
+		$this->timeFactory->expects($this->once())
+			->method('getTime')
+			->willReturn(1234567890);
+
+		// Mock config for setUserValue (password reset token storage)
+		$this->config->expects($this->once())
+			->method('setUserValue')
+			->with('testuser', 'core', 'lostpassword', $this->anything());
+
+		// Mock config for getSystemValue (secret key)
+		$this->config->expects($this->atLeastOnce())
+			->method('getSystemValue')
+			->willReturnMap([
+				['customclient_desktop', 'https://nextcloud.com/install/#install-clients', 'https://nextcloud.com/install/#install-clients'],
+				['secret', '', 'test-secret'],
+			]);
+
+		// Expect email to be sent
+		$this->mailer->expects($this->once())
+			->method('send')
+			->with($this->isInstanceOf(IMessage::class));
+
+		$this->welcomeMailHelper->sendWelcomeMail($user, true);
 	}
 
 	public function testSendWelcomeMailWithoutPasswordResetToken(): void {
 		$user = $this->createMock(IUser::class);
-		$user->expects($this->atLeastOnce())
-			->method('getUID')
-			->willReturn('testuser');
-		$user->expects($this->atLeastOnce())
-			->method('getEMailAddress')
-			->willReturn('testuser@example.com');
-
-		// The method should not throw any exceptions
-		try {
-			$this->welcomeMailHelper->sendWelcomeMail($user, false);
-			$this->assertTrue(true); // Explicit assertion that we got here without exception
-		} catch (\Exception $e) {
-			$this->fail('sendWelcomeMail should not throw exceptions: ' . $e->getMessage());
-		}
+		$user->method('getUID')->willReturn('testuser');
+		$user->method('getDisplayName')->willReturn('Test User');
+		$user->method('getEMailAddress')->willReturn('testuser@example.com');
+		$user->method('getBackendClassName')->willReturn('Database');
+
+		// Mock l10n for getUserLanguage
+		$this->l10NFactory->expects($this->once())
+			->method('getUserLanguage')
+			->with($user)
+			->willReturn('en');
+
+		// Should not generate password reset token
+		$this->timeFactory->expects($this->never())
+			->method('getTime');
+
+		$this->config->expects($this->never())
+			->method('setUserValue');
+
+		// Expect email to be sent
+		$this->mailer->expects($this->once())
+			->method('send')
+			->with($this->isInstanceOf(IMessage::class));
+
+		$this->welcomeMailHelper->sendWelcomeMail($user, false);
+	}
+
+	public function testSendWelcomeMailDoesNotSendToUserWithoutEmail(): void {
+		$user = $this->createMock(IUser::class);
+		$user->method('getUID')->willReturn('testuser');
+		$user->method('getDisplayName')->willReturn('Test User');
+		$user->method('getEMailAddress')->willReturn(null);
+		$user->method('getBackendClassName')->willReturn('Database');
+
+		// Mock l10n for getUserLanguage
+		$this->l10NFactory->expects($this->once())
+			->method('getUserLanguage')
+			->with($user)
+			->willReturn('en');
+
+		// Should not send email if user has no email address
+		$this->mailer->expects($this->never())
+			->method('send');
+
+		$this->welcomeMailHelper->sendWelcomeMail($user, false);
 	}
 
 	public function testConstructorInitializesCorrectly(): void {

From 57b7346ef1faba7597a3c9227ecba7366bbd3ad2 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Thu, 22 Jan 2026 09:43:10 +0100
Subject: [PATCH 23/23] refactor: simplify and clean up WelcomeMailHelper tests

Consolidated test setup and removed redundant mock configurations:

- Moved all mock setup into setUp() for better organization
- Simplified mock return values (e.g., willReturnArgument(0) for translations)
- Removed duplicate mock configurations across tests
- Kept only essential assertions that verify actual behavior
- Reduced code duplication while maintaining test coverage

Tests still verify:
- Password reset token generation when requested
- No token generation when not requested
- Email sending through NewUserMailHelper
- No email sent to users without email addresses

All 17 tests passing with 47 assertions.

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 tests/unit/Helper/WelcomeMailHelperTest.php | 73 ++++-----------------
 1 file changed, 13 insertions(+), 60 deletions(-)

diff --git a/tests/unit/Helper/WelcomeMailHelperTest.php b/tests/unit/Helper/WelcomeMailHelperTest.php
index 7c85769..ceae501 100644
--- a/tests/unit/Helper/WelcomeMailHelperTest.php
+++ b/tests/unit/Helper/WelcomeMailHelperTest.php
@@ -48,51 +48,38 @@ protected function setUp(): void {
 		$this->config = $this->createMock(IConfig::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 
-		// Mock IL10N for l10NFactory
+		// Setup mocks required by NewUserMailHelper
 		$l10n = $this->createMock(IL10N::class);
-		$l10n->method('t')->willReturnCallback(function ($text) {
-			return $text;
-		});
+		$l10n->method('t')->willReturnArgument(0);
 		$this->l10NFactory->method('get')->willReturn($l10n);
+		$this->l10NFactory->method('getUserLanguage')->willReturn('en');
 
-		// Mock email template
 		$emailTemplate = $this->createMock(IEMailTemplate::class);
 		$emailTemplate->method('addHeader')->willReturnSelf();
 		$emailTemplate->method('addHeading')->willReturnSelf();
 		$emailTemplate->method('addBodyText')->willReturnSelf();
 		$emailTemplate->method('addBodyButton')->willReturnSelf();
-		$emailTemplate->method('addBodyButtonGroup')->willReturnCallback(function () use ($emailTemplate) {
-			return $emailTemplate;
-		});
+		$emailTemplate->method('addBodyButtonGroup')->willReturnSelf();
 		$emailTemplate->method('addFooter')->willReturnSelf();
 		$emailTemplate->method('setSubject')->willReturnSelf();
 		$this->mailer->method('createEMailTemplate')->willReturn($emailTemplate);
 
-		// Mock IConfig to return a client download URL
-		$this->config->method('getSystemValue')->willReturnCallback(function ($key, $default) {
-			if ($key === 'customclient_desktop') {
-				return 'https://nextcloud.com/install/#install-clients';
-			}
-			return $default;
-		});
-
-		// Mock message
 		$message = $this->createMock(IMessage::class);
 		$message->method('setTo')->willReturnSelf();
 		$message->method('setFrom')->willReturnSelf();
 		$message->method('useTemplate')->willReturnSelf();
+		$message->method('setAutoSubmitted')->willReturnSelf();
 		$this->mailer->method('createMessage')->willReturn($message);
 
-		// Mock defaults
 		$this->defaults->method('getName')->willReturn('Nextcloud');
-
-		// Mock URL generator
 		$this->urlGenerator->method('getAbsoluteURL')->willReturn('https://example.com');
 		$this->urlGenerator->method('linkToRouteAbsolute')->willReturn('https://example.com/reset');
-
-		// Mock secure random and crypto
-		$this->secureRandom->method('generate')->willReturn('random-token');
+		$this->secureRandom->method('generate')->willReturn('test-token');
 		$this->crypto->method('encrypt')->willReturn('encrypted-token');
+		$this->config->method('getSystemValue')->willReturnMap([
+			['customclient_desktop', 'https://nextcloud.com/install/#install-clients', 'https://nextcloud.com/install/#install-clients'],
+			['secret', '', 'test-secret'],
+		]);
 
 		$this->welcomeMailHelper = new WelcomeMailHelper(
 			$this->defaults,
@@ -113,34 +100,16 @@ public function testSendWelcomeMailWithPasswordResetToken(): void {
 		$user->method('getEMailAddress')->willReturn('testuser@example.com');
 		$user->method('getBackendClassName')->willReturn('Database');
 
-		// Mock l10n for getUserLanguage
-		$this->l10NFactory->expects($this->once())
-			->method('getUserLanguage')
-			->with($user)
-			->willReturn('en');
-
-		// Mock time factory for password reset token generation
 		$this->timeFactory->expects($this->once())
 			->method('getTime')
 			->willReturn(1234567890);
 
-		// Mock config for setUserValue (password reset token storage)
 		$this->config->expects($this->once())
 			->method('setUserValue')
 			->with('testuser', 'core', 'lostpassword', $this->anything());
 
-		// Mock config for getSystemValue (secret key)
-		$this->config->expects($this->atLeastOnce())
-			->method('getSystemValue')
-			->willReturnMap([
-				['customclient_desktop', 'https://nextcloud.com/install/#install-clients', 'https://nextcloud.com/install/#install-clients'],
-				['secret', '', 'test-secret'],
-			]);
-
-		// Expect email to be sent
 		$this->mailer->expects($this->once())
-			->method('send')
-			->with($this->isInstanceOf(IMessage::class));
+			->method('send');
 
 		$this->welcomeMailHelper->sendWelcomeMail($user, true);
 	}
@@ -152,41 +121,25 @@ public function testSendWelcomeMailWithoutPasswordResetToken(): void {
 		$user->method('getEMailAddress')->willReturn('testuser@example.com');
 		$user->method('getBackendClassName')->willReturn('Database');
 
-		// Mock l10n for getUserLanguage
-		$this->l10NFactory->expects($this->once())
-			->method('getUserLanguage')
-			->with($user)
-			->willReturn('en');
-
-		// Should not generate password reset token
 		$this->timeFactory->expects($this->never())
 			->method('getTime');
 
 		$this->config->expects($this->never())
 			->method('setUserValue');
 
-		// Expect email to be sent
 		$this->mailer->expects($this->once())
-			->method('send')
-			->with($this->isInstanceOf(IMessage::class));
+			->method('send');
 
 		$this->welcomeMailHelper->sendWelcomeMail($user, false);
 	}
 
-	public function testSendWelcomeMailDoesNotSendToUserWithoutEmail(): void {
+	public function testSendWelcomeMailWithUserWithoutEmail(): void {
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')->willReturn('testuser');
 		$user->method('getDisplayName')->willReturn('Test User');
 		$user->method('getEMailAddress')->willReturn(null);
 		$user->method('getBackendClassName')->willReturn('Database');
 
-		// Mock l10n for getUserLanguage
-		$this->l10NFactory->expects($this->once())
-			->method('getUserLanguage')
-			->with($user)
-			->willReturn('en');
-
-		// Should not send email if user has no email address
 		$this->mailer->expects($this->never())
 			->method('send');