Merge pull request #41525 from nextcloud/backport/41520/stable23

[stable23] Finish password confirmation
nextcloud · Nov 16, 2023 · 497c24f · 497c24f
2 parents c32b5af + b44c655
commit 497c24f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js
diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map
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
@@ -88,7 +88,8 @@ const store = new Vuex.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 === '') {
@@ -119,9 +120,7 @@ const store = new Vuex.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)