Skip to content

Use delegated settings to allow nonadmins to manage flows #310

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
lukasdotcom merged 3 commits into from
Jun 23, 2025
Merged

Use delegated settings to allow nonadmins to manage flows #310

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28ec109
Use delegated settings to allow nonadmins to manage flows
lukasdotcom Jun 17, 2025
1240a62
use correct authorization
lukasdotcom Jun 20, 2025
11dde4c
remove attribute
lukasdotcom Jun 23, 2025
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
Prev Previous commit
Next Next commit
use correct authorization 
Signed-off-by: Lukas Schaefer <[email protected]>
  • Loading branch information
@lukasdotcom
lukasdotcom committed Jun 20, 2025
commit 1240a62a927776ba98861b9df01e639e12dceed7
16 changes: 6 additions & 10 deletions lib/Controller/ConfigController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

namespace OCA\Approval\Controller;

use OCA\Approval\Attribute\RequireApprovalAdmin;
use OCA\Approval\Service\RuleService;
use OCA\Approval\Service\UtilsService;

use OCA\Approval\Settings\Admin;
use OCP\App\IAppManager;

use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\AuthorizedAdminSetting;
use OCP\AppFramework\Http\DataResponse;
use OCP\IRequest;

Expand Down Expand Up @@ -53,8 +53,7 @@ public function createTag(string $name): DataResponse {
*
* @return DataResponse
*/
#[NoAdminRequired]
#[RequireApprovalAdmin]
#[AuthorizedAdminSetting(settings: Admin::class)]
public function getRules(): DataResponse {
$circlesEnabled = $this->appManager->isEnabledForUser('circles') && class_exists(\OCA\Circles\CirclesManager::class);
if ($circlesEnabled) {
Expand Down Expand Up @@ -116,8 +115,7 @@ public function getRules(): DataResponse {
* @param string $description
* @return DataResponse
*/
#[NoAdminRequired]
#[RequireApprovalAdmin]
#[AuthorizedAdminSetting(settings: Admin::class)]
public function createRule(int $tagPending, int $tagApproved, int $tagRejected,
array $approvers, array $requesters, string $description): DataResponse {
$result = $this->ruleService->createRule($tagPending, $tagApproved, $tagRejected, $approvers, $requesters, $description);
Expand All @@ -136,8 +134,7 @@ public function createRule(int $tagPending, int $tagApproved, int $tagRejected,
* @param string $description
* @return DataResponse
*/
#[NoAdminRequired]
#[RequireApprovalAdmin]
#[AuthorizedAdminSetting(settings: Admin::class)]
public function saveRule(int $id, int $tagPending, int $tagApproved, int $tagRejected,
array $approvers, array $requesters, string $description): DataResponse {
$result = $this->ruleService->saveRule($id, $tagPending, $tagApproved, $tagRejected, $approvers, $requesters, $description);
Expand All @@ -150,8 +147,7 @@ public function saveRule(int $id, int $tagPending, int $tagApproved, int $tagRej
* @param int $id
* @return DataResponse
*/
#[NoAdminRequired]
#[RequireApprovalAdmin]
#[AuthorizedAdminSetting(settings: Admin::class)]
public function deleteRule(int $id): DataResponse {
$result = $this->ruleService->deleteRule($id);
return isset($result['error'])
Expand Down
Loading