Merge pull request #41520 from nextcloud/bugfix/noid/finish-password-…

…confirmation Finish password confirmation
nextcloud · Nov 16, 2023 · 6099321 · 6099321
2 parents 50f8d6c + 9e1e6a8
commit 6099321
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/apps/workflowengine/lib/Controller/AWorkflowController.php b/apps/workflowengine/lib/Controller/AWorkflowController.php
@@ -30,6 +30,7 @@
 use Doctrine\DBAL\Exception;
 use OCA\WorkflowEngine\Helper\ScopeContext;
 use OCA\WorkflowEngine\Manager;
+use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSException;
@@ -103,6 +104,7 @@ public function show(string $id): DataResponse {
 	 * @throws OCSForbiddenException
 	 * @throws OCSException
 	 */
+	#[PasswordConfirmationRequired]
 	public function create(
 		string $class,
 		string $name,
@@ -131,6 +133,7 @@ public function create(
 	 * @throws OCSForbiddenException
 	 * @throws OCSException
 	 */
+	#[PasswordConfirmationRequired]
 	public function update(
 		int $id,
 		string $name,
@@ -159,6 +162,7 @@ public function update(
 	 * @throws OCSForbiddenException
 	 * @throws OCSException
 	 */
+	#[PasswordConfirmationRequired]
 	public function destroy(int $id): DataResponse {
 		try {
 			$deleted = $this->manager->deleteOperation($id, $this->getScopeContext());

diff --git a/apps/workflowengine/lib/Controller/UserWorkflowsController.php b/apps/workflowengine/lib/Controller/UserWorkflowsController.php
@@ -29,6 +29,7 @@
 
 use OCA\WorkflowEngine\Helper\ScopeContext;
 use OCA\WorkflowEngine\Manager;
+use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSForbiddenException;
@@ -84,6 +85,7 @@ public function show(string $id): DataResponse {
 	 * @throws OCSBadRequestException
 	 * @throws OCSForbiddenException
 	 */
+	#[PasswordConfirmationRequired]
 	public function create(string $class, string $name, array $checks, string $operation, string $entity, array $events): DataResponse {
 		return parent::create($class, $name, $checks, $operation, $entity, $events);
 	}
@@ -93,6 +95,7 @@ public function create(string $class, string $name, array $checks, string $opera
 	 * @throws OCSBadRequestException
 	 * @throws OCSForbiddenException
 	 */
+	#[PasswordConfirmationRequired]
 	public function update(int $id, string $name, array $checks, string $operation, string $entity, array $events): DataResponse {
 		return parent::update($id, $name, $checks, $operation, $entity, $events);
 	}
@@ -101,6 +104,7 @@ public function update(int $id, string $name, array $checks, string $operation,
 	 * @NoAdminRequired
 	 * @throws OCSForbiddenException
 	 */
+	#[PasswordConfirmationRequired]
 	public function destroy(int $id): DataResponse {
 		return parent::destroy($id);
 	}

diff --git a/apps/workflowengine/src/store.js b/apps/workflowengine/src/store.js
@@ -89,7 +89,8 @@ const store = new Store({
 				context.commit('addRule', rule)
 			})
 		},
-		createNewRule(context, rule) {
+		async createNewRule(context, rule) {
+			await confirmPassword()
 			let entity = null
 			let events = []
 			if (rule.isComplex === false && rule.fixedEntity === '') {
@@ -120,9 +121,7 @@ const store = new Store({
 			context.commit('removeRule', rule)
 		},
 		async pushUpdateRule(context, rule) {
-			if (context.state.scope === 0) {
-				await confirmPassword()
-			}
+			await confirmPassword()
 			let result
 			if (rule.id < 0) {
 				result = await axios.post(getApiUrl(''), rule)

diff --git a/dist/workflowengine-workflowengine.js b/dist/workflowengine-workflowengine.js
diff --git a/dist/workflowengine-workflowengine.js.map b/dist/workflowengine-workflowengine.js.map