upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

we don't need to remove the job manually here, even if we ask once more the other server will decline and the background job will be removed

Browse source 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2017-07-28 15:49:46 +02:00 committed by Roeland Jago Douma
parent 80c08e8fd0
commit 3ffff08819
No known key found for this signature in database
GPG key ID: F941078878347C0C
2 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/federation/lib/Controller/OCSAuthAPIController.php
View file

@ -149,15 +149,6 @@ class OCSAuthAPIController extends OCSController{
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',
[

2
apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
View file

@ -114,8 +114,6 @@ class OCSAuthAPIControllerTest extends TestCase {
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');