Skip to content

[stable26] Finish password confirmation #41522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 2 commits into from
Nov 16, 2023
+12 −7
Merged

[stable26] Finish password confirmation #41522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6d846c
fix(workflows): Finish password confirmation
nickvergessen Nov 2, 2023
4d469ba
chore(assets): Recompile JS
nickvergessen Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apps/workflowengine/lib/Controller/AWorkflowController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public function show(string $id): DataResponse {
}

/**
* @PasswordConfirmationRequired
* @throws OCSBadRequestException
* @throws OCSForbiddenException
* @throws OCSException
Expand Down Expand Up @@ -127,6 +128,7 @@ public function create(
}

/**
* @PasswordConfirmationRequired
* @throws OCSBadRequestException
* @throws OCSForbiddenException
* @throws OCSException
Expand Down Expand Up @@ -155,6 +157,7 @@ public function update(
}

/**
* @PasswordConfirmationRequired
* @throws OCSBadRequestException
* @throws OCSForbiddenException
* @throws OCSException
Expand Down
3 changes: 3 additions & 0 deletions apps/workflowengine/lib/Controller/UserWorkflowsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public function show(string $id): DataResponse {

/**
* @NoAdminRequired
* @PasswordConfirmationRequired
* @throws OCSBadRequestException
* @throws OCSForbiddenException
*/
Expand All @@ -90,6 +91,7 @@ public function create(string $class, string $name, array $checks, string $opera

/**
* @NoAdminRequired
* @PasswordConfirmationRequired
* @throws OCSBadRequestException
* @throws OCSForbiddenException
*/
Expand All @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions apps/workflowengine/src/store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 === '') {
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions dist/workflowengine-workflowengine.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/workflowengine-workflowengine.js.map
View file
Open in desktop

Large diffs are not rendered by default.