summaryrefslogtreecommitdiffstats
path: root/apps/federation/appinfo
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2015-11-18 15:07:41 +0100
committerBjörn Schießle <bjoern@schiessle.org>2015-11-19 18:07:25 +0100
commit2754afc0747950591b3ddca37248d363c6ab64f3 (patch)
tree9bae88b29416ec6d9e3f58abdf26e98e0b7d42e8 /apps/federation/appinfo
parent8f55b1a27d97f24751542b6dc44a89eb03387a75 (diff)
downloadnextcloud-server-2754afc0747950591b3ddca37248d363c6ab64f3.tar.gz
nextcloud-server-2754afc0747950591b3ddca37248d363c6ab64f3.zip
add option to auto add servers to the list of trusted servers once a federated share was created and accepted successfully
Diffstat (limited to 'apps/federation/appinfo')
-rw-r--r--apps/federation/appinfo/application.php3
-rw-r--r--apps/federation/appinfo/routes.php5
2 files changed, 7 insertions, 1 deletions
diff --git a/apps/federation/appinfo/application.php b/apps/federation/appinfo/application.php
index e91506a30bd..72a30f9ae0a 100644
--- a/apps/federation/appinfo/application.php
+++ b/apps/federation/appinfo/application.php
@@ -73,7 +73,8 @@ class Application extends \OCP\AppFramework\App {
\OC::$server->getHTTPClientService(),
\OC::$server->getLogger(),
\OC::$server->getJobList(),
- \OC::$server->getSecureRandom()
+ \OC::$server->getSecureRandom(),
+ \OC::$server->getConfig()
);
});
diff --git a/apps/federation/appinfo/routes.php b/apps/federation/appinfo/routes.php
index f45db43e4e7..8c1629a4fc6 100644
--- a/apps/federation/appinfo/routes.php
+++ b/apps/federation/appinfo/routes.php
@@ -35,6 +35,11 @@ $application->registerRoutes(
'url' => '/trusted-servers/{id}',
'verb' => 'DELETE'
],
+ [
+ 'name' => 'Settings#autoAddServers',
+ 'url' => '/auto-add-servers',
+ 'verb' => 'POST'
+ ],
]
]
);