summaryrefslogtreecommitdiffstats
path: root/apps/encryption/appinfo
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-03-31 16:23:31 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-07 13:30:29 +0200
commite4895bda01f9c94fc33e094ae9466e1cf5502916 (patch)
treef78a79ef0c3035d443fc10e2eaedcb4f436d7091 /apps/encryption/appinfo
parentbd933b1c85dff950e83591a6245ba2e15db33caf (diff)
downloadnextcloud-server-e4895bda01f9c94fc33e094ae9466e1cf5502916.tar.gz
nextcloud-server-e4895bda01f9c94fc33e094ae9466e1cf5502916.zip
add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files
Diffstat (limited to 'apps/encryption/appinfo')
-rw-r--r--apps/encryption/appinfo/application.php4
-rw-r--r--apps/encryption/appinfo/routes.php5
2 files changed, 8 insertions, 1 deletions
diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index e8f10798bb4..372d49e5ef7 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -139,7 +139,9 @@ class Application extends \OCP\AppFramework\App {
$server->getSecureRandom(),
$c->query('KeyManager'),
$server->getConfig(),
- $server->getEncryptionKeyStorage(\OCA\Encryption\Crypto\Encryption::ID));
+ $server->getEncryptionKeyStorage(\OCA\Encryption\Crypto\Encryption::ID),
+ $server->getEncryptionFilesHelper(),
+ new \OC\Files\View());
});
$container->registerService('RecoveryController', function (IAppContainer $c) {
diff --git a/apps/encryption/appinfo/routes.php b/apps/encryption/appinfo/routes.php
index 030e7617816..1a6cf18fbed 100644
--- a/apps/encryption/appinfo/routes.php
+++ b/apps/encryption/appinfo/routes.php
@@ -38,6 +38,11 @@ namespace OCA\Encryption\AppInfo;
'name' => 'Recovery#changeRecoveryPassword',
'url' => '/ajax/changeRecoveryPassword',
'verb' => 'POST'
+ ],
+ [
+ 'name' => 'Recovery#userSetRecovery',
+ 'url' => '/ajax/userSetRecovery',
+ 'verb' => 'POST'
]