Merge pull request #41522 from nextcloud/backport/41520/stable26

[stable26] Finish password confirmation
nextcloud · Nov 16, 2023 · 94ef279 · 94ef279
2 parents bdd21c6 + 4d469ba
commit 94ef279
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/apps/workflowengine/lib/Controller/AWorkflowController.php b/apps/workflowengine/lib/Controller/AWorkflowController.php
@@ -99,6 +99,7 @@ public function show(string $id): DataResponse {
 	}
 
 	/**
+	 * @PasswordConfirmationRequired
 	 * @throws OCSBadRequestException
 	 * @throws OCSForbiddenException
 	 * @throws OCSException
@@ -127,6 +128,7 @@ public function create(
 	}
 
 	/**
+	 * @PasswordConfirmationRequired
 	 * @throws OCSBadRequestException
 	 * @throws OCSForbiddenException
 	 * @throws OCSException
@@ -155,6 +157,7 @@ public function update(
 	}
 
 	/**
+	 * @PasswordConfirmationRequired
 	 * @throws OCSBadRequestException
 	 * @throws OCSForbiddenException
 	 * @throws OCSException

diff --git a/apps/workflowengine/lib/Controller/UserWorkflowsController.php b/apps/workflowengine/lib/Controller/UserWorkflowsController.php
@@ -81,6 +81,7 @@ public function show(string $id): DataResponse {
 
 	/**
 	 * @NoAdminRequired
+	 * @PasswordConfirmationRequired
 	 * @throws OCSBadRequestException
 	 * @throws OCSForbiddenException
 	 */
@@ -90,6 +91,7 @@ public function create(string $class, string $name, array $checks, string $opera
 
 	/**
 	 * @NoAdminRequired
+	 * @PasswordConfirmationRequired
 	 * @throws OCSBadRequestException
 	 * @throws OCSForbiddenException
 	 */
@@ -99,6 +101,7 @@ public function update(int $id, string $name, array $checks, string $operation,
 
 	/**
 	 * @NoAdminRequired
+	 * @PasswordConfirmationRequired
 	 * @throws OCSForbiddenException
 	 */
 	public function destroy(int $id): DataResponse {

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