Skip to content

More cleaning after auto-add removal #26781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Apr 27, 2021
Merged

More cleaning after auto-add removal #26781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/federation/composer/composer/autoload_classmap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
'OCA\\Federation\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
'OCA\\Federation\\DAV\\FedAuth' => $baseDir . '/../lib/DAV/FedAuth.php',
'OCA\\Federation\\DbHandler' => $baseDir . '/../lib/DbHandler.php',
'OCA\\Federation\\Hooks' => $baseDir . '/../lib/Hooks.php',
'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => $baseDir . '/../lib/Listener/SabrePluginAuthInitListener.php',
'OCA\\Federation\\Middleware\\AddServerMiddleware' => $baseDir . '/../lib/Middleware/AddServerMiddleware.php',
'OCA\\Federation\\Migration\\Version1010Date20200630191302' => $baseDir . '/../lib/Migration/Version1010Date20200630191302.php',
Expand Down
1 change: 0 additions & 1 deletion apps/federation/composer/composer/autoload_static.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class ComposerStaticInitFederation
'OCA\\Federation\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
'OCA\\Federation\\DAV\\FedAuth' => __DIR__ . '/..' . '/../lib/DAV/FedAuth.php',
'OCA\\Federation\\DbHandler' => __DIR__ . '/..' . '/../lib/DbHandler.php',
'OCA\\Federation\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => __DIR__ . '/..' . '/../lib/Listener/SabrePluginAuthInitListener.php',
'OCA\\Federation\\Middleware\\AddServerMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/AddServerMiddleware.php',
'OCA\\Federation\\Migration\\Version1010Date20200630191302' => __DIR__ . '/..' . '/../lib/Migration/Version1010Date20200630191302.php',
Expand Down
47 changes: 0 additions & 47 deletions apps/federation/lib/Hooks.php
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/federation/lib/Settings/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public function __construct(TrustedServers $trustedServers) {
public function getForm() {
$parameters = [
'trustedServers' => $this->trustedServers->getServers(),
'autoAddServers' => $this->trustedServers->getAutoAddServers(),
];

return new TemplateResponse('federation', 'settings-admin', $parameters, '');
Expand Down
22 changes: 0 additions & 22 deletions apps/federation/lib/TrustedServers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,28 +130,6 @@ public function addServer($url) {
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', '0');
return $value === '1';
}

/**
* get shared secret for the given server
*
Expand Down
80 changes: 0 additions & 80 deletions apps/federation/tests/HooksTest.php
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions apps/federation/tests/Settings/AdminTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,9 @@ public function testGetForm() {
->expects($this->once())
->method('getServers')
->willReturn(['myserver', 'secondserver']);
$this->trustedServers
->expects($this->once())
->method('getAutoAddServers')
->willReturn(['autoserver1', 'autoserver2']);

$params = [
'trustedServers' => ['myserver', 'secondserver'],
'autoAddServers' => ['autoserver1', 'autoserver2'],
];
$expected = new TemplateResponse('federation', 'settings-admin', $params, '');
$this->assertEquals($expected, $this->admin->getForm());
Expand Down
39 changes: 0 additions & 39 deletions apps/federation/tests/TrustedServersTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,45 +156,6 @@ public function dataTrueFalse() {
];
}

/**
* @dataProvider dataTrueFalse
*
* @param bool $status
*/
public function testSetAutoAddServers($status) {
if ($status) {
$this->config->expects($this->once())->method('setAppValue')
->with('federation', 'autoAddServers', '1');
} else {
$this->config->expects($this->once())->method('setAppValue')
->with('federation', 'autoAddServers', '0');
}

$this->trustedServers->setAutoAddServers($status);
}

/**
* @dataProvider dataTestGetAutoAddServers
*
* @param string $status
* @param bool $expected
*/
public function testGetAutoAddServers($status, $expected) {
$this->config->expects($this->once())->method('getAppValue')
->with('federation', 'autoAddServers', '0')->willReturn($status);

$this->assertSame($expected,
$this->trustedServers->getAutoAddServers()
);
}

public function dataTestGetAutoAddServers() {
return [
['1', true],
['0', false]
];
}

public function testAddSharedSecret() {
$this->dbHandler->expects($this->once())->method('addSharedSecret')
->with('url', 'secret');
Expand Down