Skip to content
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

Jump to bottom

Remove AdminApiBundle from the default installation #543

Merged
merged 1 commit into from Apr 23, 2021
Merged

Remove AdminApiBundle from the default installation #543

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions composer.json
View file
Open in desktop
Expand Up @@ -18,10 +18,8 @@
],
"require": {
"php": "^7.4",
"friendsofsymfony/oauth-server-bundle": ">2.0.0-alpha.0 ^2.0@dev",
"sylius/paypal-plugin": "^1.1",
"sylius/sylius": "~1.10.0@dev",
"sylius/admin-api-bundle": "^1.10",
"symfony/dotenv": "^4.4 || ^5.2",
"symfony/flex": "^1.11"
},
Expand Down
2 changes: 0 additions & 2 deletions config/bundles.php
View file
Open in desktop
Expand Up @@ -46,8 +46,6 @@
Sylius\Bundle\ThemeBundle\SyliusThemeBundle::class => ['all' => true],
Sylius\Bundle\AdminBundle\SyliusAdminBundle::class => ['all' => true],
Sylius\Bundle\ShopBundle\SyliusShopBundle::class => ['all' => true],
FOS\OAuthServerBundle\FOSOAuthServerBundle::class => ['all' => true],
Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle::class => ['all' => true],
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
Expand Down
16 changes: 0 additions & 16 deletions config/packages/_sylius.yaml
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@ imports:
- { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" }

- { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" }
- { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" }
- { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" }

- { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
Expand All @@ -29,21 +28,6 @@ sylius_addressing:
classes:
model: App\Entity\Addressing\ZoneMember

sylius_admin_api:
resources:
api_client:
classes:
model: App\Entity\AdminApi\Client
api_access_token:
classes:
model: App\Entity\AdminApi\AccessToken
api_refresh_token:
classes:
model: App\Entity\AdminApi\RefreshToken
api_auth_code:
classes:
model: App\Entity\AdminApi\AuthCode

sylius_attribute:
resources:
product:
Expand Down
14 changes: 0 additions & 14 deletions config/packages/security.yaml
View file
Open in desktop
@@ -1,6 +1,5 @@
parameters:
sylius.security.admin_regex: "^/%sylius_admin.path_name%"
sylius.security.api_regex: "^/api/v1"
sylius.security.shop_regex: "^/(?!%sylius_admin.path_name%|api/.*|api$|media/.*)[^/]++"
sylius.security.new_api_route: "/api/v2"
sylius.security.new_api_regex: "^%sylius.security.new_api_route%"
Expand Down Expand Up @@ -53,10 +52,6 @@ security:
target: sylius_admin_login
anonymous: true

oauth_token:
pattern: "%sylius.security.api_regex%/oauth/v2/token"
security: false

new_api_admin_user:
pattern: "%sylius.security.new_api_admin_regex%/.*"
provider: sylius_api_admin_user_provider
Expand Down Expand Up @@ -87,13 +82,6 @@ security:
authenticators:
- lexik_jwt_authentication.jwt_token_authenticator

api:
pattern: "%sylius.security.api_regex%/.*"
provider: sylius_admin_user_provider
fos_oauth: true
stateless: true
anonymous: true

shop:
switch_user: { role: ROLE_ALLOWED_TO_SWITCH }
context: shop
Expand Down Expand Up @@ -135,14 +123,12 @@ security:
- { path: "%sylius.security.shop_regex%/_partial", role: ROLE_NO_ACCESS }

- { path: "%sylius.security.admin_regex%/login", role: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: "%sylius.security.api_regex%/login", role: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: "%sylius.security.shop_regex%/login", role: IS_AUTHENTICATED_ANONYMOUSLY }

- { path: "%sylius.security.shop_regex%/register", role: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: "%sylius.security.shop_regex%/verify", role: IS_AUTHENTICATED_ANONYMOUSLY }

- { path: "%sylius.security.admin_regex%", role: ROLE_ADMINISTRATION_ACCESS }
- { path: "%sylius.security.api_regex%/.*", role: ROLE_API_ACCESS }
- { path: "%sylius.security.shop_regex%/account", role: ROLE_USER }

- { path: "%sylius.security.new_api_admin_regex%/.*", role: ROLE_API_ACCESS }
Expand Down
3 changes: 0 additions & 3 deletions config/routes/sylius_admin_api.yaml
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions src/Entity/AdminApi/AccessToken.php
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions src/Entity/AdminApi/AuthCode.php
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions src/Entity/AdminApi/Client.php
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions src/Entity/AdminApi/RefreshToken.php
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions symfony.lock
View file
Open in desktop
Expand Up @@ -187,12 +187,6 @@
"friendsofphp/proxy-manager-lts": {
"version": "v1.0.3"
},
"friendsofsymfony/oauth-server-bundle": {
"version": "1.6.1"
},
"friendsofsymfony/oauth2-php": {
"version": "1.2.3"
},
"friendsofsymfony/rest-bundle": {
"version": "2.2",
"recipe": {
Expand Down