diff options
Diffstat (limited to 'apps/federation/lib/BackgroundJob/RequestSharedSecret.php')
| -rw-r--r-- | apps/federation/lib/BackgroundJob/RequestSharedSecret.php | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php index e165c24bdf2..fb9fd25888f 100644 --- a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php @@ -36,7 +36,6 @@ use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Ring\Exception\RingException; use OC\BackgroundJob\JobList; use OC\BackgroundJob\Job; -use OCA\Federation\DbHandler; use OCA\Federation\TrustedServers; use OCP\AppFramework\Http; use OCP\AppFramework\Utility\ITimeFactory; @@ -65,9 +64,6 @@ class RequestSharedSecret extends Job { /** @var IURLGenerator */ private $urlGenerator; - /** @var DbHandler */ - private $dbHandler; - /** @var TrustedServers */ private $trustedServers; @@ -83,8 +79,6 @@ class RequestSharedSecret extends Job { /** @var bool */ protected $retainJob = false; - private $format = '?format=json'; - private $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/request-shared-secret'; /** @var int 30 day = 2592000sec */ @@ -97,7 +91,6 @@ class RequestSharedSecret extends Job { * @param IURLGenerator $urlGenerator * @param IJobList $jobList * @param TrustedServers $trustedServers - * @param DbHandler $dbHandler * @param IDiscoveryService $ocsDiscoveryService * @param ILogger $logger * @param ITimeFactory $timeFactory @@ -107,7 +100,6 @@ class RequestSharedSecret extends Job { IURLGenerator $urlGenerator, IJobList $jobList, TrustedServers $trustedServers, - DbHandler $dbHandler, IDiscoveryService $ocsDiscoveryService, ILogger $logger, ITimeFactory $timeFactory @@ -115,7 +107,6 @@ class RequestSharedSecret extends Job { $this->httpClient = $httpClientService->newClient(); $this->jobList = $jobList; $this->urlGenerator = $urlGenerator; - $this->dbHandler = $dbHandler; $this->logger = $logger; $this->ocsDiscoveryService = $ocsDiscoveryService; $this->trustedServers = $trustedServers; @@ -174,7 +165,7 @@ class RequestSharedSecret extends Job { $endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint; // make sure that we have a well formated url - $url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format; + $url = rtrim($target, '/') . '/' . trim($endPoint, '/'); try { $result = $this->httpClient->post( @@ -183,6 +174,7 @@ class RequestSharedSecret extends Job { 'body' => [ 'url' => $source, 'token' => $token, + 'format' => 'json', ], 'timeout' => 3, 'connect_timeout' => 3, @@ -217,11 +209,6 @@ class RequestSharedSecret extends Job { $this->retainJob = true; } - if ($status === Http::STATUS_FORBIDDEN) { - // clear token if remote server refuses to ask for shared secret - $this->dbHandler->addToken($target, ''); - } - } /** |