From f5db67530a19a4659ef48688829dfaf80aa8313c Mon Sep 17 00:00:00 2001 From: yemkareems Date: Fri, 18 Oct 2024 14:04:34 +0530 Subject: [PATCH 1/3] fix: add PasswordConfirmationRequired to the eternal storages mentioned in review Signed-off-by: yemkareems --- .../files_external/lib/Controller/GlobalStoragesController.php | 3 +++ apps/files_external/lib/Controller/StoragesController.php | 2 ++ 2 files changed, 5 insertions(+) diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php index cb785695647f4..e2dc9322c4a5e 100644 --- a/apps/files_external/lib/Controller/GlobalStoragesController.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -30,6 +30,7 @@ use OCA\Files_External\NotFoundException; use OCA\Files_External\Service\GlobalStoragesService; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired; use OCP\AppFramework\Http\DataResponse; use OCP\IConfig; use OCP\IGroupManager; @@ -90,6 +91,7 @@ public function __construct( * * @return DataResponse */ + #[PasswordConfirmationRequired] public function create( $mountPoint, $backend, @@ -155,6 +157,7 @@ public function create( * * @return DataResponse */ + #[PasswordConfirmationRequired] public function update( $id, $mountPoint, diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php index 229e2d1930e75..34ff9682ee6e0 100644 --- a/apps/files_external/lib/Controller/StoragesController.php +++ b/apps/files_external/lib/Controller/StoragesController.php @@ -36,6 +36,7 @@ use OCA\Files_External\Service\StoragesService; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired; use OCP\AppFramework\Http\DataResponse; use OCP\Files\StorageNotAvailableException; use OCP\IConfig; @@ -322,6 +323,7 @@ public function show($id, $testOnly = true) { * * @return DataResponse */ + #[PasswordConfirmationRequired] public function destroy($id) { try { $this->service->removeStorage($id); From 1edf405f904c9e3b0ab449cd87e7805332a5330e Mon Sep 17 00:00:00 2001 From: yemkareems Date: Fri, 18 Oct 2024 14:34:39 +0530 Subject: [PATCH 2/3] fix: cs fix namespace Signed-off-by: yemkareems From d8d72ca2523d929bc21db1c7d89c99aa21fd9355 Mon Sep 17 00:00:00 2001 From: yemkareems Date: Tue, 29 Oct 2024 18:02:47 +0530 Subject: [PATCH 3/3] fix: conflicts resolved by adding PasswordConfirmationRequired to update method Signed-off-by: yemkareems --- .../lib/Controller/UserGlobalStoragesController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php index ba15afb2bdfb1..7301997f72bab 100644 --- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php +++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php @@ -35,6 +35,8 @@ use OCA\Files_External\NotFoundException; use OCA\Files_External\Service\UserGlobalStoragesService; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\Attribute\NoAdminRequired; +use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired; use OCP\AppFramework\Http\DataResponse; use OCP\IConfig; use OCP\IGroupManager; @@ -155,9 +157,9 @@ public function show($id, $testOnly = true) { * @param bool $testOnly whether to storage should only test the connection or do more things * * @return DataResponse - * - * @NoAdminRequired */ + #[NoAdminRequired] + #[PasswordConfirmationRequired] public function update( $id, $backendOptions,