nextcloud / server

apps/federatedfilesharing/lib/TokenHandler.php

Indentation +25 added lines, -25 removed lines

@@ -33,30 +33,30 @@
  */
 class TokenHandler {
 
-	const TOKEN_LENGTH = 15;
-
-	/** @var ISecureRandom */
-	private $secureRandom;
-
-	/**
-	 * TokenHandler constructor.
-	 *
-	 * @param ISecureRandom $secureRandom
-	 */
-	public function __construct(ISecureRandom $secureRandom) {
-		$this->secureRandom = $secureRandom;
-	}
-
-	/**
-	 * generate to token used to authenticate federated shares
-	 *
-	 * @return string
-	 */
-	public function generateToken() {
-		$token = $this->secureRandom->generate(
-			self::TOKEN_LENGTH,
-			ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
-		return $token;
-	}
+    const TOKEN_LENGTH = 15;
+
+    /** @var ISecureRandom */
+    private $secureRandom;
+
+    /**
+     * TokenHandler constructor.
+     *
+     * @param ISecureRandom $secureRandom
+     */
+    public function __construct(ISecureRandom $secureRandom) {
+        $this->secureRandom = $secureRandom;
+    }
+
+    /**
+     * generate to token used to authenticate federated shares
+     *
+     * @return string
+     */
+    public function generateToken() {
+        $token = $this->secureRandom->generate(
+            self::TOKEN_LENGTH,
+            ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+        return $token;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	public function generateToken() {
 		$token = $this->secureRandom->generate(
 			self::TOKEN_LENGTH,
-			ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+			ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
 		return $token;
 	}
 

apps/federation/templates/settings-admin.php

Indentation +4 added lines, -4 removed lines

@@ -28,10 +28,10 @@
 				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
-				} elseif(
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
-				) { ?>
+                } elseif(
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+                ) { ?>
 					<span class="status indeterminate"></span>
 				<?php } else {?>
 					<span class="status error"></span>

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
 	<em><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></em>
 
 	<p>
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if ($_['autoAddServers']) p('checked'); ?> />
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
 	</p>
 
@@ -23,14 +23,14 @@ 
 		<span class="msg"></span>
 	</p>
 	<ul id="listOfTrustedServers">
-		<?php foreach($_['trustedServers'] as $trustedServer) { ?>
+		<?php foreach ($_['trustedServers'] as $trustedServer) { ?>
 			<li id="<?php p($trustedServer['id']); ?>">
-				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
+				<?php if ((int) $trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
-				} elseif(
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+				} elseif (
+					(int) $trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+					(int) $trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
 				) { ?>
 					<span class="status indeterminate"></span>
 				<?php } else {?>

Braces +4 added lines, -1 removed lines

@@ -11,7 +11,10 @@
 	<em><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></em>
 
 	<p>
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) {
+    p('checked');
+}
+?> />
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
 	</p>
 

apps/federation/lib/Controller/SettingsController.php

Indentation +86 added lines, -86 removed lines

@@ -34,91 +34,91 @@
 
 class SettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var  TrustedServers */
-	private $trustedServers;
-
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param TrustedServers $trustedServers
-	 */
-	public function __construct($AppName,
-								IRequest $request,
-								IL10N $l10n,
-								TrustedServers $trustedServers
-	) {
-		parent::__construct($AppName, $request);
-		$this->l = $l10n;
-		$this->trustedServers = $trustedServers;
-	}
-
-
-	/**
-	 * add server to the list of trusted ownClouds
-	 *
-	 * @param string $url
-	 * @return DataResponse
-	 * @throws HintException
-	 */
-	public function addServer($url) {
-		$this->checkServer($url);
-		$id = $this->trustedServers->addServer($url);
-
-		return new DataResponse(
-			[
-				'url' => $url,
-				'id' => $id,
-				'message' => (string) $this->l->t('Added to the list of trusted servers')
-			]
-		);
-	}
-
-	/**
-	 * add server to the list of trusted ownClouds
-	 *
-	 * @param int $id
-	 * @return DataResponse
-	 */
-	public function removeServer($id) {
-		$this->trustedServers->removeServer($id);
-		return new DataResponse();
-	}
-
-	/**
-	 * enable/disable to automatically add servers to the list of trusted servers
-	 * once a federated share was created and accepted successfully
-	 *
-	 * @param bool $autoAddServers
-	 */
-	public function autoAddServers($autoAddServers) {
-		$this->trustedServers->setAutoAddServers($autoAddServers);
-	}
-
-	/**
-	 * check if the server should be added to the list of trusted servers or not
-	 *
-	 * @param string $url
-	 * @return bool
-	 * @throws HintException
-	 */
-	protected function checkServer($url) {
-		if ($this->trustedServers->isTrustedServer($url) === true) {
-			$message = 'Server is already in the list of trusted servers.';
-			$hint = $this->l->t('Server is already in the list of trusted servers.');
-			throw new HintException($message, $hint);
-		}
-
-		if ($this->trustedServers->isOwnCloudServer($url) === false) {
-			$message = 'No server to federate with found';
-			$hint = $this->l->t('No server to federate with found');
-			throw new HintException($message, $hint);
-		}
-
-		return true;
-	}
+    /** @var IL10N */
+    private $l;
+
+    /** @var  TrustedServers */
+    private $trustedServers;
+
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param TrustedServers $trustedServers
+     */
+    public function __construct($AppName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                TrustedServers $trustedServers
+    ) {
+        parent::__construct($AppName, $request);
+        $this->l = $l10n;
+        $this->trustedServers = $trustedServers;
+    }
+
+
+    /**
+     * add server to the list of trusted ownClouds
+     *
+     * @param string $url
+     * @return DataResponse
+     * @throws HintException
+     */
+    public function addServer($url) {
+        $this->checkServer($url);
+        $id = $this->trustedServers->addServer($url);
+
+        return new DataResponse(
+            [
+                'url' => $url,
+                'id' => $id,
+                'message' => (string) $this->l->t('Added to the list of trusted servers')
+            ]
+        );
+    }
+
+    /**
+     * add server to the list of trusted ownClouds
+     *
+     * @param int $id
+     * @return DataResponse
+     */
+    public function removeServer($id) {
+        $this->trustedServers->removeServer($id);
+        return new DataResponse();
+    }
+
+    /**
+     * enable/disable to automatically add servers to the list of trusted servers
+     * once a federated share was created and accepted successfully
+     *
+     * @param bool $autoAddServers
+     */
+    public function autoAddServers($autoAddServers) {
+        $this->trustedServers->setAutoAddServers($autoAddServers);
+    }
+
+    /**
+     * check if the server should be added to the list of trusted servers or not
+     *
+     * @param string $url
+     * @return bool
+     * @throws HintException
+     */
+    protected function checkServer($url) {
+        if ($this->trustedServers->isTrustedServer($url) === true) {
+            $message = 'Server is already in the list of trusted servers.';
+            $hint = $this->l->t('Server is already in the list of trusted servers.');
+            throw new HintException($message, $hint);
+        }
+
+        if ($this->trustedServers->isOwnCloudServer($url) === false) {
+            $message = 'No server to federate with found';
+            $hint = $this->l->t('No server to federate with found');
+            throw new HintException($message, $hint);
+        }
+
+        return true;
+    }
 
 }

apps/federation/lib/TrustedServers.php

Spacing +3 added lines, -3 removed lines

@@ -221,7 +221,7 @@ 
 		$client = $this->httpClientService->newClient();
 		try {
 			$result = $client->get(
-				$url . '/status.php',
+				$url.'/status.php',
 				[
 					'timeout' => 3,
 					'connect_timeout' => 3,
@@ -232,7 +232,7 @@ 
 
 			}
 		} catch (\Exception $e) {
-			$this->logger->debug('No Nextcloud server: ' . $e->getMessage());
+			$this->logger->debug('No Nextcloud server: '.$e->getMessage());
 			return false;
 		}
 
@@ -273,6 +273,6 @@ 
 
 		}
 
-		return 'https://' . $url;
+		return 'https://'.$url;
 	}
 }

Indentation +237 added lines, -237 removed lines

@@ -38,241 +38,241 @@
 
 class TrustedServers {
 
-	/** after a user list was exchanged at least once successfully */
-	const STATUS_OK = 1;
-	/** waiting for shared secret or initial user list exchange */
-	const STATUS_PENDING = 2;
-	/** something went wrong, misconfigured server, software bug,... user interaction needed */
-	const STATUS_FAILURE = 3;
-	/** remote server revoked access */
-	const STATUS_ACCESS_REVOKED = 4;
-
-	/** @var  dbHandler */
-	private $dbHandler;
-
-	/** @var  IClientService */
-	private $httpClientService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var ISecureRandom */
-	private $secureRandom;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	/**
-	 * @param DbHandler $dbHandler
-	 * @param IClientService $httpClientService
-	 * @param ILogger $logger
-	 * @param IJobList $jobList
-	 * @param ISecureRandom $secureRandom
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(
-		DbHandler $dbHandler,
-		IClientService $httpClientService,
-		ILogger $logger,
-		IJobList $jobList,
-		ISecureRandom $secureRandom,
-		IConfig $config,
-		EventDispatcherInterface $dispatcher
-	) {
-		$this->dbHandler = $dbHandler;
-		$this->httpClientService = $httpClientService;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
-		$this->secureRandom = $secureRandom;
-		$this->config = $config;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * add server to the list of trusted servers
-	 *
-	 * @param $url
-	 * @return int server id
-	 */
-	public function addServer($url) {
-		$url = $this->updateProtocol($url);
-		$result = $this->dbHandler->addServer($url);
-		if ($result) {
-			$token = $this->secureRandom->generate(16);
-			$this->dbHandler->addToken($url, $token);
-			$this->jobList->add(
-				'OCA\Federation\BackgroundJob\RequestSharedSecret',
-				[
-					'url' => $url,
-					'token' => $token
-				]
-			);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * enable/disable to automatically add servers to the list of trusted servers
-	 * once a federated share was created and accepted successfully
-	 *
-	 * @param bool $status
-	 */
-	public function setAutoAddServers($status) {
-		$value = $status ? '1' : '0';
-		$this->config->setAppValue('federation', 'autoAddServers', $value);
-	}
-
-	/**
-	 * return if we automatically add servers to the list of trusted servers
-	 * once a federated share was created and accepted successfully
-	 *
-	 * @return bool
-	 */
-	public function getAutoAddServers() {
-		$value = $this->config->getAppValue('federation', 'autoAddServers', '1');
-		return $value === '1';
-	}
-
-	/**
-	 * get shared secret for the given server
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	public function getSharedSecret($url) {
-		return $this->dbHandler->getSharedSecret($url);
-	}
-
-	/**
-	 * add shared secret for the given server
-	 *
-	 * @param string $url
-	 * @param $sharedSecret
-	 */
-	public function addSharedSecret($url, $sharedSecret) {
-		$this->dbHandler->addSharedSecret($url, $sharedSecret);
-	}
-
-	/**
-	 * remove server from the list of trusted servers
-	 *
-	 * @param int $id
-	 */
-	public function removeServer($id) {
-		$server = $this->dbHandler->getServerById($id);
-		$this->dbHandler->removeServer($id);
-		$event = new GenericEvent($server['url_hash']);
-		$this->dispatcher->dispatch('OCP\Federation\TrustedServerEvent::remove', $event);
-	}
-
-	/**
-	 * get all trusted servers
-	 *
-	 * @return array
-	 */
-	public function getServers() {
-		return $this->dbHandler->getAllServer();
-	}
-
-	/**
-	 * check if given server is a trusted ownCloud server
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function isTrustedServer($url) {
-		return $this->dbHandler->serverExists($url);
-	}
-
-	/**
-	 * set server status
-	 *
-	 * @param string $url
-	 * @param int $status
-	 */
-	public function setServerStatus($url, $status) {
-		$this->dbHandler->setServerStatus($url, $status);
-	}
-
-	/**
-	 * @param string $url
-	 * @return int
-	 */
-	public function getServerStatus($url) {
-		return $this->dbHandler->getServerStatus($url);
-	}
-
-	/**
-	 * check if URL point to a ownCloud/Nextcloud server
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function isOwnCloudServer($url) {
-		$isValidOwnCloud = false;
-		$client = $this->httpClientService->newClient();
-		try {
-			$result = $client->get(
-				$url . '/status.php',
-				[
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			);
-			if ($result->getStatusCode() === Http::STATUS_OK) {
-				$isValidOwnCloud = $this->checkOwnCloudVersion($result->getBody());
-
-			}
-		} catch (\Exception $e) {
-			$this->logger->debug('No Nextcloud server: ' . $e->getMessage());
-			return false;
-		}
-
-		return $isValidOwnCloud;
-	}
-
-	/**
-	 * check if ownCloud version is >= 9.0
-	 *
-	 * @param $status
-	 * @return bool
-	 * @throws HintException
-	 */
-	protected function checkOwnCloudVersion($status) {
-		$decoded = json_decode($status, true);
-		if (!empty($decoded) && isset($decoded['version'])) {
-			if (!version_compare($decoded['version'], '9.0.0', '>=')) {
-				throw new HintException('Remote server version is too low. 9.0 is required.');
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * check if the URL contain a protocol, if not add https
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function updateProtocol($url) {
-		if (
-			strpos($url, 'https://') === 0
-			|| strpos($url, 'http://') === 0
-		) {
-
-			return $url;
-
-		}
-
-		return 'https://' . $url;
-	}
+    /** after a user list was exchanged at least once successfully */
+    const STATUS_OK = 1;
+    /** waiting for shared secret or initial user list exchange */
+    const STATUS_PENDING = 2;
+    /** something went wrong, misconfigured server, software bug,... user interaction needed */
+    const STATUS_FAILURE = 3;
+    /** remote server revoked access */
+    const STATUS_ACCESS_REVOKED = 4;
+
+    /** @var  dbHandler */
+    private $dbHandler;
+
+    /** @var  IClientService */
+    private $httpClientService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var ISecureRandom */
+    private $secureRandom;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    /**
+     * @param DbHandler $dbHandler
+     * @param IClientService $httpClientService
+     * @param ILogger $logger
+     * @param IJobList $jobList
+     * @param ISecureRandom $secureRandom
+     * @param IConfig $config
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(
+        DbHandler $dbHandler,
+        IClientService $httpClientService,
+        ILogger $logger,
+        IJobList $jobList,
+        ISecureRandom $secureRandom,
+        IConfig $config,
+        EventDispatcherInterface $dispatcher
+    ) {
+        $this->dbHandler = $dbHandler;
+        $this->httpClientService = $httpClientService;
+        $this->logger = $logger;
+        $this->jobList = $jobList;
+        $this->secureRandom = $secureRandom;
+        $this->config = $config;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * add server to the list of trusted servers
+     *
+     * @param $url
+     * @return int server id
+     */
+    public function addServer($url) {
+        $url = $this->updateProtocol($url);
+        $result = $this->dbHandler->addServer($url);
+        if ($result) {
+            $token = $this->secureRandom->generate(16);
+            $this->dbHandler->addToken($url, $token);
+            $this->jobList->add(
+                'OCA\Federation\BackgroundJob\RequestSharedSecret',
+                [
+                    'url' => $url,
+                    'token' => $token
+                ]
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * enable/disable to automatically add servers to the list of trusted servers
+     * once a federated share was created and accepted successfully
+     *
+     * @param bool $status
+     */
+    public function setAutoAddServers($status) {
+        $value = $status ? '1' : '0';
+        $this->config->setAppValue('federation', 'autoAddServers', $value);
+    }
+
+    /**
+     * return if we automatically add servers to the list of trusted servers
+     * once a federated share was created and accepted successfully
+     *
+     * @return bool
+     */
+    public function getAutoAddServers() {
+        $value = $this->config->getAppValue('federation', 'autoAddServers', '1');
+        return $value === '1';
+    }
+
+    /**
+     * get shared secret for the given server
+     *
+     * @param string $url
+     * @return string
+     */
+    public function getSharedSecret($url) {
+        return $this->dbHandler->getSharedSecret($url);
+    }
+
+    /**
+     * add shared secret for the given server
+     *
+     * @param string $url
+     * @param $sharedSecret
+     */
+    public function addSharedSecret($url, $sharedSecret) {
+        $this->dbHandler->addSharedSecret($url, $sharedSecret);
+    }
+
+    /**
+     * remove server from the list of trusted servers
+     *
+     * @param int $id
+     */
+    public function removeServer($id) {
+        $server = $this->dbHandler->getServerById($id);
+        $this->dbHandler->removeServer($id);
+        $event = new GenericEvent($server['url_hash']);
+        $this->dispatcher->dispatch('OCP\Federation\TrustedServerEvent::remove', $event);
+    }
+
+    /**
+     * get all trusted servers
+     *
+     * @return array
+     */
+    public function getServers() {
+        return $this->dbHandler->getAllServer();
+    }
+
+    /**
+     * check if given server is a trusted ownCloud server
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function isTrustedServer($url) {
+        return $this->dbHandler->serverExists($url);
+    }
+
+    /**
+     * set server status
+     *
+     * @param string $url
+     * @param int $status
+     */
+    public function setServerStatus($url, $status) {
+        $this->dbHandler->setServerStatus($url, $status);
+    }
+
+    /**
+     * @param string $url
+     * @return int
+     */
+    public function getServerStatus($url) {
+        return $this->dbHandler->getServerStatus($url);
+    }
+
+    /**
+     * check if URL point to a ownCloud/Nextcloud server
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function isOwnCloudServer($url) {
+        $isValidOwnCloud = false;
+        $client = $this->httpClientService->newClient();
+        try {
+            $result = $client->get(
+                $url . '/status.php',
+                [
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            );
+            if ($result->getStatusCode() === Http::STATUS_OK) {
+                $isValidOwnCloud = $this->checkOwnCloudVersion($result->getBody());
+
+            }
+        } catch (\Exception $e) {
+            $this->logger->debug('No Nextcloud server: ' . $e->getMessage());
+            return false;
+        }
+
+        return $isValidOwnCloud;
+    }
+
+    /**
+     * check if ownCloud version is >= 9.0
+     *
+     * @param $status
+     * @return bool
+     * @throws HintException
+     */
+    protected function checkOwnCloudVersion($status) {
+        $decoded = json_decode($status, true);
+        if (!empty($decoded) && isset($decoded['version'])) {
+            if (!version_compare($decoded['version'], '9.0.0', '>=')) {
+                throw new HintException('Remote server version is too low. 9.0 is required.');
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * check if the URL contain a protocol, if not add https
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function updateProtocol($url) {
+        if (
+            strpos($url, 'https://') === 0
+            || strpos($url, 'http://') === 0
+        ) {
+
+            return $url;
+
+        }
+
+        return 'https://' . $url;
+    }
 }

apps/federation/lib/BackgroundJob/GetSharedSecret.php

Indentation +153 added lines, -153 removed lines

@@ -47,157 +47,157 @@
  */
 class GetSharedSecret extends Job{
 
-	/** @var IClient */
-	private $httpClient;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var TrustedServers  */
-	private $trustedServers;
-
-	/** @var DbHandler */
-	private $dbHandler;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var bool */
-	protected $retainJob = false;
-
-	private $endPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret?format=json';
-
-	/**
-	 * RequestSharedSecret constructor.
-	 *
-	 * @param IClient $httpClient
-	 * @param IURLGenerator $urlGenerator
-	 * @param IJobList $jobList
-	 * @param TrustedServers $trustedServers
-	 * @param ILogger $logger
-	 * @param DbHandler $dbHandler
-	 */
-	public function __construct(
-		IClient $httpClient = null,
-		IURLGenerator $urlGenerator = null,
-		IJobList $jobList = null,
-		TrustedServers $trustedServers = null,
-		ILogger $logger = null,
-		DbHandler $dbHandler = null
-	) {
-		$this->logger = $logger ? $logger : \OC::$server->getLogger();
-		$this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient();
-		$this->jobList = $jobList ? $jobList : \OC::$server->getJobList();
-		$this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
-		$this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
-		if ($trustedServers) {
-			$this->trustedServers = $trustedServers;
-		} else {
-			$this->trustedServers = new TrustedServers(
-				$this->dbHandler,
-				\OC::$server->getHTTPClientService(),
-				$this->logger,
-				$this->jobList,
-				\OC::$server->getSecureRandom(),
-				\OC::$server->getConfig(),
-				\OC::$server->getEventDispatcher()
-			);
-		}
-	}
-
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$target = $this->argument['url'];
-		// only execute if target is still in the list of trusted domains
-		if ($this->trustedServers->isTrustedServer($target)) {
-			$this->parentExecute($jobList, $logger);
-		}
-
-		if (!$this->retainJob) {
-			$jobList->remove($this, $this->argument);
-		}
-	}
-
-	/**
-	 * call execute() method of parent
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	protected function parentExecute($jobList, $logger = null) {
-		parent::execute($jobList, $logger);
-	}
-
-	protected function run($argument) {
-		$target = $argument['url'];
-		$source = $this->urlGenerator->getAbsoluteURL('/');
-		$source = rtrim($source, '/');
-		$token = $argument['token'];
-
-		$result = null;
-		try {
-			$result = $this->httpClient->get(
-				$target . $this->endPoint,
-				[
-					'query' =>
-						[
-							'url' => $source,
-							'token' => $token
-						],
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			);
-
-			$status = $result->getStatusCode();
-
-		} catch (ClientException $e) {
-			$status = $e->getCode();
-			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
-			} else {
-				$this->logger->logException($e, ['app' => 'federation']);
-			}
-		} catch (\Exception $e) {
-			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
-			$this->logger->logException($e, ['app' => 'federation']);
-		}
-
-		// if we received a unexpected response we try again later
-		if (
-			$status !== Http::STATUS_OK
-			&& $status !== Http::STATUS_FORBIDDEN
-		) {
-			$this->retainJob = true;
-		}  else {
-			// reset token if we received a valid response
-			$this->dbHandler->addToken($target, '');
-		}
-
-		if ($status === Http::STATUS_OK && $result instanceof IResponse) {
-			$body = $result->getBody();
-			$result = json_decode($body, true);
-			if (isset($result['ocs']['data']['sharedSecret'])) {
-				$this->trustedServers->addSharedSecret(
-						$target,
-						$result['ocs']['data']['sharedSecret']
-				);
-			} else {
-				$this->logger->error(
-						'remote server "' . $target . '"" does not return a valid shared secret',
-						['app' => 'federation']
-				);
-				$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
-			}
-		}
-
-	}
+    /** @var IClient */
+    private $httpClient;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var TrustedServers  */
+    private $trustedServers;
+
+    /** @var DbHandler */
+    private $dbHandler;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var bool */
+    protected $retainJob = false;
+
+    private $endPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret?format=json';
+
+    /**
+     * RequestSharedSecret constructor.
+     *
+     * @param IClient $httpClient
+     * @param IURLGenerator $urlGenerator
+     * @param IJobList $jobList
+     * @param TrustedServers $trustedServers
+     * @param ILogger $logger
+     * @param DbHandler $dbHandler
+     */
+    public function __construct(
+        IClient $httpClient = null,
+        IURLGenerator $urlGenerator = null,
+        IJobList $jobList = null,
+        TrustedServers $trustedServers = null,
+        ILogger $logger = null,
+        DbHandler $dbHandler = null
+    ) {
+        $this->logger = $logger ? $logger : \OC::$server->getLogger();
+        $this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient();
+        $this->jobList = $jobList ? $jobList : \OC::$server->getJobList();
+        $this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
+        $this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
+        if ($trustedServers) {
+            $this->trustedServers = $trustedServers;
+        } else {
+            $this->trustedServers = new TrustedServers(
+                $this->dbHandler,
+                \OC::$server->getHTTPClientService(),
+                $this->logger,
+                $this->jobList,
+                \OC::$server->getSecureRandom(),
+                \OC::$server->getConfig(),
+                \OC::$server->getEventDispatcher()
+            );
+        }
+    }
+
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $target = $this->argument['url'];
+        // only execute if target is still in the list of trusted domains
+        if ($this->trustedServers->isTrustedServer($target)) {
+            $this->parentExecute($jobList, $logger);
+        }
+
+        if (!$this->retainJob) {
+            $jobList->remove($this, $this->argument);
+        }
+    }
+
+    /**
+     * call execute() method of parent
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    protected function parentExecute($jobList, $logger = null) {
+        parent::execute($jobList, $logger);
+    }
+
+    protected function run($argument) {
+        $target = $argument['url'];
+        $source = $this->urlGenerator->getAbsoluteURL('/');
+        $source = rtrim($source, '/');
+        $token = $argument['token'];
+
+        $result = null;
+        try {
+            $result = $this->httpClient->get(
+                $target . $this->endPoint,
+                [
+                    'query' =>
+                        [
+                            'url' => $source,
+                            'token' => $token
+                        ],
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            );
+
+            $status = $result->getStatusCode();
+
+        } catch (ClientException $e) {
+            $status = $e->getCode();
+            if ($status === Http::STATUS_FORBIDDEN) {
+                $this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
+            } else {
+                $this->logger->logException($e, ['app' => 'federation']);
+            }
+        } catch (\Exception $e) {
+            $status = Http::STATUS_INTERNAL_SERVER_ERROR;
+            $this->logger->logException($e, ['app' => 'federation']);
+        }
+
+        // if we received a unexpected response we try again later
+        if (
+            $status !== Http::STATUS_OK
+            && $status !== Http::STATUS_FORBIDDEN
+        ) {
+            $this->retainJob = true;
+        }  else {
+            // reset token if we received a valid response
+            $this->dbHandler->addToken($target, '');
+        }
+
+        if ($status === Http::STATUS_OK && $result instanceof IResponse) {
+            $body = $result->getBody();
+            $result = json_decode($body, true);
+            if (isset($result['ocs']['data']['sharedSecret'])) {
+                $this->trustedServers->addSharedSecret(
+                        $target,
+                        $result['ocs']['data']['sharedSecret']
+                );
+            } else {
+                $this->logger->error(
+                        'remote server "' . $target . '"" does not return a valid shared secret',
+                        ['app' => 'federation']
+                );
+                $this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
+            }
+        }
+
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -45,7 +45,7 @@ 
  *
  * @package OCA\Federation\Backgroundjob
  */
-class GetSharedSecret extends Job{
+class GetSharedSecret extends Job {
 
 	/** @var IClient */
 	private $httpClient;
@@ -145,7 +145,7 @@ 
 		$result = null;
 		try {
 			$result = $this->httpClient->get(
-				$target . $this->endPoint,
+				$target.$this->endPoint,
 				[
 					'query' =>
 						[
@@ -162,7 +162,7 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
+				$this->logger->info($target.' refused to exchange a shared secret with you.', ['app' => 'federation']);
 			} else {
 				$this->logger->logException($e, ['app' => 'federation']);
 			}
@@ -177,7 +177,7 @@ 
 			&& $status !== Http::STATUS_FORBIDDEN
 		) {
 			$this->retainJob = true;
-		}  else {
+		} else {
 			// reset token if we received a valid response
 			$this->dbHandler->addToken($target, '');
 		}
@@ -192,7 +192,7 @@ 
 				);
 			} else {
 				$this->logger->error(
-						'remote server "' . $target . '"" does not return a valid shared secret',
+						'remote server "'.$target.'"" does not return a valid shared secret',
 						['app' => 'federation']
 				);
 				$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);

Braces +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 			&& $status !== Http::STATUS_FORBIDDEN
 		) {
 			$this->retainJob = true;
-		}  else {
+		} else {
 			// reset token if we received a valid response
 			$this->dbHandler->addToken($target, '');
 		}

apps/federation/lib/BackgroundJob/RequestSharedSecret.php

Indentation +136 added lines, -136 removed lines

@@ -47,140 +47,140 @@
  */
 class RequestSharedSecret extends Job {
 
-	/** @var IClient */
-	private $httpClient;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var DbHandler */
-	private $dbHandler;
-
-	/** @var TrustedServers */
-	private $trustedServers;
-
-	private $endPoint = '/ocs/v2.php/apps/federation/api/v1/request-shared-secret?format=json';
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var bool */
-	protected $retainJob = false;
-
-	/**
-	 * RequestSharedSecret constructor.
-	 *
-	 * @param IClient $httpClient
-	 * @param IURLGenerator $urlGenerator
-	 * @param IJobList $jobList
-	 * @param TrustedServers $trustedServers
-	 * @param DbHandler $dbHandler
-	 */
-	public function __construct(
-		IClient $httpClient = null,
-		IURLGenerator $urlGenerator = null,
-		IJobList $jobList = null,
-		TrustedServers $trustedServers = null,
-		DbHandler $dbHandler = null
-	) {
-		$this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient();
-		$this->jobList = $jobList ? $jobList : \OC::$server->getJobList();
-		$this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
-		$this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
-		$this->logger = \OC::$server->getLogger();
-		if ($trustedServers) {
-			$this->trustedServers = $trustedServers;
-		} else {
-			$this->trustedServers = new TrustedServers(
-				$this->dbHandler,
-				\OC::$server->getHTTPClientService(),
-				$this->logger,
-				$this->jobList,
-				\OC::$server->getSecureRandom(),
-				\OC::$server->getConfig(),
-				\OC::$server->getEventDispatcher()
-			);
-		}
-	}
-
-
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$target = $this->argument['url'];
-		// only execute if target is still in the list of trusted domains
-		if ($this->trustedServers->isTrustedServer($target)) {
-			$this->parentExecute($jobList, $logger);
-		}
-
-		if (!$this->retainJob) {
-			$jobList->remove($this, $this->argument);
-		}
-	}
-
-	/**
-	 * call execute() method of parent
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	protected function parentExecute($jobList, $logger) {
-		parent::execute($jobList, $logger);
-	}
-
-	protected function run($argument) {
-
-		$target = $argument['url'];
-		$source = $this->urlGenerator->getAbsoluteURL('/');
-		$source = rtrim($source, '/');
-		$token = $argument['token'];
-
-		try {
-			$result = $this->httpClient->post(
-				$target . $this->endPoint,
-				[
-					'body' => [
-						'url' => $source,
-						'token' => $token,
-					],
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			);
-
-			$status = $result->getStatusCode();
-
-		} catch (ClientException $e) {
-			$status = $e->getCode();
-			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']);
-			} else {
-				$this->logger->logException($e, ['app' => 'federation']);
-			}
-		} catch (\Exception $e) {
-			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
-			$this->logger->logException($e, ['app' => 'federation']);
-		}
-
-		// if we received a unexpected response we try again later
-		if (
-			$status !== Http::STATUS_OK
-			&& $status !== Http::STATUS_FORBIDDEN
-		) {
-			$this->retainJob = true;
-		}
-
-		if ($status === Http::STATUS_FORBIDDEN) {
-			// clear token if remote server refuses to ask for shared secret
-			$this->dbHandler->addToken($target, '');
-		}
-
-	}
+    /** @var IClient */
+    private $httpClient;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var DbHandler */
+    private $dbHandler;
+
+    /** @var TrustedServers */
+    private $trustedServers;
+
+    private $endPoint = '/ocs/v2.php/apps/federation/api/v1/request-shared-secret?format=json';
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var bool */
+    protected $retainJob = false;
+
+    /**
+     * RequestSharedSecret constructor.
+     *
+     * @param IClient $httpClient
+     * @param IURLGenerator $urlGenerator
+     * @param IJobList $jobList
+     * @param TrustedServers $trustedServers
+     * @param DbHandler $dbHandler
+     */
+    public function __construct(
+        IClient $httpClient = null,
+        IURLGenerator $urlGenerator = null,
+        IJobList $jobList = null,
+        TrustedServers $trustedServers = null,
+        DbHandler $dbHandler = null
+    ) {
+        $this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient();
+        $this->jobList = $jobList ? $jobList : \OC::$server->getJobList();
+        $this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
+        $this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
+        $this->logger = \OC::$server->getLogger();
+        if ($trustedServers) {
+            $this->trustedServers = $trustedServers;
+        } else {
+            $this->trustedServers = new TrustedServers(
+                $this->dbHandler,
+                \OC::$server->getHTTPClientService(),
+                $this->logger,
+                $this->jobList,
+                \OC::$server->getSecureRandom(),
+                \OC::$server->getConfig(),
+                \OC::$server->getEventDispatcher()
+            );
+        }
+    }
+
+
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $target = $this->argument['url'];
+        // only execute if target is still in the list of trusted domains
+        if ($this->trustedServers->isTrustedServer($target)) {
+            $this->parentExecute($jobList, $logger);
+        }
+
+        if (!$this->retainJob) {
+            $jobList->remove($this, $this->argument);
+        }
+    }
+
+    /**
+     * call execute() method of parent
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    protected function parentExecute($jobList, $logger) {
+        parent::execute($jobList, $logger);
+    }
+
+    protected function run($argument) {
+
+        $target = $argument['url'];
+        $source = $this->urlGenerator->getAbsoluteURL('/');
+        $source = rtrim($source, '/');
+        $token = $argument['token'];
+
+        try {
+            $result = $this->httpClient->post(
+                $target . $this->endPoint,
+                [
+                    'body' => [
+                        'url' => $source,
+                        'token' => $token,
+                    ],
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            );
+
+            $status = $result->getStatusCode();
+
+        } catch (ClientException $e) {
+            $status = $e->getCode();
+            if ($status === Http::STATUS_FORBIDDEN) {
+                $this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']);
+            } else {
+                $this->logger->logException($e, ['app' => 'federation']);
+            }
+        } catch (\Exception $e) {
+            $status = Http::STATUS_INTERNAL_SERVER_ERROR;
+            $this->logger->logException($e, ['app' => 'federation']);
+        }
+
+        // if we received a unexpected response we try again later
+        if (
+            $status !== Http::STATUS_OK
+            && $status !== Http::STATUS_FORBIDDEN
+        ) {
+            $this->retainJob = true;
+        }
+
+        if ($status === Http::STATUS_FORBIDDEN) {
+            // clear token if remote server refuses to ask for shared secret
+            $this->dbHandler->addToken($target, '');
+        }
+
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -144,7 +144,7 @@ 
 
 		try {
 			$result = $this->httpClient->post(
-				$target . $this->endPoint,
+				$target.$this->endPoint,
 				[
 					'body' => [
 						'url' => $source,
@@ -160,7 +160,7 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']);
+				$this->logger->info($target.' refused to ask for a shared secret.', ['app' => 'federation']);
 			} else {
 				$this->logger->logException($e, ['app' => 'federation']);
 			}

apps/federation/lib/Settings/Admin.php

Indentation +31 added lines, -31 removed lines

@@ -29,41 +29,41 @@
 
 class Admin implements ISettings {
 
-	/** @var TrustedServers */
-	private $trustedServers;
+    /** @var TrustedServers */
+    private $trustedServers;
 
-	public function __construct(TrustedServers $trustedServers) {
-		$this->trustedServers = $trustedServers;
-	}
+    public function __construct(TrustedServers $trustedServers) {
+        $this->trustedServers = $trustedServers;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			'trustedServers' => $this->trustedServers->getServers(),
-			'autoAddServers' => $this->trustedServers->getAutoAddServers(),
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            'trustedServers' => $this->trustedServers->getServers(),
+            'autoAddServers' => $this->trustedServers->getAutoAddServers(),
+        ];
 
-		return new TemplateResponse('federation', 'settings-admin', $parameters, '');
-	}
+        return new TemplateResponse('federation', 'settings-admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'sharing';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 30;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 30;
+    }
 
 }

apps/federation/lib/Hooks.php

Indentation +20 added lines, -20 removed lines

@@ -27,25 +27,25 @@
 
 class Hooks {
 
-	/** @var TrustedServers */
-	private $trustedServers;
-
-	public function __construct(TrustedServers $trustedServers) {
-		$this->trustedServers = $trustedServers;
-	}
-
-	/**
-	 * add servers to the list of trusted servers once a federated share was established
-	 *
-	 * @param array $params
-	 */
-	public function addServerHook($params) {
-		if (
-			$this->trustedServers->getAutoAddServers() === true &&
-			$this->trustedServers->isTrustedServer($params['server']) === false
-		) {
-			$this->trustedServers->addServer($params['server']);
-		}
-	}
+    /** @var TrustedServers */
+    private $trustedServers;
+
+    public function __construct(TrustedServers $trustedServers) {
+        $this->trustedServers = $trustedServers;
+    }
+
+    /**
+     * add servers to the list of trusted servers once a federated share was established
+     *
+     * @param array $params
+     */
+    public function addServerHook($params) {
+        if (
+            $this->trustedServers->getAutoAddServers() === true &&
+            $this->trustedServers->isTrustedServer($params['server']) === false
+        ) {
+            $this->trustedServers->addServer($params['server']);
+        }
+    }
 
 }

apps/federation/lib/Middleware/AddServerMiddleware.php

Indentation +31 added lines, -31 removed lines

@@ -33,42 +33,42 @@
 
 class AddServerMiddleware extends Middleware {
 
-	/** @var  string */
-	protected $appName;
+    /** @var  string */
+    protected $appName;
 
-	/** @var  IL10N */
-	protected $l;
+    /** @var  IL10N */
+    protected $l;
 
-	/** @var  ILogger */
-	protected $logger;
+    /** @var  ILogger */
+    protected $logger;
 
-	public function __construct($appName, IL10N $l, ILogger $logger) {
-		$this->appName = $appName;
-		$this->l = $l;
-		$this->logger = $logger;
-	}
+    public function __construct($appName, IL10N $l, ILogger $logger) {
+        $this->appName = $appName;
+        $this->l = $l;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Log error message and return a response which can be displayed to the user
-	 *
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @return JSONResponse
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		$this->logger->error($exception->getMessage(), ['app' => $this->appName]);
-		if ($exception instanceof HintException) {
-			$message = $exception->getHint();
-		} else {
-			$message = $exception->getMessage();
-		}
+    /**
+     * Log error message and return a response which can be displayed to the user
+     *
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @return JSONResponse
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        $this->logger->error($exception->getMessage(), ['app' => $this->appName]);
+        if ($exception instanceof HintException) {
+            $message = $exception->getHint();
+        } else {
+            $message = $exception->getMessage();
+        }
 
-		return new JSONResponse(
-			['message' => $message],
-			Http::STATUS_BAD_REQUEST
-		);
+        return new JSONResponse(
+            ['message' => $message],
+            Http::STATUS_BAD_REQUEST
+        );
 
-	}
+    }
 
 }