Merge pull request #4783 from nextcloud/lite-application-classes

Use automatic injection for appdata folders

2 files changed, 9 insertions, 29 deletions

diff --git a/apps/lookup_server_connector/appinfo/app.php b/apps/lookup_server_connector/appinfo/app.php
index f0d624d5f3a..28e7bea192a 100644
--- a/apps/lookup_server_connector/appinfo/app.php
+++ b/apps/lookup_server_connector/appinfo/app.php
@@ -22,30 +22,10 @@
 $dispatcher = \OC::$server->getEventDispatcher();
 
 $dispatcher->addListener('OC\AccountManager::userUpdated', function(\Symfony\Component\EventDispatcher\GenericEvent $event) {
+	/** @var \OCP\IUser $user */
 	$user = $event->getSubject();
 
-	$keyManager = new \OC\Security\IdentityProof\Manager(
-		\OC::$server->getAppDataDir('identityproof'),
-		\OC::$server->getCrypto()
-	);
-
-	$config = \OC::$server->getConfig();
-	$lookupServer = $config->getSystemValue('lookup_server', '');
-
-	$updateLookupServer = new \OCA\LookupServerConnector\UpdateLookupServer(
-		new \OC\Accounts\AccountManager(
-			\OC::$server->getDatabaseConnection(),
-			\OC::$server->getEventDispatcher(),
-			\OC::$server->getJobList()
-		),
-		\OC::$server->getHTTPClientService(),
-		new \OC\Security\IdentityProof\Signer(
-			$keyManager,
-			new \OC\AppFramework\Utility\TimeFactory(),
-			\OC::$server->getUserManager()
-		),
-		\OC::$server->getJobList(),
-		$lookupServer
-	);
+	/** @var \OCA\LookupServerConnector\UpdateLookupServer $updateLookupServer */
+	$updateLookupServer = \OC::$server->query(\OCA\LookupServerConnector\UpdateLookupServer::class);
 	$updateLookupServer->userUpdated($user);
 });
diff --git a/apps/lookup_server_connector/lib/UpdateLookupServer.php b/apps/lookup_server_connector/lib/UpdateLookupServer.php
index 3a7c2fa7236..ae8fcbd67ca 100644
--- a/apps/lookup_server_connector/lib/UpdateLookupServer.php
+++ b/apps/lookup_server_connector/lib/UpdateLookupServer.php
@@ -27,6 +27,7 @@ use OC\Security\IdentityProof\Signer;
 use OCA\LookupServerConnector\BackgroundJobs\RetryJob;
 use OCP\BackgroundJob\IJobList;
 use OCP\Http\Client\IClientService;
+use OCP\IConfig;
 use OCP\IUser;
 
 /**
@@ -44,27 +45,26 @@ class UpdateLookupServer {
 	/** @var IJobList */
 	private $jobList;
 	/** @var string URL point to lookup server */
-	private $lookupServer = 'https://lookup.nextcloud.com';
+	private $lookupServer;
 
 	/**
 	 * @param AccountManager $accountManager
 	 * @param IClientService $clientService
 	 * @param Signer $signer
 	 * @param IJobList $jobList
-	 * @param string $lookupServer if nothing is given we use the default lookup server
+	 * @param IConfig $config
 	 */
 	public function __construct(AccountManager $accountManager,
 								IClientService $clientService,
 								Signer $signer,
 								IJobList $jobList,
-								$lookupServer = '') {
+								IConfig $config) {
 		$this->accountManager = $accountManager;
 		$this->clientService = $clientService;
 		$this->signer = $signer;
 		$this->jobList = $jobList;
-		if ($lookupServer !== '') {
-			$this->lookupServer = $lookupServer;
-		}
+
+		$this->lookupServer = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
 		$this->lookupServer = rtrim($this->lookupServer, '/');
 		$this->lookupServer .= '/users';
 	}