Skip to content

Update RoleController without strict Role entity class #20540

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

Open
tdominauskas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update RoleController without strict Role entity class #20540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions src/Akeneo/UserManagement/Bundle/Controller/RoleController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

namespace Akeneo\UserManagement\Bundle\Controller;

use Akeneo\Tool\Component\StorageUtils\Factory\SimpleFactoryInterface;
use Akeneo\Tool\Component\StorageUtils\Remover\RemoverInterface;
use Akeneo\UserManagement\Bundle\Form\Handler\AclRoleHandler;
use Akeneo\UserManagement\Component\Model\Role;
use Akeneo\UserManagement\Component\Model\RoleInterface;
use Akeneo\UserManagement\Component\Repository\RoleRepositoryInterface;
use Akeneo\UserManagement\Domain\Permissions\Query\EditRolePermissionsRoleQuery;
use Oro\Bundle\SecurityBundle\Acl\Persistence\AclSidManager;
Expand All @@ -26,6 +27,7 @@ public function __construct(
private readonly AclRoleHandler $aclRoleHandler,
private readonly TranslatorInterface $translator,
private readonly EditRolePermissionsRoleQuery $editRolePermissionsRoleQuery,
private readonly SimpleFactoryInterface $roleFactory,
) {
}

Expand All @@ -34,7 +36,7 @@ public function __construct(
*/
public function create(): Response
{
$newRole = new Role();
$newRole = $this->roleFactory->create();
return $this->updateRole($newRole);
}

Expand Down Expand Up @@ -86,7 +88,7 @@ public function delete(Request $request, $id): Response
return new JsonResponse('', 204);
}

private function updateRole(Role $role): Response
protected function updateRole(RoleInterface $role): Response
{
$this->aclRoleHandler->createForm($role);

Expand Down
4 changes: 3 additions & 1 deletion src/Akeneo/UserManagement/Bundle/Resources/config/controllers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ parameters:
pim_user.controller.user_rest.class: Akeneo\UserManagement\Bundle\Controller\Rest\UserController
pim_user.controller.security_rest.class: Akeneo\UserManagement\Bundle\Controller\Rest\SecurityController
pim_user.controller.user_group_rest.class: Akeneo\UserManagement\Bundle\Controller\Rest\UserGroupController
pim_user.controller.user_role.class: Akeneo\UserManagement\Bundle\Controller\RoleController

services:
pim_user.controller.user_rest:
Expand Down Expand Up @@ -73,14 +74,15 @@ services:

pim_user.controller.role:
public: true
class: 'Akeneo\UserManagement\Bundle\Controller\RoleController'
class: '%pim_user.controller.user_role.class%'
arguments:
- '@pim_user.repository.role'
- '@pim_user.remover.role'
- '@oro_security.acl.sid_manager'
- '@pim_user.form.handler.acl_role'
- '@translator'
- '@Akeneo\UserManagement\Domain\Permissions\Query\EditRolePermissionsRoleQuery'
- '@pim_user.factory.role'
calls:
- [ 'setContainer', [ '@service_container' ] ]

Expand Down