From 5b422c667b8f63daf6e9cb8ee028f70cf5d9489e 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 2630fcc365a..c493b060b13 100644 --- a/apps/files_external/lib/Controller/GlobalStoragesController.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -30,6 +30,7 @@ namespace OCA\Files_External\Controller; 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 @@ class GlobalStoragesController extends StoragesController { * * @return DataResponse */ + #[PasswordConfirmationRequired] public function create( $mountPoint, $backend, @@ -155,6 +157,7 @@ class GlobalStoragesController extends StoragesController { * * @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 c8eda8658ef..b5d5b9027ee 100644 --- a/apps/files_external/lib/Controller/StoragesController.php +++ b/apps/files_external/lib/Controller/StoragesController.php @@ -37,6 +37,7 @@ use OCA\Files_External\NotFoundException; 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; @@ -387,6 +388,7 @@ abstract class StoragesController extends Controller { * * @return DataResponse */ + #[PasswordConfirmationRequired] public function destroy($id) { try { $this->service->removeStorage($id); From b3aa5de9a0aed1e0782afb85e51b42c7a0504f5f Mon Sep 17 00:00:00 2001 From: yemkareems Date: Tue, 29 Oct 2024 17:42:08 +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 74424bce006..35dbaec41ad 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\Lib\StorageConfig; 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; @@ -154,9 +156,9 @@ class UserGlobalStoragesController extends StoragesController { * @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,