From 101cd43b201a524f9c532252711ecc23ba5aa56d Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Mon, 14 Oct 2024 15:12:16 +0200 Subject: [PATCH 1/3] fix: Add frontend code for password confirmation Signed-off-by: Ferdinand Thiessen [skip ci] --- apps/files_external/js/settings.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 78952882f9536..2a08248542e1f 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -271,7 +271,6 @@ StorageConfig.prototype = { * @param {Function} [options.error] error callback */ save: function(options) { - var self = this; var url = OC.generateUrl(this._url); var method = 'POST'; if (_.isNumber(this.id)) { @@ -279,6 +278,18 @@ StorageConfig.prototype = { url = OC.generateUrl(this._url + '/{id}', {id: this.id}); } + window.OC.PasswordConfirmation.requirePasswordConfirmation(() => this._save(method, url, options), options.error); + }, + + /** + * Private implementation of the save function (called after potential password confirmation) + * @param {string} method + * @param {string} url + * @param {{success: Function, error: Function}} options + */ + _save: function(method, url, options) { + self = this; + $.ajax({ type: method, url: url, @@ -352,6 +363,15 @@ StorageConfig.prototype = { } return; } + + window.OC.PasswordConfirmation.requirePasswordConfirmation(() => this._destroy(options), options.error) + }, + + /** + * Private implementation of the DELETE method called after password confirmation + * @param {{ success: Function, error: Function }} options + */ + _destroy: function(options) { $.ajax({ type: 'DELETE', url: OC.generateUrl(this._url + '/{id}', {id: this.id}), From 7f7732f96c782c034a02e4c106b60bd7a34fa052 Mon Sep 17 00:00:00 2001 From: yemkareems Date: Thu, 17 Oct 2024 12:38:06 +0530 Subject: [PATCH 2/3] fix: add PasswordConfirmationRequired to user storages create, update and delete Signed-off-by: yemkareems --- .../lib/Controller/UserStoragesController.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php index 7c141afcb305e..f9e4ce648d481 100644 --- a/apps/files_external/lib/Controller/UserStoragesController.php +++ b/apps/files_external/lib/Controller/UserStoragesController.php @@ -41,6 +41,8 @@ use OCP\IRequest; use OCP\IUserSession; use Psr\Log\LoggerInterface; +use OCP\AppFramework\Http\Attribute\NoAdminRequired; +use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired; /** * User storages controller @@ -120,9 +122,9 @@ public function show($id, $testOnly = true) { * @param array $mountOptions backend-specific mount options * * @return DataResponse - * - * @NoAdminRequired */ + #[NoAdminRequired] + #[PasswordConfirmationRequired] public function create( $mountPoint, $backend, @@ -176,9 +178,9 @@ public function create( * @param bool $testOnly whether to storage should only test the connection or do more things * * @return DataResponse - * - * @NoAdminRequired */ + #[NoAdminRequired] + #[PasswordConfirmationRequired] public function update( $id, $mountPoint, @@ -227,10 +229,10 @@ public function update( /** * Delete storage * - * @NoAdminRequired - * * {@inheritdoc} */ + #[NoAdminRequired] + #[PasswordConfirmationRequired] public function destroy($id) { return parent::destroy($id); } From 7198f04258a6b76dfed2369d51fc8c77c147e129 Mon Sep 17 00:00:00 2001 From: yemkareems Date: Thu, 17 Oct 2024 13:16:20 +0530 Subject: [PATCH 3/3] fix: cs fix for namespace Signed-off-by: yemkareems --- apps/files_external/lib/Controller/UserStoragesController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php index f9e4ce648d481..b788264d9607d 100644 --- a/apps/files_external/lib/Controller/UserStoragesController.php +++ b/apps/files_external/lib/Controller/UserStoragesController.php @@ -34,6 +34,8 @@ use OCA\Files_External\NotFoundException; use OCA\Files_External\Service\UserStoragesService; 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; @@ -41,8 +43,6 @@ use OCP\IRequest; use OCP\IUserSession; use Psr\Log\LoggerInterface; -use OCP\AppFramework\Http\Attribute\NoAdminRequired; -use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired; /** * User storages controller