Skip to content

Commit 87515a3

Browse files
summersabsummersab
committed
Refactor OC\Server::getEncryptionManager
Signed-off-by: Andrew Summers <[email protected]>
1 parent 9d1547f commit 87515a3

3 files changed

Lines changed: 16 additions & 13 deletions

File tree

‎core/register_command.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
* along with this program. If not, see <http://www.gnu.org/licenses/>
4949
*
5050
*/
51+
52+
use OCP\Encryption\IManager as IEncryptionManager;
5153
use Psr\Log\LoggerInterface;
5254

5355
$application->add(new \Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand());
@@ -121,16 +123,16 @@
121123
}
122124

123125
$application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
124-
$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
125-
$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
126-
$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
127-
$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
128-
$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
126+
$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->get(IEncryptionManager::class)));
127+
$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->get(IEncryptionManager::class), \OC::$server->getConfig()));
128+
$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->get(IEncryptionManager::class), \OC::$server->getConfig()));
129+
$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->get(IEncryptionManager::class)));
130+
$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->get(IEncryptionManager::class), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
129131
$application->add(new OC\Core\Command\Encryption\DecryptAll(
130-
\OC::$server->getEncryptionManager(),
132+
\OC::$server->get(IEncryptionManager::class),
131133
\OC::$server->getAppManager(),
132134
\OC::$server->getConfig(),
133-
new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
135+
new \OC\Encryption\DecryptAll(\OC::$server->get(IEncryptionManager::class), \OC::$server->getUserManager(), new \OC\Files\View()),
134136
new \Symfony\Component\Console\Helper\QuestionHelper())
135137
);
136138

‎lib/private/Encryption/HookManager.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
use OC\Files\Filesystem;
2727
use OC\Files\View;
2828
use OC\Files\SetupManager;
29+
use OCP\Encryption\IManager as IEncryptionManager;
2930
use Psr\Log\LoggerInterface;
3031

3132
class HookManager {
@@ -78,7 +79,7 @@ private static function getUpdate(?string $owner = null): Update {
7879
\OC::$server->getGroupManager(),
7980
\OC::$server->getConfig()),
8081
Filesystem::getMountManager(),
81-
\OC::$server->getEncryptionManager(),
82+
\OC::$server->get(IEncryptionManager::class),
8283
\OC::$server->getEncryptionFilesHelper(),
8384
\OC::$server->get(LoggerInterface::class),
8485
$uid

‎tests/lib/Traits/EncryptionTrait.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use OCA\Encryption\AppInfo\Application;
1515
use OCA\Encryption\KeyManager;
1616
use OCA\Encryption\Users\Setup;
17-
use OCP\Encryption\IManager;
17+
use OCP\Encryption\IManager as IEncryptionManager;
1818
use OCP\IUserManager;
1919
use Psr\Log\LoggerInterface;
2020

@@ -74,23 +74,23 @@ protected function setupForUser($name, $password) {
7474
/** @var Setup $userSetup */
7575
$userSetup = $container->query(Setup::class);
7676
$userSetup->setupUser($name, $password);
77-
$encryptionManager = $container->query(IManager::class);
77+
$encryptionManager = $container->query(IEncryptionManager::class);
7878
$this->encryptionApp->setUp($encryptionManager);
7979
$keyManager->init($name, $password);
8080
}
8181

8282
protected function postLogin() {
8383
$encryptionWrapper = new EncryptionWrapper(
8484
new ArrayCache(),
85-
\OC::$server->getEncryptionManager(),
85+
\OC::$server->get(IEncryptionManager::class),
8686
\OC::$server->get(LoggerInterface::class)
8787
);
8888

8989
$this->registerStorageWrapper('oc_encryption', [$encryptionWrapper, 'wrapStorage']);
9090
}
9191

9292
protected function setUpEncryptionTrait() {
93-
$isReady = \OC::$server->getEncryptionManager()->isReady();
93+
$isReady = \OC::$server->get(IEncryptionManager::class)->isReady();
9494
if (!$isReady) {
9595
$this->markTestSkipped('Encryption not ready');
9696
}
@@ -107,7 +107,7 @@ protected function setUpEncryptionTrait() {
107107
$this->originalEncryptionModule = $this->config->getAppValue('core', 'default_encryption_module');
108108
$this->config->setAppValue('core', 'default_encryption_module', \OCA\Encryption\Crypto\Encryption::ID);
109109
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
110-
$this->assertTrue(\OC::$server->getEncryptionManager()->isEnabled());
110+
$this->assertTrue(\OC::$server->get(IEncryptionManager::class)->isEnabled());
111111
}
112112

113113
protected function tearDownEncryptionTrait() {

0 commit comments

Comments
 (0)