nextcloud / server

apps/lookup_server_connector/composer/composer/autoload_classmap.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\LookupServerConnector\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\LookupServerConnector\\BackgroundJobs\\RetryJob' => $baseDir . '/../lib/BackgroundJobs/RetryJob.php',
-    'OCA\\LookupServerConnector\\UpdateLookupServer' => $baseDir . '/../lib/UpdateLookupServer.php',
+    'OCA\\LookupServerConnector\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\LookupServerConnector\\BackgroundJobs\\RetryJob' => $baseDir.'/../lib/BackgroundJobs/RetryJob.php',
+    'OCA\\LookupServerConnector\\UpdateLookupServer' => $baseDir.'/../lib/UpdateLookupServer.php',
 );

apps/lookup_server_connector/composer/composer/autoload_static.php

Spacing +10 added lines, -10 removed lines

@@ -6,29 +6,29 @@
 
 class ComposerStaticInitLookupServerConnector
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\LookupServerConnector\\' => 26,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\LookupServerConnector\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\LookupServerConnector\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\LookupServerConnector\\BackgroundJobs\\RetryJob' => __DIR__ . '/..' . '/../lib/BackgroundJobs/RetryJob.php',
-        'OCA\\LookupServerConnector\\UpdateLookupServer' => __DIR__ . '/..' . '/../lib/UpdateLookupServer.php',
+    public static $classMap = array(
+        'OCA\\LookupServerConnector\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\LookupServerConnector\\BackgroundJobs\\RetryJob' => __DIR__.'/..'.'/../lib/BackgroundJobs/RetryJob.php',
+        'OCA\\LookupServerConnector\\UpdateLookupServer' => __DIR__.'/..'.'/../lib/UpdateLookupServer.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitLookupServerConnector::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitLookupServerConnector::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitLookupServerConnector::$classMap;

apps/lookup_server_connector/lib/UpdateLookupServer.php

Indentation +42 added lines, -42 removed lines

@@ -34,51 +34,51 @@
  * @package OCA\LookupServerConnector
  */
 class UpdateLookupServer {
-	/** @var IConfig */
-	private $config;
-	/** @var IJobList */
-	private $jobList;
+    /** @var IConfig */
+    private $config;
+    /** @var IJobList */
+    private $jobList;
 
-	/**
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
-	public function __construct(IJobList $jobList,
-								IConfig $config) {
-		$this->config = $config;
-		$this->jobList = $jobList;
-	}
+    /**
+     * @param IJobList $jobList
+     * @param IConfig $config
+     */
+    public function __construct(IJobList $jobList,
+                                IConfig $config) {
+        $this->config = $config;
+        $this->jobList = $jobList;
+    }
 
-	/**
-	 * @param IUser $user
-	 */
-	public function userUpdated(IUser $user): void {
-		if (!$this->shouldUpdateLookupServer()) {
-			return;
-		}
+    /**
+     * @param IUser $user
+     */
+    public function userUpdated(IUser $user): void {
+        if (!$this->shouldUpdateLookupServer()) {
+            return;
+        }
 
-		// Reset retry counter
-		$this->config->deleteUserValue(
-			$user->getUID(),
-			'lookup_server_connector',
-			'update_retries'
-		);
-		$this->jobList->add(RetryJob::class, ['userId' => $user->getUID()]);
-	}
+        // Reset retry counter
+        $this->config->deleteUserValue(
+            $user->getUID(),
+            'lookup_server_connector',
+            'update_retries'
+        );
+        $this->jobList->add(RetryJob::class, ['userId' => $user->getUID()]);
+    }
 
-	/**
-	 * check if we should update the lookup server, we only do it if
-	 *
-	 * + we have an internet connection
-	 * + the lookup server update was not disabled by the admin
-	 * + we have a valid lookup server URL
-	 *
-	 * @return bool
-	 */
-	private function shouldUpdateLookupServer(): bool {
-		return $this->config->getSystemValueBool('has_internet_connection', true) === true &&
-			$this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') === 'yes' &&
-			$this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') !== '';
-	}
+    /**
+     * check if we should update the lookup server, we only do it if
+     *
+     * + we have an internet connection
+     * + the lookup server update was not disabled by the admin
+     * + we have a valid lookup server URL
+     *
+     * @return bool
+     */
+    private function shouldUpdateLookupServer(): bool {
+        return $this->config->getSystemValueBool('has_internet_connection', true) === true &&
+            $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') === 'yes' &&
+            $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') !== '';
+    }
 
 }

apps/lookup_server_connector/lib/AppInfo/Application.php

Indentation +22 added lines, -22 removed lines

@@ -27,30 +27,30 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
-	public function __construct () {
-		parent::__construct('lookup_server_connector');
-	}
+    public function __construct () {
+        parent::__construct('lookup_server_connector');
+    }
 
-	/**
-	 * Register the different app parts
-	 */
-	public function register(): void {
-		$this->registerHooksAndEvents();
-	}
+    /**
+     * Register the different app parts
+     */
+    public function register(): void {
+        $this->registerHooksAndEvents();
+    }
 
-	/**
-	 * Register the hooks and events
-	 */
-	public function registerHooksAndEvents(): void {
-		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
-		$dispatcher->addListener('OC\AccountManager::userUpdated', static function(GenericEvent $event) {
-			/** @var IUser $user */
-			$user = $event->getSubject();
+    /**
+     * Register the hooks and events
+     */
+    public function registerHooksAndEvents(): void {
+        $dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+        $dispatcher->addListener('OC\AccountManager::userUpdated', static function(GenericEvent $event) {
+            /** @var IUser $user */
+            $user = $event->getSubject();
 
-			/** @var UpdateLookupServer $updateLookupServer */
-			$updateLookupServer = \OC::$server->query(UpdateLookupServer::class);
-			$updateLookupServer->userUpdated($user);
-		});
+            /** @var UpdateLookupServer $updateLookupServer */
+            $updateLookupServer = \OC::$server->query(UpdateLookupServer::class);
+            $updateLookupServer->userUpdated($user);
+        });
 
-	}
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
-	public function __construct () {
+	public function __construct() {
 		parent::__construct('lookup_server_connector');
 	}
 

apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php

Indentation +173 added lines, -173 removed lines

@@ -36,177 +36,177 @@
 use OCP\IUserManager;
 
 class RetryJob extends Job {
-	/** @var IClientService */
-	private $clientService;
-	/** @var string */
-	private $lookupServer;
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IAccountManager */
-	private $accountManager;
-	/** @var Signer */
-	private $signer;
-	/** @var int */
-	protected $retries = 0;
-	/** @var bool */
-	protected $retainJob = false;
-
-	/**
-	 * @param ITimeFactory $time
-	 * @param IClientService $clientService
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param IAccountManager $accountManager
-	 * @param Signer $signer
-	 */
-	public function __construct(ITimeFactory $time,
-								IClientService $clientService,
-								IConfig $config,
-								IUserManager $userManager,
-								IAccountManager $accountManager,
-								Signer $signer) {
-		parent::__construct($time);
-		$this->clientService = $clientService;
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->accountManager = $accountManager;
-		$this->signer = $signer;
-
-		$this->lookupServer = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		if (!empty($this->lookupServer)) {
-			$this->lookupServer = rtrim($this->lookupServer, '/');
-			$this->lookupServer .= '/users';
-		}
-	}
-
-	/**
-	 * run the job, then remove it from the jobList
-	 *
-	 * @param IJobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null): void {
-		if (!isset($this->argument['userId'])) {
-			// Old background job without user id, just drop it.
-			$jobList->remove($this, $this->argument);
-			return;
-		}
-
-		$this->retries = (int) $this->config->getUserValue($this->argument['userId'], 'lookup_server_connector', 'update_retries', 0);
-
-		if ($this->shouldRemoveBackgroundJob()) {
-			$jobList->remove($this, $this->argument);
-			return;
-		}
-
-		if ($this->shouldRun()) {
-			parent::execute($jobList, $logger);
-			if (!$this->retainJob) {
-				$jobList->remove($this, $this->argument);
-			}
-		}
-	}
-
-	/**
-	 * Check if we should kill the background job:
-	 *
-	 * - internet connection is disabled
-	 * - no valid lookup server URL given
-	 * - lookup server was disabled by the admin
-	 * - max retries are reached (set to 5)
-	 *
-	 * @return bool
-	 */
-	protected function shouldRemoveBackgroundJob(): bool {
-		return $this->config->getSystemValueBool('has_internet_connection', true) === false ||
-			$this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') === '' ||
-			$this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') !== 'yes' ||
-			$this->retries >= 5;
-	}
-
-	protected function shouldRun(): bool {
-		$delay = 100 * 6 ** $this->retries;
-		return ($this->time->getTime() - $this->lastRun) > $delay;
-	}
-
-	protected function run($argument): void {
-		$user = $this->userManager->get($this->argument['userId']);
-		if (!$user instanceof IUser) {
-			// User does not exist anymore
-			return;
-		}
-
-		$data = $this->getUserAccountData($user);
-		$signedData = $this->signer->sign('lookupserver', $data, $user);
-		$client = $this->clientService->newClient();
-
-		try {
-			if (count($data) === 1) {
-				// No public data, just the federation Id
-				$client->delete($this->lookupServer,
-					[
-						'body' => json_encode($signedData),
-						'timeout' => 10,
-						'connect_timeout' => 3,
-					]
-				);
-			} else {
-				$client->post($this->lookupServer,
-					[
-						'body' => json_encode($signedData),
-						'timeout' => 10,
-						'connect_timeout' => 3,
-					]
-				);
-			}
-
-			// Reset retry counter
-			$this->config->deleteUserValue(
-				$user->getUID(),
-				'lookup_server_connector',
-				'update_retries'
-			);
-
-		} catch (\Exception $e) {
-			// An error occurred, retry later
-			$this->retainJob = true;
-			$this->config->setUserValue(
-				$user->getUID(),
-				'lookup_server_connector',
-				'update_retries',
-				$this->retries + 1
-			);
-		}
-	}
-
-	protected function getUserAccountData(IUser $user): array {
-		$account = $this->accountManager->getAccount($user);
-
-		$publicData = [];
-		foreach ($account->getProperties() as $property) {
-			if ($property->getScope() === IAccountManager::VISIBILITY_PUBLIC) {
-				$publicData[$property->getName()] = $property->getValue();
-			}
-		}
-
-		$data = ['federationId' => $user->getCloudId()];
-		if (!empty($publicData)) {
-			$data['name'] = $publicData[IAccountManager::PROPERTY_DISPLAYNAME]['value'] ?? '';
-			$data['email'] = $publicData[IAccountManager::PROPERTY_EMAIL]['value'] ?? '';
-			$data['address'] = $publicData[IAccountManager::PROPERTY_ADDRESS]['value'] ?? '';
-			$data['website'] = $publicData[IAccountManager::PROPERTY_WEBSITE]['value'] ?? '';
-			$data['twitter'] = $publicData[IAccountManager::PROPERTY_TWITTER]['value'] ?? '';
-			$data['phone'] = $publicData[IAccountManager::PROPERTY_PHONE]['value'] ?? '';
-			$data['twitter_signature'] = $publicData[IAccountManager::PROPERTY_TWITTER]['signature'] ?? '';
-			$data['website_signature'] = $publicData[IAccountManager::PROPERTY_WEBSITE]['signature'] ?? '';
-			$data['verificationStatus'] = [
-				IAccountManager::PROPERTY_WEBSITE => $publicData[IAccountManager::PROPERTY_WEBSITE]['verified'] ?? '',
-				IAccountManager::PROPERTY_TWITTER => $publicData[IAccountManager::PROPERTY_TWITTER]['verified'] ?? '',
-			];
-		}
-
-		return $data;
-	}
+    /** @var IClientService */
+    private $clientService;
+    /** @var string */
+    private $lookupServer;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IAccountManager */
+    private $accountManager;
+    /** @var Signer */
+    private $signer;
+    /** @var int */
+    protected $retries = 0;
+    /** @var bool */
+    protected $retainJob = false;
+
+    /**
+     * @param ITimeFactory $time
+     * @param IClientService $clientService
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     * @param IAccountManager $accountManager
+     * @param Signer $signer
+     */
+    public function __construct(ITimeFactory $time,
+                                IClientService $clientService,
+                                IConfig $config,
+                                IUserManager $userManager,
+                                IAccountManager $accountManager,
+                                Signer $signer) {
+        parent::__construct($time);
+        $this->clientService = $clientService;
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->accountManager = $accountManager;
+        $this->signer = $signer;
+
+        $this->lookupServer = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        if (!empty($this->lookupServer)) {
+            $this->lookupServer = rtrim($this->lookupServer, '/');
+            $this->lookupServer .= '/users';
+        }
+    }
+
+    /**
+     * run the job, then remove it from the jobList
+     *
+     * @param IJobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null): void {
+        if (!isset($this->argument['userId'])) {
+            // Old background job without user id, just drop it.
+            $jobList->remove($this, $this->argument);
+            return;
+        }
+
+        $this->retries = (int) $this->config->getUserValue($this->argument['userId'], 'lookup_server_connector', 'update_retries', 0);
+
+        if ($this->shouldRemoveBackgroundJob()) {
+            $jobList->remove($this, $this->argument);
+            return;
+        }
+
+        if ($this->shouldRun()) {
+            parent::execute($jobList, $logger);
+            if (!$this->retainJob) {
+                $jobList->remove($this, $this->argument);
+            }
+        }
+    }
+
+    /**
+     * Check if we should kill the background job:
+     *
+     * - internet connection is disabled
+     * - no valid lookup server URL given
+     * - lookup server was disabled by the admin
+     * - max retries are reached (set to 5)
+     *
+     * @return bool
+     */
+    protected function shouldRemoveBackgroundJob(): bool {
+        return $this->config->getSystemValueBool('has_internet_connection', true) === false ||
+            $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') === '' ||
+            $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') !== 'yes' ||
+            $this->retries >= 5;
+    }
+
+    protected function shouldRun(): bool {
+        $delay = 100 * 6 ** $this->retries;
+        return ($this->time->getTime() - $this->lastRun) > $delay;
+    }
+
+    protected function run($argument): void {
+        $user = $this->userManager->get($this->argument['userId']);
+        if (!$user instanceof IUser) {
+            // User does not exist anymore
+            return;
+        }
+
+        $data = $this->getUserAccountData($user);
+        $signedData = $this->signer->sign('lookupserver', $data, $user);
+        $client = $this->clientService->newClient();
+
+        try {
+            if (count($data) === 1) {
+                // No public data, just the federation Id
+                $client->delete($this->lookupServer,
+                    [
+                        'body' => json_encode($signedData),
+                        'timeout' => 10,
+                        'connect_timeout' => 3,
+                    ]
+                );
+            } else {
+                $client->post($this->lookupServer,
+                    [
+                        'body' => json_encode($signedData),
+                        'timeout' => 10,
+                        'connect_timeout' => 3,
+                    ]
+                );
+            }
+
+            // Reset retry counter
+            $this->config->deleteUserValue(
+                $user->getUID(),
+                'lookup_server_connector',
+                'update_retries'
+            );
+
+        } catch (\Exception $e) {
+            // An error occurred, retry later
+            $this->retainJob = true;
+            $this->config->setUserValue(
+                $user->getUID(),
+                'lookup_server_connector',
+                'update_retries',
+                $this->retries + 1
+            );
+        }
+    }
+
+    protected function getUserAccountData(IUser $user): array {
+        $account = $this->accountManager->getAccount($user);
+
+        $publicData = [];
+        foreach ($account->getProperties() as $property) {
+            if ($property->getScope() === IAccountManager::VISIBILITY_PUBLIC) {
+                $publicData[$property->getName()] = $property->getValue();
+            }
+        }
+
+        $data = ['federationId' => $user->getCloudId()];
+        if (!empty($publicData)) {
+            $data['name'] = $publicData[IAccountManager::PROPERTY_DISPLAYNAME]['value'] ?? '';
+            $data['email'] = $publicData[IAccountManager::PROPERTY_EMAIL]['value'] ?? '';
+            $data['address'] = $publicData[IAccountManager::PROPERTY_ADDRESS]['value'] ?? '';
+            $data['website'] = $publicData[IAccountManager::PROPERTY_WEBSITE]['value'] ?? '';
+            $data['twitter'] = $publicData[IAccountManager::PROPERTY_TWITTER]['value'] ?? '';
+            $data['phone'] = $publicData[IAccountManager::PROPERTY_PHONE]['value'] ?? '';
+            $data['twitter_signature'] = $publicData[IAccountManager::PROPERTY_TWITTER]['signature'] ?? '';
+            $data['website_signature'] = $publicData[IAccountManager::PROPERTY_WEBSITE]['signature'] ?? '';
+            $data['verificationStatus'] = [
+                IAccountManager::PROPERTY_WEBSITE => $publicData[IAccountManager::PROPERTY_WEBSITE]['verified'] ?? '',
+                IAccountManager::PROPERTY_TWITTER => $publicData[IAccountManager::PROPERTY_TWITTER]['verified'] ?? '',
+            ];
+        }
+
+        return $data;
+    }
 }