migrate deprecated annotations, DI aliases, and exceptions

lib/AppInfo/Application.php

@@ -24,7 +24,6 @@
 namespace OCA\Passman\AppInfo;
 
 use OC\Files\View;
-use OC\ServerContainer;
 use OCA\Passman\Controller\ShareController;
 use OCA\Passman\Middleware\APIMiddleware;
 use OCA\Passman\Middleware\ShareMiddleware;
@@ -43,6 +42,7 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\IRequest;
 use OCP\IUserManager;
 use OCP\IUserSession;
 use OCP\Notification\IManager;
@@ -83,7 +83,7 @@ public function register(IRegistrationContext $context): void {
 
 			return new ShareController(
 				$c->get('AppName'),
-				$c->get('Request'),
+				$c->get(IRequest::class),
 				$userSession->getUser(),
 				$userManager,
 				$c->get(ActivityService::class),
@@ -105,12 +105,12 @@ public function register(IRegistrationContext $context): void {
 				$c->get(ActivityService::class)
 			));
 
-		$context->registerService('Logger', fn(ContainerInterface $c) => $c->get(ServerContainer::class)->getLogger());
+		$context->registerService('Logger', fn(ContainerInterface $c) => $c->get(LoggerInterface::class));
 	}
 
 	public function boot(IBootContext $context): void {
 		/** @var IManager $manager */
-		$manager = $context->getAppContainer()->query(IManager::class);
+		$manager = $context->getAppContainer()->get(IManager::class);
 		$manager->registerNotifierService(Notifier::class);
 
 		Util::addTranslations(self::APP_ID);

lib/Controller/AdminController.php

@@ -21,6 +21,7 @@
 use OCA\Passman\Service\VaultService;
 use OCA\Passman\Utility\Utils;
 use OCP\AppFramework\ApiController;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IL10N;
 use OCP\IRequest;
@@ -143,9 +144,7 @@ public function acceptRequestDeletion($vault_guid, $requested_by){
 		return new JSONResponse(['result' => true]);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 */
+	#[NoAdminRequired]
 	public function requestDeletion($vault_guid, $reason) {
 		$req = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid);
 		if($req){
@@ -165,9 +164,7 @@ public function requestDeletion($vault_guid, $reason) {
 		return new JSONResponse(['result' => $result]);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 */
+	#[NoAdminRequired]
 	public function deleteRequestDeletion($vault_guid) {
 		$delete_request = false;
 		$result = false;

lib/Controller/CredentialController.php

@@ -22,6 +22,8 @@
 use OCA\Passman\Utility\NotFoundJSONResponse;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;
@@ -47,10 +49,8 @@ public function __construct(
 	}
 
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function createCredential($changed, $created,
 	                                 $credential_id, $custom_fields, $delete_time,
 	                                 $description, $email, $expire_time, $favicon, $files, $guid,
@@ -94,19 +94,15 @@ public function createCredential($changed, $created,
 		return new JSONResponse($this->credentialService->getCredentialByGUID($credential->getGuid()));
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function getCredential($credential_guid) {
 		$credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId);
 		return new JSONResponse($credential);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function updateCredential($changed, $created,
 	                                 $credential_id, $custom_fields, $delete_time, $credential_guid,
 	                                 $description, $email, $expire_time, $icon, $files, $guid,
@@ -254,10 +250,8 @@ public function updateCredential($changed, $created,
 		return new JSONResponse($this->credentialService->getCredentialByGUID($credential->getGuid()));
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function deleteCredential($credential_guid) {
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId);
@@ -275,10 +269,10 @@ public function deleteCredential($credential_guid) {
 	}
 
 	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
 	 * @throws \Exception
 	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function getRevision($credential_guid) {
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($credential_guid);
@@ -300,19 +294,15 @@ public function getRevision($credential_guid) {
 		return new JSONResponse($result);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function deleteRevision($credential_id, $revision_id) {
 		$result = $this->credentialRevisionService->deleteRevision($revision_id, $this->userId);
 		return new JSONResponse($result);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function updateRevision($revision_id, $credential_data) {
 		$revision = null;
 		try {

lib/Controller/FileController.php

@@ -13,6 +13,9 @@
 
 use OCA\Passman\Service\FileService;
 use OCP\AppFramework\ApiController;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;
 use Psr\Log\LoggerInterface;
@@ -34,10 +37,8 @@ public function __construct(
 	}
 
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function uploadFile($data, $filename, $mimetype, $size) {
 		$file = [
 			'filename' => $filename,
@@ -49,26 +50,20 @@ public function uploadFile($data, $filename, $mimetype, $size) {
 		return new JSONResponse($this->fileService->createFile($file, $this->userId));
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function getFile($file_id) {
 		return new JSONResponse($this->fileService->getFile($file_id, $this->userId));
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function deleteFile($file_id) {
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function deleteFiles(string $file_ids) {
 		$failed_file_ids = [];
 		if (!empty($file_ids)) {
@@ -87,10 +82,8 @@ public function deleteFiles(string $file_ids) {
 		return new JSONResponse(['ok' => empty($failed_file_ids), 'failed' => $failed_file_ids]);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function updateFile($file_id, $file_data, $filename) {
 		try {
 			$file = $this->fileService->getFile($file_id, $this->userId);
@@ -105,8 +98,9 @@ public function updateFile($file_id, $file_data, $filename) {
 				$file->setFilename($filename);
 			}
 			if ($filename || $file_data) {
-				new JSONResponse($this->fileService->updateFile($file));
+				return new JSONResponse($this->fileService->updateFile($file));
 			}
 		}
+		return new JSONResponse(['failed' => $file_id], Http::STATUS_NOT_FOUND);
 	}
 }

lib/Controller/IconController.php

@@ -12,13 +12,15 @@
 namespace OCA\Passman\Controller;
 
 use Doctrine\DBAL\Exception\DriverException;
-use OC\App\AppManager;
 use OCA\Passman\AppInfo\Application;
 use OCA\Passman\Service\CredentialService;
 use OCA\Passman\Service\IconService;
 use OCA\Passman\Utility\Utils;
+use OCP\App\IAppManager;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\DataDownloadResponse;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;
@@ -32,7 +34,7 @@ public function __construct(
 		IRequest $request,
 		private $userId,
 		private readonly CredentialService $credentialService,
-		private readonly AppManager $am,
+		private readonly IAppManager $am,
 		private readonly IURLGenerator $urlGenerator,
 	) {
 		parent::__construct(
@@ -43,10 +45,8 @@ public function __construct(
 			86400);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function getSingleIcon($base64Url) {
 		$url = base64_decode(str_replace('_', '/', $base64Url));
 		if (!preg_match("~^(?:f|ht)tps?://~i", $url)) {
@@ -65,10 +65,8 @@ public function getSingleIcon($base64Url) {
 		return new JSONResponse();
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function getIcon($base64Url, $credentialId) {
 		$url = base64_decode(str_replace('_', '/', $base64Url));
 
@@ -132,10 +130,8 @@ public function getIcon($base64Url, $credentialId) {
 		return $response;
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function getLocalIconList() {
 		$dir = $this->am->getAppPath(Application::APP_ID);
 		$result = Utils::getDirContents($dir . '/img/icons');

lib/Controller/InternalController.php

@@ -17,6 +17,8 @@
 use OCP\App\IAppManager;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IAppConfig;
 use OCP\IConfig;
@@ -41,9 +43,7 @@ public function __construct(
 			86400);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 */
+	#[NoAdminRequired]
 	public function remind($credential_id) {
 		$credential = $this->credentialService->getCredentialById($credential_id, $this->userId);
 		if ($credential) {
@@ -54,9 +54,7 @@ public function remind($credential_id) {
 		}
 	}
 
-	/**
-	 * @NoAdminRequired
-	 */
+	#[NoAdminRequired]
 	public function read($credential_id) {
 		try {
 			// need to check overall credential existence before, since getCredentialById() method call below throws a
@@ -78,28 +76,22 @@ public function read($credential_id) {
 		}
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function getAppVersion() {
 		return new JSONResponse(['version' => $this->appManager->getAppInfo(Application::APP_ID)["version"]]);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 */
+	#[NoAdminRequired]
 	public function generatePerson() {
 		$context = ['http' => ['method' => 'GET'], 'ssl' => ['verify_peer' => false, 'allow_self_signed' => true]];
 		$context = stream_context_create($context);
 		$random_person = json_decode(file_get_contents('http://api.namefake.com/', false, $context));
 		return new JSONResponse($random_person);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function getSettings() {
 		$settings = [
 			'link_sharing_enabled' => intval($this->appConfig->getValue(Application::APP_ID, 'link_sharing_enabled', 1)),
@@ -112,9 +104,7 @@ public function getSettings() {
 		return new JSONResponse($settings);
 	}
 
-	/**
-	 * @NoCSRFRequired
-	 */
+	#[NoCSRFRequired]
 	public function saveSettings($key, $value) {
 		if (is_numeric($value)) {
 			$value = intval($value);