From 7398374f21a1a3e2a57d69069a17af316197cd5f Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 18 Jun 2024 15:57:14 +0530
Subject: [PATCH] removed background job and update domains code

---
 appinfo/info.xml                            |  2 +-
 lib/BackgroundJob/BlacklistedDomainsJob.php | 35 ---------------------
 lib/Command/UpdateBlacklistedDomains.php    | 30 ------------------
 lib/Service/UserService.php                 |  5 ---
 4 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 lib/BackgroundJob/BlacklistedDomainsJob.php
 delete mode 100644 lib/Command/UpdateBlacklistedDomains.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 9d095387..e6f7fd12 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -10,7 +10,7 @@
     <description><![CDATA[in /e/OS cloud, nextcloud accounts are linked to mail accounts. This app ensures both are coordinated: it sets the e-mail address, quota and storage of the user upon creation.
     It also completes the account deletion by cleaning other parts of the /e/OS cloud setup to ensure no more data is retained when a user requests an account deletion.
     This app uses the UserDeletedEvent to invoke scripts in the docker-welcome container of /e/OS cloud setup]]></description>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/BackgroundJob/BlacklistedDomainsJob.php b/lib/BackgroundJob/BlacklistedDomainsJob.php
deleted file mode 100644
index cf776076..00000000
--- a/lib/BackgroundJob/BlacklistedDomainsJob.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\BackgroundJob;
-
-use OCA\EcloudAccounts\Service\UserService;
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\BackgroundJob\TimedJob;
-use Psr\Log\LoggerInterface;
-
-class BlacklistedDomainsJob extends TimedJob {
-	private LoggerInterface $logger;
-	private UserService $userService;
-	private ITimeFactory $timeFactory;
-	public const INTERVAL_PERIOD = 7 * 24 * 60 * 60;// Run for 7 days
-	public function __construct(LoggerInterface $logger, ITimeFactory $timeFactory, UserService $userService) {
-		parent::__construct($timeFactory);
-
-		$this->setInterval(self::INTERVAL_PERIOD);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-		$this->timeFactory = $timeFactory;
-		$this->userService = $userService;
-		$this->logger = $logger;
-	}
-
-	protected function run($argument): void {
-		try {
-			$this->userService->updateBlacklistedDomains();
-		} catch (\Exception $e) {
-			$this->logger->logException('Error updating blacklisted domains for account creation', ['exception' => $e]);
-			return;
-		}
-	}
-}
diff --git a/lib/Command/UpdateBlacklistedDomains.php b/lib/Command/UpdateBlacklistedDomains.php
deleted file mode 100644
index 8b51a28a..00000000
--- a/lib/Command/UpdateBlacklistedDomains.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Command;
-
-use OCA\EcloudAccounts\AppInfo\Application;
-use OCA\EcloudAccounts\Service\UserService;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class UpdateBlacklistedDomains extends Command {
-	private UserService $userService;
-
-	public function __construct(UserService $userService) {
-		parent::__construct();
-		$this->userService = $userService;
-	}
-
-	protected function configure() {
-		$this->setName(Application::APP_ID.':update-blacklisted-domains')->setDescription('Update blacklisted domains');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$this->userService->updateBlacklistedDomains();
-		$output->writeln('Updated blacklisted domains for creation.');
-		return 1;
-	}
-}
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index ecf5bddd..1b8d5f46 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -585,9 +585,4 @@ class UserService {
 	private function getDefaultQuota() {
 		return $this->config->getSystemValueInt('default_quota_in_megabytes', 1024);
 	}
-	public function updateBlacklistedDomains() {
-		$blacklisted_domain_url = 'https://raw.githubusercontent.com/disposable/disposable-email-domains/master/domains.json';
-		$json_data = file_get_contents($blacklisted_domain_url);
-		$this->config->setAppValue(Application::APP_ID, 'blacklisted_domains', $json_data);
-	}
 }
-- 
GitLab