From 89223379ad155ae0896d1481089e3751257aa76f Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Wed, 2 Mar 2016 19:25:44 +0100 Subject: replaceUserKeys() actually deletes the users keys -> update method name and doc-block --- apps/encryption/hooks/userhooks.php | 2 +- apps/encryption/lib/keymanager.php | 4 +++- apps/encryption/tests/hooks/UserHooksTest.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/encryption/hooks/userhooks.php b/apps/encryption/hooks/userhooks.php index 08b6c155186..b1141030bd9 100644 --- a/apps/encryption/hooks/userhooks.php +++ b/apps/encryption/hooks/userhooks.php @@ -296,7 +296,7 @@ class UserHooks implements IHook { public function postPasswordReset($params) { $password = $params['password']; - $this->keyManager->replaceUserKeys($params['uid']); + $this->keyManager->deleteUserKeys($params['uid']); $this->userSetup->setupUser($params['uid'], $password); } diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php index 1b81936aed1..f9a8f7bec3e 100644 --- a/apps/encryption/lib/keymanager.php +++ b/apps/encryption/lib/keymanager.php @@ -557,9 +557,11 @@ class KeyManager { } /** + * creat a backup of the users private and public key and then delete it + * * @param string $uid */ - public function replaceUserKeys($uid) { + public function deleteUserKeys($uid) { $this->backupAllKeys('password_reset'); $this->deletePublicKey($uid); $this->deletePrivateKey($uid); diff --git a/apps/encryption/tests/hooks/UserHooksTest.php b/apps/encryption/tests/hooks/UserHooksTest.php index 1aeafad0ba2..34cd74cd369 100644 --- a/apps/encryption/tests/hooks/UserHooksTest.php +++ b/apps/encryption/tests/hooks/UserHooksTest.php @@ -251,7 +251,7 @@ class UserHooksTest extends TestCase { public function testPostPasswordReset() { $this->keyManagerMock->expects($this->once()) - ->method('replaceUserKeys') + ->method('deleteUserKeys') ->with('testUser'); $this->userSetupMock->expects($this->once()) -- cgit v1.2.3