Skip to content

Commit

Permalink
Merge pull request #5869 from Arminek/remove-rbac
Browse files Browse the repository at this point in the history
[Rbac] remove rbac bundle and component
  • Loading branch information
michalmarcinkowski committed Aug 25, 2016
2 parents b9c4855 + a7be137 commit 94fed15
Show file tree
Hide file tree
Showing 161 changed files with 65 additions and 6,692 deletions.
3 changes: 0 additions & 3 deletions app/config/config_test.yml
Expand Up @@ -56,9 +56,6 @@ sylius_payment:
stripe: Stripe
paypal_express_checkout: Paypal Express Checkout

sylius_rbac:
authorization_checker: sylius.authorization_checker.toggleable

sylius_theme:
sources:
test: ~
Expand Down
56 changes: 56 additions & 0 deletions app/migrations/Version20160823110432.php
@@ -0,0 +1,56 @@
<?php

namespace Sylius\Migrations;

use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;

/**
* Auto-generated Migration: Please modify to your needs!
*/
class Version20160823110432 extends AbstractMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
// this up() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.');

$this->addSql('ALTER TABLE sylius_permission DROP FOREIGN KEY FK_C5160A4E727ACA70');
$this->addSql('ALTER TABLE sylius_role_permission DROP FOREIGN KEY FK_45CEE9B8FED90CCA');
$this->addSql('ALTER TABLE sylius_admin_user_role DROP FOREIGN KEY FK_EEACD2AFD60322AC');
$this->addSql('ALTER TABLE sylius_role DROP FOREIGN KEY FK_8C606FE3727ACA70');
$this->addSql('ALTER TABLE sylius_role_permission DROP FOREIGN KEY FK_45CEE9B8D60322AC');
$this->addSql('ALTER TABLE sylius_shop_user_role DROP FOREIGN KEY FK_E865E2D3D60322AC');
$this->addSql('DROP TABLE sylius_admin_user_role');
$this->addSql('DROP TABLE sylius_permission');
$this->addSql('DROP TABLE sylius_role');
$this->addSql('DROP TABLE sylius_role_permission');
$this->addSql('DROP TABLE sylius_shop_user_role');
}

/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.');

$this->addSql('CREATE TABLE sylius_admin_user_role (user_id INT NOT NULL, role_id INT NOT NULL, INDEX IDX_EEACD2AFA76ED395 (user_id), INDEX IDX_EEACD2AFD60322AC (role_id), PRIMARY KEY(user_id, role_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
$this->addSql('CREATE TABLE sylius_permission (id INT AUTO_INCREMENT NOT NULL, parent_id INT DEFAULT NULL, code VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, description LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, tree_left INT NOT NULL, tree_right INT NOT NULL, tree_level INT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_C5160A4E727ACA70 (parent_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
$this->addSql('CREATE TABLE sylius_role (id INT AUTO_INCREMENT NOT NULL, parent_id INT DEFAULT NULL, code VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, description LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, security_roles LONGTEXT NOT NULL COLLATE utf8_unicode_ci COMMENT \'(DC2Type:array)\', tree_left INT NOT NULL, tree_right INT NOT NULL, tree_level INT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_8C606FE3727ACA70 (parent_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
$this->addSql('CREATE TABLE sylius_role_permission (role_id INT NOT NULL, permission_id INT NOT NULL, INDEX IDX_45CEE9B8D60322AC (role_id), INDEX IDX_45CEE9B8FED90CCA (permission_id), PRIMARY KEY(role_id, permission_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
$this->addSql('CREATE TABLE sylius_shop_user_role (user_id INT NOT NULL, role_id INT NOT NULL, INDEX IDX_E865E2D3A76ED395 (user_id), INDEX IDX_E865E2D3D60322AC (role_id), PRIMARY KEY(user_id, role_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
$this->addSql('ALTER TABLE sylius_admin_user_role ADD CONSTRAINT FK_EEACD2AFA76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE sylius_admin_user_role ADD CONSTRAINT FK_EEACD2AFD60322AC FOREIGN KEY (role_id) REFERENCES sylius_role (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE sylius_permission ADD CONSTRAINT FK_C5160A4E727ACA70 FOREIGN KEY (parent_id) REFERENCES sylius_permission (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE sylius_role ADD CONSTRAINT FK_8C606FE3727ACA70 FOREIGN KEY (parent_id) REFERENCES sylius_role (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE sylius_role_permission ADD CONSTRAINT FK_45CEE9B8D60322AC FOREIGN KEY (role_id) REFERENCES sylius_role (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE sylius_role_permission ADD CONSTRAINT FK_45CEE9B8FED90CCA FOREIGN KEY (permission_id) REFERENCES sylius_permission (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE sylius_shop_user_role ADD CONSTRAINT FK_E865E2D3A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_shop_user (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE sylius_shop_user_role ADD CONSTRAINT FK_E865E2D3D60322AC FOREIGN KEY (role_id) REFERENCES sylius_role (id) ON DELETE CASCADE');
}
}
2 changes: 0 additions & 2 deletions phpspec.yml.dist
Expand Up @@ -19,7 +19,6 @@ suites:
Pricing: { namespace: Sylius\Component\Pricing, psr4_prefix: Sylius\Component\Pricing, spec_path: src/Sylius/Component/Pricing, src_path: src/Sylius/Component/Pricing }
Product: { namespace: Sylius\Component\Product, psr4_prefix: Sylius\Component\Product, spec_path: src/Sylius/Component/Product, src_path: src/Sylius/Component/Product }
Promotion: { namespace: Sylius\Component\Promotion, psr4_prefix: Sylius\Component\Promotion, spec_path: src/Sylius/Component/Promotion, src_path: src/Sylius/Component/Promotion }
Rbac: { namespace: Sylius\Component\Rbac, psr4_prefix: Sylius\Component\Rbac, spec_path: src/Sylius/Component/Rbac, src_path: src/Sylius/Component/Rbac }
Registry: { namespace: Sylius\Component\Registry, psr4_prefix: Sylius\Component\Registry, spec_path: src/Sylius/Component/Registry, src_path: src/Sylius/Component/Registry }
Report: { namespace: Sylius\Component\Report, psr4_prefix: Sylius\Component\Report, spec_path: src/Sylius/Component/Report, src_path: src/Sylius/Component/Report }
Resource: { namespace: Sylius\Component\Resource, psr4_prefix: Sylius\Component\Resource, spec_path: src/Sylius/Component/Resource, src_path: src/Sylius/Component/Resource }
Expand Down Expand Up @@ -58,7 +57,6 @@ suites:
PricingBundle: { namespace: Sylius\Bundle\PricingBundle, psr4_prefix: Sylius\Bundle\PricingBundle, spec_path: src/Sylius/Bundle/PricingBundle, src_path: src/Sylius/Bundle/PricingBundle }
ProductBundle: { namespace: Sylius\Bundle\ProductBundle, psr4_prefix: Sylius\Bundle\ProductBundle, spec_path: src/Sylius/Bundle/ProductBundle, src_path: src/Sylius/Bundle/ProductBundle }
PromotionBundle: { namespace: Sylius\Bundle\PromotionBundle, psr4_prefix: Sylius\Bundle\PromotionBundle, spec_path: src/Sylius/Bundle/PromotionBundle, src_path: src/Sylius/Bundle/PromotionBundle }
RbacBundle: { namespace: Sylius\Bundle\RbacBundle, psr4_prefix: Sylius\Bundle\RbacBundle, spec_path: src/Sylius/Bundle/RbacBundle, src_path: src/Sylius/Bundle/RbacBundle }
ReportBundle: { namespace: Sylius\Bundle\ReportBundle, psr4_prefix: Sylius\Bundle\ReportBundle, spec_path: src/Sylius/Bundle/ReportBundle, src_path: src/Sylius/Bundle/ReportBundle }
ResourceBundle: { namespace: Sylius\Bundle\ResourceBundle, psr4_prefix: Sylius\Bundle\ResourceBundle, spec_path: src/Sylius/Bundle/ResourceBundle, src_path: src/Sylius/Bundle/ResourceBundle }
ReviewBundle: { namespace: Sylius\Bundle\ReviewBundle, psr4_prefix: Sylius\Bundle\ReviewBundle, spec_path: src/Sylius/Bundle/ReviewBundle, src_path: src/Sylius/Bundle/ReviewBundle }
Expand Down
Expand Up @@ -12,8 +12,8 @@
namespace Sylius\Bundle\AdminBundle\Menu;

use Knp\Menu\FactoryInterface;
use Sylius\Bundle\ResourceBundle\Controller\AuthorizationCheckerInterface;
use Sylius\Bundle\UiBundle\Menu\AbstractMenuBuilder;
use Sylius\Component\Rbac\Authorization\AuthorizationCheckerInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/Resources/config/menu.xml
Expand Up @@ -22,7 +22,7 @@

<services>
<service id="sylius.menu_builder.admin.main" class="%sylius.menu_builder.admin.main.class%" parent="sylius.menu_builder">
<argument type="service" id="sylius.authorization_checker" />
<argument type="service" id="sylius.resource_controller.authorization_checker" />
</service>
<service id="sylius.menu.admin.main" class="Knp\Menu\MenuItem" factory-service="sylius.menu_builder.admin.main" factory-method="createMenu" scope="request">
<argument type="service" id="request" />
Expand Down
1 change: 0 additions & 1 deletion src/Sylius/Bundle/CoreBundle/Application/Kernel.php
Expand Up @@ -57,7 +57,6 @@ public function registerBundles()
new \Sylius\Bundle\FlowBundle\SyliusFlowBundle(),
new \Sylius\Bundle\PricingBundle\SyliusPricingBundle(),
new \Sylius\Bundle\ContentBundle\SyliusContentBundle(),
new \Sylius\Bundle\RbacBundle\SyliusRbacBundle(),
new \Sylius\Bundle\UserBundle\SyliusUserBundle(),
new \Sylius\Bundle\CustomerBundle\SyliusCustomerBundle(),
new \Sylius\Bundle\UiBundle\SyliusUiBundle(),
Expand Down

This file was deleted.

Expand Up @@ -12,9 +12,7 @@
namespace Sylius\Bundle\CoreBundle\Fixture\Factory;

use Sylius\Component\Core\Model\AdminUserInterface;
use Sylius\Component\Rbac\Model\RoleInterface;
use Sylius\Component\Resource\Factory\FactoryInterface;
use Sylius\Component\Resource\Repository\RepositoryInterface;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;

Expand All @@ -28,11 +26,6 @@ final class AdminUserExampleFactory implements ExampleFactoryInterface
*/
private $userFactory;

/**
* @var RepositoryInterface
*/
private $roleRepository;

/**
* @var \Faker\Generator
*/
Expand All @@ -45,12 +38,10 @@ final class AdminUserExampleFactory implements ExampleFactoryInterface

/**
* @param FactoryInterface $userFactory
* @param RepositoryInterface $roleRepository
*/
public function __construct(FactoryInterface $userFactory, RepositoryInterface $roleRepository)
public function __construct(FactoryInterface $userFactory)
{
$this->userFactory = $userFactory;
$this->roleRepository = $roleRepository;

$this->faker = \Faker\Factory::create();
$this->optionsResolver =
Expand Down Expand Up @@ -83,30 +74,12 @@ public function create(array $options = [])
$user->setUsername($options['username']);
$user->setPlainPassword($options['password']);
$user->setEnabled($options['enabled']);

$this->addUserRole($user, 'ROLE_ADMINISTRATION_ACCESS', 'administrator');
$user->addRole('ROLE_ADMINISTRATION_ACCESS');

if ($options['api']) {
$this->addUserRole($user, 'ROLE_API_ACCESS', 'api_administrator');
$user->addRole('ROLE_API_ACCESS');
}

return $user;
}

/**
* @param AdminUserInterface $user
* @param string $role
* @param string $authorizationRole
*/
private function addUserRole(AdminUserInterface $user, $role, $authorizationRole)
{
$user->addRole($role);

/** @var RoleInterface $adminRole */
$adminRole = $this->roleRepository->findOneBy(['code' => $authorizationRole]);

if (null !== $adminRole) {
$user->addAuthorizationRole($adminRole);
}
}
}
51 changes: 0 additions & 51 deletions src/Sylius/Bundle/CoreBundle/Fixture/RbacFixture.php

This file was deleted.

Expand Up @@ -70,7 +70,6 @@ sylius_fixtures:
last_name: Doe
password: sylius

rbac: ~
admin_user:
name: admin_user
options:
Expand Down

0 comments on commit 94fed15

Please sign in to comment.