diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-20 20:48:12 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-20 20:48:12 +0200 |
| commit | b78e76a1cb68ffb374044851e9f96a0c7f463862 (patch) | |
| tree | 06ec35e0efbc695e097d277da130d0051561cae4 /apps/encryption/appinfo | |
| parent | a13088818a73ecdf6f7d6600c011e0fa49054b51 (diff) | |
| parent | 04674c06cca5884e6269461b2ae9a6e64a00953d (diff) | |
| download | nextcloud-server-b78e76a1cb68ffb374044851e9f96a0c7f463862.tar.gz nextcloud-server-b78e76a1cb68ffb374044851e9f96a0c7f463862.zip | |
Merge pull request #15677 from owncloud/enc_reset_private_key_password
[encryption] let user update the private key password
Diffstat (limited to 'apps/encryption/appinfo')
| -rw-r--r-- | apps/encryption/appinfo/application.php | 14 | ||||
| -rw-r--r-- | apps/encryption/appinfo/routes.php | 5 |
2 files changed, 19 insertions, 0 deletions
diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php index 5d0fe2c9184..243e227b6bb 100644 --- a/apps/encryption/appinfo/application.php +++ b/apps/encryption/appinfo/application.php @@ -171,6 +171,20 @@ class Application extends \OCP\AppFramework\App { ); }); + $container->registerService('SettingsController', function (IAppContainer $c) { + $server = $c->getServer(); + return new \OCA\Encryption\Controller\SettingsController( + $c->getAppName(), + $server->getRequest(), + $server->getL10N($c->getAppName()), + $server->getUserManager(), + $server->getUserSession(), + $c->query('KeyManager'), + $c->query('Crypt'), + $c->query('Session') + ); + }); + $container->registerService('UserSetup', function (IAppContainer $c) { $server = $c->getServer(); diff --git a/apps/encryption/appinfo/routes.php b/apps/encryption/appinfo/routes.php index 4194308a0ce..8fa163d0751 100644 --- a/apps/encryption/appinfo/routes.php +++ b/apps/encryption/appinfo/routes.php @@ -31,6 +31,11 @@ namespace OCA\Encryption\AppInfo; 'verb' => 'POST' ], [ + 'name' => 'Settings#updatePrivateKeyPassword', + 'url' => '/ajax/updatePrivateKeyPassword', + 'verb' => 'POST' + ], + [ 'name' => 'Recovery#changeRecoveryPassword', 'url' => '/ajax/changeRecoveryPassword', 'verb' => 'POST' |