upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 10:40:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source 
[stable23] Finish password confirmation
This commit is contained in:
Arthur Schiwon 2023-11-16 09:55:44 +01:00 committed by GitHub
commit 497c24ffc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/workflowengine/js/workflowengine.js
View file

File diff suppressed because one or more lines are too long

2
apps/workflowengine/js/workflowengine.js.map
View file

File diff suppressed because one or more lines are too long

3
apps/workflowengine/lib/Controller/AWorkflowController.php
View file

@ -99,6 +99,7 @@ abstract class AWorkflowController extends OCSController {
}
/**
* @PasswordConfirmationRequired
* @throws OCSBadRequestException
* @throws OCSForbiddenException
* @throws OCSException
@ -127,6 +128,7 @@ abstract class AWorkflowController extends OCSController {
}
/**
* @PasswordConfirmationRequired
* @throws OCSBadRequestException
* @throws OCSForbiddenException
* @throws OCSException
@ -155,6 +157,7 @@ abstract class AWorkflowController extends OCSController {
}
/**
* @PasswordConfirmationRequired
* @throws OCSBadRequestException
* @throws OCSForbiddenException
* @throws OCSException

3
apps/workflowengine/lib/Controller/UserWorkflowsController.php
View file

@ -81,6 +81,7 @@ class UserWorkflowsController extends AWorkflowController {
/**
* @NoAdminRequired
* @PasswordConfirmationRequired
* @throws OCSBadRequestException
* @throws OCSForbiddenException
*/
@ -90,6 +91,7 @@ class UserWorkflowsController extends AWorkflowController {
/**
* @NoAdminRequired
* @PasswordConfirmationRequired
* @throws OCSBadRequestException
* @throws OCSForbiddenException
*/
@ -99,6 +101,7 @@ class UserWorkflowsController extends AWorkflowController {
/**
* @NoAdminRequired
* @PasswordConfirmationRequired
* @throws OCSForbiddenException
*/
public function destroy(int $id): DataResponse {

7
apps/workflowengine/src/store.js
View file

@ -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)