we don't need to remove the job manually here, even if we ask once mo…

…re the other server will decline and the background job will be removed Signed-off-by: Bjoern Schiessle <[email protected]>
nextcloud · Jul 28, 2017 · 0560bd5 · 0560bd5
1 parent 04e8282
commit 0560bd5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/apps/federation/lib/Controller/OCSAuthAPIController.php b/apps/federation/lib/Controller/OCSAuthAPIController.php
@@ -149,15 +149,6 @@ public function requestSharedSecret($url, $token) {
 			throw new OCSForbiddenException();
 		}
 
-		// we ask for the shared secret so we no longer have to ask the other server
-		// to request the shared secret
-		$this->jobList->remove('OCA\Federation\BackgroundJob\RequestSharedSecret',
-			[
-				'url' => $url,
-				'token' => $localToken
-			]
-		);
-
 		$this->jobList->add(
 			'OCA\Federation\BackgroundJob\GetSharedSecret',
 			[

diff --git a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
@@ -114,8 +114,6 @@ public function testRequestSharedSecret($token, $localToken, $isTrustedServer, $
 		if ($ok) {
 			$this->jobList->expects($this->once())->method('add')
 				->with('OCA\Federation\BackgroundJob\GetSharedSecret', ['url' => $url, 'token' => $token, 'created' => $this->currentTime]);
-			$this->jobList->expects($this->once())->method('remove')
-				->with('OCA\Federation\BackgroundJob\RequestSharedSecret', ['url' => $url, 'token' => $localToken]);
 		} else {
 			$this->jobList->expects($this->never())->method('add');
 			$this->jobList->expects($this->never())->method('remove');