aboutsummaryrefslogtreecommitdiffstats
path: root/apps/encryption/lib/Controller
diff options
context:
space:
mode:
Diffstat (limited to 'apps/encryption/lib/Controller')
-rw-r--r--apps/encryption/lib/Controller/RecoveryController.php61
-rw-r--r--apps/encryption/lib/Controller/SettingsController.php91
-rw-r--r--apps/encryption/lib/Controller/StatusController.php57
3 files changed, 50 insertions, 159 deletions
diff --git a/apps/encryption/lib/Controller/RecoveryController.php b/apps/encryption/lib/Controller/RecoveryController.php
index c5f8a7e8d72..d75406e6319 100644
--- a/apps/encryption/lib/Controller/RecoveryController.php
+++ b/apps/encryption/lib/Controller/RecoveryController.php
@@ -1,34 +1,16 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Controller;
use OCA\Encryption\Recovery;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse;
use OCP\IConfig;
use OCP\IL10N;
@@ -36,34 +18,20 @@ use OCP\IRequest;
class RecoveryController extends Controller {
/**
- * @var IConfig
- */
- private $config;
- /**
- * @var IL10N
- */
- private $l;
- /**
- * @var Recovery
- */
- private $recovery;
-
- /**
* @param string $AppName
* @param IRequest $request
* @param IConfig $config
- * @param IL10N $l10n
+ * @param IL10N $l
* @param Recovery $recovery
*/
- public function __construct($AppName,
- IRequest $request,
- IConfig $config,
- IL10N $l10n,
- Recovery $recovery) {
+ public function __construct(
+ $AppName,
+ IRequest $request,
+ private IConfig $config,
+ private IL10N $l,
+ private Recovery $recovery,
+ ) {
parent::__construct($AppName, $request);
- $this->config = $config;
- $this->l = $l10n;
- $this->recovery = $recovery;
}
/**
@@ -155,11 +123,10 @@ class RecoveryController extends Controller {
}
/**
- * @NoAdminRequired
- *
* @param string $userEnableRecovery
* @return DataResponse
*/
+ #[NoAdminRequired]
public function userSetRecovery($userEnableRecovery) {
if ($userEnableRecovery === '0' || $userEnableRecovery === '1') {
$result = $this->recovery->setRecoveryForUser($userEnableRecovery);
diff --git a/apps/encryption/lib/Controller/SettingsController.php b/apps/encryption/lib/Controller/SettingsController.php
index eedbaea9d9d..8548ea51c04 100644
--- a/apps/encryption/lib/Controller/SettingsController.php
+++ b/apps/encryption/lib/Controller/SettingsController.php
@@ -1,25 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Controller;
@@ -29,6 +13,8 @@ use OCA\Encryption\Session;
use OCA\Encryption\Util;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\UseSession;
use OCP\AppFramework\Http\DataResponse;
use OCP\IL10N;
use OCP\IRequest;
@@ -38,34 +24,10 @@ use OCP\IUserSession;
class SettingsController extends Controller {
- /** @var IL10N */
- private $l;
-
- /** @var IUserManager */
- private $userManager;
-
- /** @var IUserSession */
- private $userSession;
-
- /** @var KeyManager */
- private $keyManager;
-
- /** @var Crypt */
- private $crypt;
-
- /** @var Session */
- private $session;
-
- /** @var ISession */
- private $ocSession;
-
- /** @var Util */
- private $util;
-
/**
* @param string $AppName
* @param IRequest $request
- * @param IL10N $l10n
+ * @param IL10N $l
* @param IUserManager $userManager
* @param IUserSession $userSession
* @param KeyManager $keyManager
@@ -74,37 +36,29 @@ class SettingsController extends Controller {
* @param ISession $ocSession
* @param Util $util
*/
- public function __construct($AppName,
- IRequest $request,
- IL10N $l10n,
- IUserManager $userManager,
- IUserSession $userSession,
- KeyManager $keyManager,
- Crypt $crypt,
- Session $session,
- ISession $ocSession,
- Util $util
-) {
+ public function __construct(
+ $AppName,
+ IRequest $request,
+ private IL10N $l,
+ private IUserManager $userManager,
+ private IUserSession $userSession,
+ private KeyManager $keyManager,
+ private Crypt $crypt,
+ private Session $session,
+ private ISession $ocSession,
+ private Util $util,
+ ) {
parent::__construct($AppName, $request);
- $this->l = $l10n;
- $this->userSession = $userSession;
- $this->userManager = $userManager;
- $this->keyManager = $keyManager;
- $this->crypt = $crypt;
- $this->session = $session;
- $this->ocSession = $ocSession;
- $this->util = $util;
}
/**
- * @NoAdminRequired
- * @UseSession
- *
* @param string $oldPassword
* @param string $newPassword
* @return DataResponse
*/
+ #[NoAdminRequired]
+ #[UseSession]
public function updatePrivateKeyPassword($oldPassword, $newPassword) {
$result = false;
$uid = $this->userSession->getUser()->getUID();
@@ -153,11 +107,10 @@ class SettingsController extends Controller {
}
/**
- * @UseSession
- *
* @param bool $encryptHomeStorage
* @return DataResponse
*/
+ #[UseSession]
public function setEncryptHomeStorage($encryptHomeStorage) {
$this->util->setEncryptHomeStorage($encryptHomeStorage);
return new DataResponse();
diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php
index d07b4da794a..341ad6bc49f 100644
--- a/apps/encryption/lib/Controller/StatusController.php
+++ b/apps/encryption/lib/Controller/StatusController.php
@@ -1,33 +1,15 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Controller;
use OCA\Encryption\Session;
use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse;
use OCP\Encryption\IManager;
use OCP\IL10N;
@@ -35,38 +17,27 @@ use OCP\IRequest;
class StatusController extends Controller {
- /** @var IL10N */
- private $l;
-
- /** @var Session */
- private $session;
-
- /** @var IManager */
- private $encryptionManager;
-
/**
* @param string $AppName
* @param IRequest $request
- * @param IL10N $l10n
+ * @param IL10N $l
* @param Session $session
* @param IManager $encryptionManager
*/
- public function __construct($AppName,
- IRequest $request,
- IL10N $l10n,
- Session $session,
- IManager $encryptionManager
- ) {
+ public function __construct(
+ $AppName,
+ IRequest $request,
+ private IL10N $l,
+ private Session $session,
+ private IManager $encryptionManager,
+ ) {
parent::__construct($AppName, $request);
- $this->l = $l10n;
- $this->session = $session;
- $this->encryptionManager = $encryptionManager;
}
/**
- * @NoAdminRequired
* @return DataResponse
*/
+ #[NoAdminRequired]
public function getStatus() {
$status = 'error';
$message = 'no valid init status';
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 15:04:30 +0000