nextcloud / server

apps/encryption/lib/Settings/Personal.php

Indentation +48 added lines, -48 removed lines

@@ -18,60 +18,60 @@
 
 class Personal implements ISettings {
 
-	public function __construct(
-		private Session $session,
-		private Util $util,
-		private IUserSession $userSession,
-		private IInitialState $initialState,
-		private IAppConfig $appConfig,
-		private IManager $manager,
-	) {
-	}
+    public function __construct(
+        private Session $session,
+        private Util $util,
+        private IUserSession $userSession,
+        private IInitialState $initialState,
+        private IAppConfig $appConfig,
+        private IManager $manager,
+    ) {
+    }
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$recoveryAdminEnabled = $this->appConfig->getValueBool('encryption', 'recoveryAdminEnabled');
-		$privateKeySet = $this->session->isPrivateKeySet();
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $recoveryAdminEnabled = $this->appConfig->getValueBool('encryption', 'recoveryAdminEnabled');
+        $privateKeySet = $this->session->isPrivateKeySet();
 
-		if (!$recoveryAdminEnabled && $privateKeySet) {
-			return new TemplateResponse('settings', 'settings/empty', [], '');
-		}
+        if (!$recoveryAdminEnabled && $privateKeySet) {
+            return new TemplateResponse('settings', 'settings/empty', [], '');
+        }
 
-		$userId = $this->userSession->getUser()->getUID();
-		$recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId);
+        $userId = $this->userSession->getUser()->getUID();
+        $recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId);
 
-		$this->initialState->provideInitialState('personalSettings', [
-			'recoveryEnabled' => $recoveryAdminEnabled,
-			'recoveryEnabledForUser' => $recoveryEnabledForUser,
-			'privateKeySet' => $privateKeySet,
-			'initialized' => $this->session->getStatus(),
-		]);
+        $this->initialState->provideInitialState('personalSettings', [
+            'recoveryEnabled' => $recoveryAdminEnabled,
+            'recoveryEnabledForUser' => $recoveryEnabledForUser,
+            'privateKeySet' => $privateKeySet,
+            'initialized' => $this->session->getStatus(),
+        ]);
 
-		\OCP\Util::addStyle(Application::APP_ID, 'settings_personal');
-		\OCP\Util::addScript(Application::APP_ID, 'settings_personal');
-		return new TemplateResponse(Application::APP_ID, 'settings', renderAs: '');
-	}
+        \OCP\Util::addStyle(Application::APP_ID, 'settings_personal');
+        \OCP\Util::addScript(Application::APP_ID, 'settings_personal');
+        return new TemplateResponse(Application::APP_ID, 'settings', renderAs: '');
+    }
 
-	public function getSection() {
-		if (!$this->manager->isEnabled()) {
-			return null;
-		}
+    public function getSection() {
+        if (!$this->manager->isEnabled()) {
+            return null;
+        }
 
-		return 'security';
-	}
+        return 'security';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 *             the admin section. The forms are arranged in ascending order of the
-	 *             priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 80;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 80;
+    }
 }

apps/encryption/lib/Settings/Admin.php

Indentation +56 added lines, -56 removed lines

@@ -23,68 +23,68 @@
 use Psr\Log\LoggerInterface;
 
 class Admin implements ISettings {
-	public function __construct(
-		private IL10N $l,
-		private LoggerInterface $logger,
-		private IUserSession $userSession,
-		private IConfig $config,
-		private IUserManager $userManager,
-		private ISession $session,
-		private IInitialState $initialState,
-		private IAppConfig $appConfig,
-	) {
-	}
+    public function __construct(
+        private IL10N $l,
+        private LoggerInterface $logger,
+        private IUserSession $userSession,
+        private IConfig $config,
+        private IUserManager $userManager,
+        private ISession $session,
+        private IInitialState $initialState,
+        private IAppConfig $appConfig,
+    ) {
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$crypt = new Crypt(
-			$this->logger,
-			$this->userSession,
-			$this->config,
-			$this->l);
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $crypt = new Crypt(
+            $this->logger,
+            $this->userSession,
+            $this->config,
+            $this->l);
 
-		$util = new Util(
-			new View(),
-			$crypt,
-			$this->userSession,
-			$this->config,
-			$this->userManager);
+        $util = new Util(
+            new View(),
+            $crypt,
+            $this->userSession,
+            $this->config,
+            $this->userManager);
 
-		// Check if an adminRecovery account is enabled for recovering files after lost pwd
-		$recoveryAdminEnabled = $this->appConfig->getValueBool('encryption', 'recoveryAdminEnabled');
-		$session = new Session($this->session);
+        // Check if an adminRecovery account is enabled for recovering files after lost pwd
+        $recoveryAdminEnabled = $this->appConfig->getValueBool('encryption', 'recoveryAdminEnabled');
+        $session = new Session($this->session);
 
-		$encryptHomeStorage = $util->shouldEncryptHomeStorage();
+        $encryptHomeStorage = $util->shouldEncryptHomeStorage();
 
-		$this->initialState->provideInitialState('adminSettings', [
-			'recoveryEnabled' => $recoveryAdminEnabled,
-			'initStatus' => $session->getStatus(),
-			'encryptHomeStorage' => $encryptHomeStorage,
-			'masterKeyEnabled' => $util->isMasterKeyEnabled(),
-		]);
+        $this->initialState->provideInitialState('adminSettings', [
+            'recoveryEnabled' => $recoveryAdminEnabled,
+            'initStatus' => $session->getStatus(),
+            'encryptHomeStorage' => $encryptHomeStorage,
+            'masterKeyEnabled' => $util->isMasterKeyEnabled(),
+        ]);
 
-		\OCP\Util::addStyle(Application::APP_ID, 'settings_admin');
-		\OCP\Util::addScript(Application::APP_ID, 'settings_admin');
-		return new TemplateResponse(Application::APP_ID, 'settings', renderAs: '');
-	}
+        \OCP\Util::addStyle(Application::APP_ID, 'settings_admin');
+        \OCP\Util::addScript(Application::APP_ID, 'settings_admin');
+        return new TemplateResponse(Application::APP_ID, 'settings', renderAs: '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'security';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'security';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 *             the admin section. The forms are arranged in ascending order of the
-	 *             priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 11;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 11;
+    }
 }

apps/encryption/lib/Controller/StatusController.php

Indentation +56 added lines, -56 removed lines

@@ -17,62 +17,62 @@
 
 class StatusController extends Controller {
 
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IL10N $l
-	 * @param Session $session
-	 * @param IManager $encryptionManager
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		private IL10N $l,
-		private Session $session,
-		private IManager $encryptionManager,
-	) {
-		parent::__construct($appName, $request);
-	}
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IL10N $l
+     * @param Session $session
+     * @param IManager $encryptionManager
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        private IL10N $l,
+        private Session $session,
+        private IManager $encryptionManager,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * @return DataResponse
-	 */
-	#[NoAdminRequired]
-	public function getStatus() {
-		$status = 'error';
-		$message = 'no valid init status';
-		switch ($this->session->getStatus()) {
-			case Session::INIT_EXECUTED:
-				$status = 'interactionNeeded';
-				$message = $this->l->t(
-					'Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.'
-				);
-				break;
-			case Session::NOT_INITIALIZED:
-				$status = 'interactionNeeded';
-				if ($this->encryptionManager->isEnabled()) {
-					$message = $this->l->t(
-						'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
-					);
-				} else {
-					$message = $this->l->t(
-						'Please enable server side encryption in the admin settings in order to use the encryption module.'
-					);
-				}
-				break;
-			case Session::INIT_SUCCESSFUL:
-				$status = 'success';
-				$message = $this->l->t('Encryption app is enabled and ready');
-		}
+    /**
+     * @return DataResponse
+     */
+    #[NoAdminRequired]
+    public function getStatus() {
+        $status = 'error';
+        $message = 'no valid init status';
+        switch ($this->session->getStatus()) {
+            case Session::INIT_EXECUTED:
+                $status = 'interactionNeeded';
+                $message = $this->l->t(
+                    'Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.'
+                );
+                break;
+            case Session::NOT_INITIALIZED:
+                $status = 'interactionNeeded';
+                if ($this->encryptionManager->isEnabled()) {
+                    $message = $this->l->t(
+                        'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
+                    );
+                } else {
+                    $message = $this->l->t(
+                        'Please enable server side encryption in the admin settings in order to use the encryption module.'
+                    );
+                }
+                break;
+            case Session::INIT_SUCCESSFUL:
+                $status = 'success';
+                $message = $this->l->t('Encryption app is enabled and ready');
+        }
 
-		return new DataResponse(
-			[
-				'status' => $status,
-				'initStatus' => $this->session->getStatus(),
-				'data' => [
-					'message' => $message,
-				],
-			]
-		);
-	}
+        return new DataResponse(
+            [
+                'status' => $status,
+                'initStatus' => $this->session->getStatus(),
+                'data' => [
+                    'message' => $message,
+                ],
+            ]
+        );
+    }
 }

apps/encryption/lib/Controller/RecoveryController.php

Indentation +120 added lines, -120 removed lines

@@ -18,136 +18,136 @@
 use Psr\Log\LoggerInterface;
 
 class RecoveryController extends Controller {
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private IL10N $l,
-		private Recovery $recovery,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private IL10N $l,
+        private Recovery $recovery,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	public function adminRecovery(string $recoveryPassword, string $confirmPassword, bool $adminEnableRecovery): DataResponse {
-		// Check if both passwords are the same
-		if (empty($recoveryPassword)) {
-			$errorMessage = $this->l->t('Missing recovery key password');
-			return new DataResponse(['data' => ['message' => $errorMessage]],
-				Http::STATUS_BAD_REQUEST);
-		}
+    public function adminRecovery(string $recoveryPassword, string $confirmPassword, bool $adminEnableRecovery): DataResponse {
+        // Check if both passwords are the same
+        if (empty($recoveryPassword)) {
+            $errorMessage = $this->l->t('Missing recovery key password');
+            return new DataResponse(['data' => ['message' => $errorMessage]],
+                Http::STATUS_BAD_REQUEST);
+        }
 
-		if (empty($confirmPassword)) {
-			$errorMessage = $this->l->t('Please repeat the recovery key password');
-			return new DataResponse(['data' => ['message' => $errorMessage]],
-				Http::STATUS_BAD_REQUEST);
-		}
+        if (empty($confirmPassword)) {
+            $errorMessage = $this->l->t('Please repeat the recovery key password');
+            return new DataResponse(['data' => ['message' => $errorMessage]],
+                Http::STATUS_BAD_REQUEST);
+        }
 
-		if ($recoveryPassword !== $confirmPassword) {
-			$errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password');
-			return new DataResponse(['data' => ['message' => $errorMessage]],
-				Http::STATUS_BAD_REQUEST);
-		}
+        if ($recoveryPassword !== $confirmPassword) {
+            $errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password');
+            return new DataResponse(['data' => ['message' => $errorMessage]],
+                Http::STATUS_BAD_REQUEST);
+        }
 
-		try {
-			if ($adminEnableRecovery) {
-				if ($this->recovery->enableAdminRecovery($recoveryPassword)) {
-					return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully enabled')]]);
-				}
-				return new DataResponse(['data' => ['message' => $this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
-			} else {
-				if ($this->recovery->disableAdminRecovery($recoveryPassword)) {
-					return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully disabled')]]);
-				}
-				return new DataResponse(['data' => ['message' => $this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
-			}
-		} catch (\Exception $e) {
-			$this->logger->error('Error enabling or disabling recovery key', ['exception' => $e]);
-			if ($e instanceof GenericEncryptionException) {
-				return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
-			}
-			return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-	}
+        try {
+            if ($adminEnableRecovery) {
+                if ($this->recovery->enableAdminRecovery($recoveryPassword)) {
+                    return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully enabled')]]);
+                }
+                return new DataResponse(['data' => ['message' => $this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
+            } else {
+                if ($this->recovery->disableAdminRecovery($recoveryPassword)) {
+                    return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully disabled')]]);
+                }
+                return new DataResponse(['data' => ['message' => $this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
+            }
+        } catch (\Exception $e) {
+            $this->logger->error('Error enabling or disabling recovery key', ['exception' => $e]);
+            if ($e instanceof GenericEncryptionException) {
+                return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
+            }
+            return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+    }
 
-	public function changeRecoveryPassword(string $newPassword, string $oldPassword, string $confirmPassword): DataResponse {
-		//check if both passwords are the same
-		if (empty($oldPassword)) {
-			$errorMessage = $this->l->t('Please provide the old recovery password');
-			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
-		}
+    public function changeRecoveryPassword(string $newPassword, string $oldPassword, string $confirmPassword): DataResponse {
+        //check if both passwords are the same
+        if (empty($oldPassword)) {
+            $errorMessage = $this->l->t('Please provide the old recovery password');
+            return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
+        }
 
-		if (empty($newPassword)) {
-			$errorMessage = $this->l->t('Please provide a new recovery password');
-			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
-		}
+        if (empty($newPassword)) {
+            $errorMessage = $this->l->t('Please provide a new recovery password');
+            return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
+        }
 
-		if (empty($confirmPassword)) {
-			$errorMessage = $this->l->t('Please repeat the new recovery password');
-			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
-		}
+        if (empty($confirmPassword)) {
+            $errorMessage = $this->l->t('Please repeat the new recovery password');
+            return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
+        }
 
-		if ($newPassword !== $confirmPassword) {
-			$errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password');
-			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
-		}
+        if ($newPassword !== $confirmPassword) {
+            $errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password');
+            return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
+        }
 
-		try {
-			$result = $this->recovery->changeRecoveryKeyPassword($newPassword,
-				$oldPassword);
+        try {
+            $result = $this->recovery->changeRecoveryKeyPassword($newPassword,
+                $oldPassword);
 
-			if ($result) {
-				return new DataResponse(
-					[
-						'data' => [
-							'message' => $this->l->t('Password successfully changed.')]
-					]
-				);
-			}
-			return new DataResponse([
-				'data' => [
-					'message' => $this->l->t('Could not change the password. Maybe the old password was not correct.')
-				]
-			], Http::STATUS_BAD_REQUEST);
-		} catch (\Exception $e) {
-			$this->logger->error('Error changing recovery password', ['exception' => $e]);
-			if ($e instanceof GenericEncryptionException) {
-				return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
-			}
-			return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-	}
+            if ($result) {
+                return new DataResponse(
+                    [
+                        'data' => [
+                            'message' => $this->l->t('Password successfully changed.')]
+                    ]
+                );
+            }
+            return new DataResponse([
+                'data' => [
+                    'message' => $this->l->t('Could not change the password. Maybe the old password was not correct.')
+                ]
+            ], Http::STATUS_BAD_REQUEST);
+        } catch (\Exception $e) {
+            $this->logger->error('Error changing recovery password', ['exception' => $e]);
+            if ($e instanceof GenericEncryptionException) {
+                return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
+            }
+            return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+    }
 
-	/**
-	 * @param string $userEnableRecovery
-	 * @return DataResponse
-	 */
-	#[NoAdminRequired]
-	public function userSetRecovery($userEnableRecovery) {
-		if ($userEnableRecovery === '0' || $userEnableRecovery === '1') {
-			$result = $this->recovery->setRecoveryForUser($userEnableRecovery);
+    /**
+     * @param string $userEnableRecovery
+     * @return DataResponse
+     */
+    #[NoAdminRequired]
+    public function userSetRecovery($userEnableRecovery) {
+        if ($userEnableRecovery === '0' || $userEnableRecovery === '1') {
+            $result = $this->recovery->setRecoveryForUser($userEnableRecovery);
 
-			if ($result) {
-				if ($userEnableRecovery === '0') {
-					return new DataResponse(
-						[
-							'data' => [
-								'message' => $this->l->t('Recovery Key disabled')]
-						]
-					);
-				}
-				return new DataResponse(
-					[
-						'data' => [
-							'message' => $this->l->t('Recovery Key enabled')]
-					]
-				);
-			}
-		}
-		return new DataResponse(
-			[
-				'data' => [
-					'message' => $this->l->t('Could not enable the recovery key, please try again or contact your administrator')
-				]
-			], Http::STATUS_BAD_REQUEST);
-	}
+            if ($result) {
+                if ($userEnableRecovery === '0') {
+                    return new DataResponse(
+                        [
+                            'data' => [
+                                'message' => $this->l->t('Recovery Key disabled')]
+                        ]
+                    );
+                }
+                return new DataResponse(
+                    [
+                        'data' => [
+                            'message' => $this->l->t('Recovery Key enabled')]
+                    ]
+                );
+            }
+        }
+        return new DataResponse(
+            [
+                'data' => [
+                    'message' => $this->l->t('Could not enable the recovery key, please try again or contact your administrator')
+                ]
+            ], Http::STATUS_BAD_REQUEST);
+    }
 }

apps/encryption/tests/Settings/AdminTest.php

Indentation +65 added lines, -65 removed lines

@@ -23,77 +23,77 @@
 
 class AdminTest extends TestCase {
 
-	protected Admin $admin;
+    protected Admin $admin;
 
-	protected IL10N&MockObject $l;
-	protected LoggerInterface&MockObject $logger;
-	protected IUserSession&MockObject $userSession;
-	protected IConfig&MockObject $config;
-	protected IUserManager&MockObject $userManager;
-	protected ISession&MockObject $session;
-	protected IInitialState&MockObject $initialState;
-	protected IAppConfig&MockObject $appConfig;
+    protected IL10N&MockObject $l;
+    protected LoggerInterface&MockObject $logger;
+    protected IUserSession&MockObject $userSession;
+    protected IConfig&MockObject $config;
+    protected IUserManager&MockObject $userManager;
+    protected ISession&MockObject $session;
+    protected IInitialState&MockObject $initialState;
+    protected IAppConfig&MockObject $appConfig;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->l = $this->createMock(IL10N::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->session = $this->createMock(ISession::class);
-		$this->initialState = $this->createMock(IInitialState::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
+        $this->l = $this->createMock(IL10N::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->session = $this->createMock(ISession::class);
+        $this->initialState = $this->createMock(IInitialState::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
 
-		$this->admin = new Admin(
-			$this->l,
-			$this->logger,
-			$this->userSession,
-			$this->config,
-			$this->userManager,
-			$this->session,
-			$this->initialState,
-			$this->appConfig,
-		);
-	}
+        $this->admin = new Admin(
+            $this->l,
+            $this->logger,
+            $this->userSession,
+            $this->config,
+            $this->userManager,
+            $this->session,
+            $this->initialState,
+            $this->appConfig,
+        );
+    }
 
-	public function testGetForm(): void {
-		$this->appConfig
-			->method('getValueBool')
-			->willReturnMap([
-				['encryption', 'recoveryAdminEnabled', true]
-			]);
-		$this->config
-			->method('getAppValue')
-			->willReturnCallback(function ($app, $key, $default) {
-				if ($app === 'encryption' && $key === 'recoveryAdminEnabled' && $default === '0') {
-					return '1';
-				}
-				if ($app === 'encryption' && $key === 'encryptHomeStorage' && $default === '1') {
-					return '1';
-				}
-				return $default;
-			});
+    public function testGetForm(): void {
+        $this->appConfig
+            ->method('getValueBool')
+            ->willReturnMap([
+                ['encryption', 'recoveryAdminEnabled', true]
+            ]);
+        $this->config
+            ->method('getAppValue')
+            ->willReturnCallback(function ($app, $key, $default) {
+                if ($app === 'encryption' && $key === 'recoveryAdminEnabled' && $default === '0') {
+                    return '1';
+                }
+                if ($app === 'encryption' && $key === 'encryptHomeStorage' && $default === '1') {
+                    return '1';
+                }
+                return $default;
+            });
 
-		$this->initialState
-			->expects(self::once())
-			->method('provideInitialState')
-			->with('adminSettings', [
-				'recoveryEnabled' => true,
-				'initStatus' => '0',
-				'encryptHomeStorage' => true,
-				'masterKeyEnabled' => true
-			]);
-		$expected = new TemplateResponse('encryption', 'settings', renderAs: '');
-		$this->assertEquals($expected, $this->admin->getForm());
-	}
+        $this->initialState
+            ->expects(self::once())
+            ->method('provideInitialState')
+            ->with('adminSettings', [
+                'recoveryEnabled' => true,
+                'initStatus' => '0',
+                'encryptHomeStorage' => true,
+                'masterKeyEnabled' => true
+            ]);
+        $expected = new TemplateResponse('encryption', 'settings', renderAs: '');
+        $this->assertEquals($expected, $this->admin->getForm());
+    }
 
-	public function testGetSection(): void {
-		$this->assertSame('security', $this->admin->getSection());
-	}
+    public function testGetSection(): void {
+        $this->assertSame('security', $this->admin->getSection());
+    }
 
-	public function testGetPriority(): void {
-		$this->assertSame(11, $this->admin->getPriority());
-	}
+    public function testGetPriority(): void {
+        $this->assertSame(11, $this->admin->getPriority());
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 			]);
 		$this->config
 			->method('getAppValue')
-			->willReturnCallback(function ($app, $key, $default) {
+			->willReturnCallback(function($app, $key, $default) {
 				if ($app === 'encryption' && $key === 'recoveryAdminEnabled' && $default === '0') {
 					return '1';
 				}

apps/encryption/tests/Controller/RecoveryControllerTest.php

Indentation +139 added lines, -139 removed lines

@@ -20,143 +20,143 @@
 use Test\TestCase;
 
 class RecoveryControllerTest extends TestCase {
-	protected RecoveryController $controller;
-
-	protected IRequest&MockObject $requestMock;
-	protected IConfig&MockObject $configMock;
-	protected IL10N&MockObject $l10nMock;
-	protected Recovery&MockObject $recoveryMock;
-
-	public static function adminRecoveryProvider(): array {
-		return [
-			['test', 'test', true, 'Recovery key successfully enabled', Http::STATUS_OK],
-			['', 'test', true, 'Missing recovery key password', Http::STATUS_BAD_REQUEST],
-			['test', '', true, 'Please repeat the recovery key password', Http::STATUS_BAD_REQUEST],
-			['test', 'something that doesn\'t match', true, 'Repeated recovery key password does not match the provided recovery key password', Http::STATUS_BAD_REQUEST],
-			['test', 'test', false, 'Recovery key successfully disabled', Http::STATUS_OK],
-		];
-	}
-
-	/**
-	 * @param $recoveryPassword
-	 * @param $passConfirm
-	 * @param $enableRecovery
-	 * @param $expectedMessage
-	 * @param $expectedStatus
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('adminRecoveryProvider')]
-	public function testAdminRecovery($recoveryPassword, $passConfirm, $enableRecovery, $expectedMessage, $expectedStatus): void {
-		$this->recoveryMock->expects($this->any())
-			->method('enableAdminRecovery')
-			->willReturn(true);
-
-		$this->recoveryMock->expects($this->any())
-			->method('disableAdminRecovery')
-			->willReturn(true);
-
-		$response = $this->controller->adminRecovery($recoveryPassword,
-			$passConfirm,
-			$enableRecovery);
-
-
-		$this->assertEquals($expectedMessage, $response->getData()['data']['message']);
-		$this->assertEquals($expectedStatus, $response->getStatus());
-	}
-
-	public static function changeRecoveryPasswordProvider(): array {
-		return [
-			['test', 'test', 'oldtestFail', 'Could not change the password. Maybe the old password was not correct.', Http::STATUS_BAD_REQUEST],
-			['test', 'test', 'oldtest', 'Password successfully changed.', Http::STATUS_OK],
-			['test', 'notmatch', 'oldtest', 'Repeated recovery key password does not match the provided recovery key password', Http::STATUS_BAD_REQUEST],
-			['', 'test', 'oldtest', 'Please provide a new recovery password', Http::STATUS_BAD_REQUEST],
-			['test', 'test', '', 'Please provide the old recovery password', Http::STATUS_BAD_REQUEST]
-		];
-	}
-
-	/**
-	 * @param $password
-	 * @param $confirmPassword
-	 * @param $oldPassword
-	 * @param $expectedMessage
-	 * @param $expectedStatus
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('changeRecoveryPasswordProvider')]
-	public function testChangeRecoveryPassword($password, $confirmPassword, $oldPassword, $expectedMessage, $expectedStatus): void {
-		$this->recoveryMock->expects($this->any())
-			->method('changeRecoveryKeyPassword')
-			->with($password, $oldPassword)
-			->willReturnMap([
-				['test', 'oldtestFail', false],
-				['test', 'oldtest', true]
-			]);
-
-		$response = $this->controller->changeRecoveryPassword($password,
-			$oldPassword,
-			$confirmPassword);
-
-		$this->assertEquals($expectedMessage, $response->getData()['data']['message']);
-		$this->assertEquals($expectedStatus, $response->getStatus());
-	}
-
-	public static function userSetRecoveryProvider(): array {
-		return [
-			['1', 'Recovery Key enabled', Http::STATUS_OK],
-			['0', 'Could not enable the recovery key, please try again or contact your administrator', Http::STATUS_BAD_REQUEST]
-		];
-	}
-
-	/**
-	 * @param $enableRecovery
-	 * @param $expectedMessage
-	 * @param $expectedStatus
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('userSetRecoveryProvider')]
-	public function testUserSetRecovery($enableRecovery, $expectedMessage, $expectedStatus): void {
-		$this->recoveryMock->expects($this->any())
-			->method('setRecoveryForUser')
-			->with($enableRecovery)
-			->willReturnMap([
-				['1', true],
-				['0', false]
-			]);
-
-
-		$response = $this->controller->userSetRecovery($enableRecovery);
-
-		$this->assertEquals($expectedMessage, $response->getData()['data']['message']);
-		$this->assertEquals($expectedStatus, $response->getStatus());
-	}
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->requestMock = $this->getMockBuilder(IRequest::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->configMock = $this->getMockBuilder(IConfig::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->l10nMock = $this->getMockBuilder(IL10N::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		// Make l10n work in our tests
-		$this->l10nMock->expects($this->any())
-			->method('t')
-			->willReturnArgument(0);
-
-		$this->recoveryMock = $this->getMockBuilder(Recovery::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->controller = new RecoveryController(
-			'encryption',
-			$this->requestMock,
-			$this->l10nMock,
-			$this->recoveryMock,
-			$this->createMock(LoggerInterface::class),
-		);
-	}
+    protected RecoveryController $controller;
+
+    protected IRequest&MockObject $requestMock;
+    protected IConfig&MockObject $configMock;
+    protected IL10N&MockObject $l10nMock;
+    protected Recovery&MockObject $recoveryMock;
+
+    public static function adminRecoveryProvider(): array {
+        return [
+            ['test', 'test', true, 'Recovery key successfully enabled', Http::STATUS_OK],
+            ['', 'test', true, 'Missing recovery key password', Http::STATUS_BAD_REQUEST],
+            ['test', '', true, 'Please repeat the recovery key password', Http::STATUS_BAD_REQUEST],
+            ['test', 'something that doesn\'t match', true, 'Repeated recovery key password does not match the provided recovery key password', Http::STATUS_BAD_REQUEST],
+            ['test', 'test', false, 'Recovery key successfully disabled', Http::STATUS_OK],
+        ];
+    }
+
+    /**
+     * @param $recoveryPassword
+     * @param $passConfirm
+     * @param $enableRecovery
+     * @param $expectedMessage
+     * @param $expectedStatus
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('adminRecoveryProvider')]
+    public function testAdminRecovery($recoveryPassword, $passConfirm, $enableRecovery, $expectedMessage, $expectedStatus): void {
+        $this->recoveryMock->expects($this->any())
+            ->method('enableAdminRecovery')
+            ->willReturn(true);
+
+        $this->recoveryMock->expects($this->any())
+            ->method('disableAdminRecovery')
+            ->willReturn(true);
+
+        $response = $this->controller->adminRecovery($recoveryPassword,
+            $passConfirm,
+            $enableRecovery);
+
+
+        $this->assertEquals($expectedMessage, $response->getData()['data']['message']);
+        $this->assertEquals($expectedStatus, $response->getStatus());
+    }
+
+    public static function changeRecoveryPasswordProvider(): array {
+        return [
+            ['test', 'test', 'oldtestFail', 'Could not change the password. Maybe the old password was not correct.', Http::STATUS_BAD_REQUEST],
+            ['test', 'test', 'oldtest', 'Password successfully changed.', Http::STATUS_OK],
+            ['test', 'notmatch', 'oldtest', 'Repeated recovery key password does not match the provided recovery key password', Http::STATUS_BAD_REQUEST],
+            ['', 'test', 'oldtest', 'Please provide a new recovery password', Http::STATUS_BAD_REQUEST],
+            ['test', 'test', '', 'Please provide the old recovery password', Http::STATUS_BAD_REQUEST]
+        ];
+    }
+
+    /**
+     * @param $password
+     * @param $confirmPassword
+     * @param $oldPassword
+     * @param $expectedMessage
+     * @param $expectedStatus
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('changeRecoveryPasswordProvider')]
+    public function testChangeRecoveryPassword($password, $confirmPassword, $oldPassword, $expectedMessage, $expectedStatus): void {
+        $this->recoveryMock->expects($this->any())
+            ->method('changeRecoveryKeyPassword')
+            ->with($password, $oldPassword)
+            ->willReturnMap([
+                ['test', 'oldtestFail', false],
+                ['test', 'oldtest', true]
+            ]);
+
+        $response = $this->controller->changeRecoveryPassword($password,
+            $oldPassword,
+            $confirmPassword);
+
+        $this->assertEquals($expectedMessage, $response->getData()['data']['message']);
+        $this->assertEquals($expectedStatus, $response->getStatus());
+    }
+
+    public static function userSetRecoveryProvider(): array {
+        return [
+            ['1', 'Recovery Key enabled', Http::STATUS_OK],
+            ['0', 'Could not enable the recovery key, please try again or contact your administrator', Http::STATUS_BAD_REQUEST]
+        ];
+    }
+
+    /**
+     * @param $enableRecovery
+     * @param $expectedMessage
+     * @param $expectedStatus
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('userSetRecoveryProvider')]
+    public function testUserSetRecovery($enableRecovery, $expectedMessage, $expectedStatus): void {
+        $this->recoveryMock->expects($this->any())
+            ->method('setRecoveryForUser')
+            ->with($enableRecovery)
+            ->willReturnMap([
+                ['1', true],
+                ['0', false]
+            ]);
+
+
+        $response = $this->controller->userSetRecovery($enableRecovery);
+
+        $this->assertEquals($expectedMessage, $response->getData()['data']['message']);
+        $this->assertEquals($expectedStatus, $response->getStatus());
+    }
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->requestMock = $this->getMockBuilder(IRequest::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configMock = $this->getMockBuilder(IConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->l10nMock = $this->getMockBuilder(IL10N::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        // Make l10n work in our tests
+        $this->l10nMock->expects($this->any())
+            ->method('t')
+            ->willReturnArgument(0);
+
+        $this->recoveryMock = $this->getMockBuilder(Recovery::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->controller = new RecoveryController(
+            'encryption',
+            $this->requestMock,
+            $this->l10nMock,
+            $this->recoveryMock,
+            $this->createMock(LoggerInterface::class),
+        );
+    }
 }

apps/encryption/tests/Controller/StatusControllerTest.php

Indentation +45 added lines, -45 removed lines

@@ -19,56 +19,56 @@
 
 class StatusControllerTest extends TestCase {
 
-	protected IRequest&MockObject $requestMock;
-	protected IL10N&MockObject $l10nMock;
-	protected Session&MockObject $sessionMock;
-	protected IManager&MockObject $encryptionManagerMock;
+    protected IRequest&MockObject $requestMock;
+    protected IL10N&MockObject $l10nMock;
+    protected Session&MockObject $sessionMock;
+    protected IManager&MockObject $encryptionManagerMock;
 
-	protected StatusController $controller;
+    protected StatusController $controller;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->sessionMock = $this->getMockBuilder(Session::class)
-			->disableOriginalConstructor()->getMock();
-		$this->requestMock = $this->createMock(IRequest::class);
+        $this->sessionMock = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->requestMock = $this->createMock(IRequest::class);
 
-		$this->l10nMock = $this->getMockBuilder(IL10N::class)
-			->disableOriginalConstructor()->getMock();
-		$this->l10nMock->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($message) {
-				return $message;
-			});
-		$this->encryptionManagerMock = $this->createMock(IManager::class);
+        $this->l10nMock = $this->getMockBuilder(IL10N::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->l10nMock->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($message) {
+                return $message;
+            });
+        $this->encryptionManagerMock = $this->createMock(IManager::class);
 
-		$this->controller = new StatusController('encryptionTest',
-			$this->requestMock,
-			$this->l10nMock,
-			$this->sessionMock,
-			$this->encryptionManagerMock);
-	}
+        $this->controller = new StatusController('encryptionTest',
+            $this->requestMock,
+            $this->l10nMock,
+            $this->sessionMock,
+            $this->encryptionManagerMock);
+    }
 
-	/**
-	 *
-	 * @param string $status
-	 * @param string $expectedStatus
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetStatus')]
-	public function testGetStatus($status, $expectedStatus): void {
-		$this->sessionMock->expects($this->atLeastOnce())
-			->method('getStatus')->willReturn($status);
-		$result = $this->controller->getStatus();
-		$data = $result->getData();
-		$this->assertSame($expectedStatus, $data['status']);
-	}
+    /**
+     *
+     * @param string $status
+     * @param string $expectedStatus
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetStatus')]
+    public function testGetStatus($status, $expectedStatus): void {
+        $this->sessionMock->expects($this->atLeastOnce())
+            ->method('getStatus')->willReturn($status);
+        $result = $this->controller->getStatus();
+        $data = $result->getData();
+        $this->assertSame($expectedStatus, $data['status']);
+    }
 
-	public static function dataTestGetStatus(): array {
-		return [
-			[Session::INIT_EXECUTED, 'interactionNeeded'],
-			[Session::INIT_SUCCESSFUL, 'success'],
-			[Session::NOT_INITIALIZED, 'interactionNeeded'],
-			['unknown', 'error'],
-		];
-	}
+    public static function dataTestGetStatus(): array {
+        return [
+            [Session::INIT_EXECUTED, 'interactionNeeded'],
+            [Session::INIT_SUCCESSFUL, 'success'],
+            [Session::NOT_INITIALIZED, 'interactionNeeded'],
+            ['unknown', 'error'],
+        ];
+    }
 }