Merge pull request #7746 from pamil/admin-api-bundle

Rename ApiBundle to AdminApiBundle

UPGRADE.md

@@ -14,14 +14,14 @@
 * Changed the way how payment methods are created. Now you choose desired gateway first and configure payment method with it. All parameters that were previously configured in `yml` configuration file
   are now managed for each payment method in the Admin panel.
 
-### ApiBundle
+### AdminApiBundle (former ApiBundle)
 
-* Change the import path of your API routing from `src/Sylius/Bundle/ApiBundle/Resources/config/routing/main.yml` to `src/Sylius/Bundle/ApiBundle/Resources/config/routing.yml`. API became versioned, so you need to prefix them accordingly (e.g. `/api/customer` -> `/api/v1/customer`). 
+* Change the import path of your API routing from `src/Sylius/Bundle/ApiBundle/Resources/config/routing/main.yml` to `src/Sylius/Bundle/AdminApiBundle/Resources/config/routing.yml`. API became versioned, so you need to prefix them accordingly (e.g. `/api/customer` -> `/api/v1/customer`). 
 
 * Routing definition for Shipping Categories has been removed and replaced with auto generated resource routing. Also, Shipping Categories are resolved by code instead of id.
  One can either change the way, how the routes are handled on theirs app (send `code` instead of `id`) or replace previous routing import with following definition:
  ```yaml
-    sylius_api_shipping_category_index:
+    sylius_admin_api_shipping_category_index:
         path: /
         methods: [GET]
         defaults:
@@ -34,7 +34,7 @@
                 sorting:
                     name: desc
     
-    sylius_api_shipping_category_create:
+    sylius_admin_api_shipping_category_create:
         path: /
         methods: [POST]
         defaults:
@@ -42,7 +42,7 @@
             _sylius:
                 serialization_version: $version
     
-    sylius_api_shipping_category_update:
+    sylius_admin_api_shipping_category_update:
         path: /{id}
         methods: [PUT, PATCH]
         defaults:
@@ -50,7 +50,7 @@
             _sylius:
                 serialization_version: $version
     
-    sylius_api_shipping_category_delete:
+    sylius_admin_api_shipping_category_delete:
         path: /{id}
         methods: [DELETE]
         defaults:
@@ -59,7 +59,7 @@
                 serialization_version: $version
                 csrf_protection: false
     
-    sylius_api_shipping_category_show:
+    sylius_admin_api_shipping_category_show:
         path: /{id}
         methods: [GET]
         defaults:
@@ -92,6 +92,8 @@ You can bring back previous configuration by overriding current routing with you
 
   You can bring back previous configuration by overriding current routing with your definition.
 
+* Bundle was renamed from `ApiBundle` to `AdminApiBundle`. Routing and config was changed from `sylius_api` to `sylius_admin_api`.
+
 ### Attribute / AttributeBundle
 
 * `AttributeValue::$localeCode` property was added to make it translatable. Now, every attribute value has a locale code to be displayed properly in different locales. All attribute values are migrated to the new concept with migration `Version20170109143010`. Look at [this PR](https://github.com/Sylius/Sylius/pull/7219) if you have any problems with upgrade.
@@ -389,7 +391,7 @@ From now on it won't compute every possible permutation of fallback locales from
 
 ### Configuration
 
-* Move `sylius_shop` routing below `sylius_admin` and `sylius_api` in `app/config/routing.yml` and replace it with the following one:
+* Move `sylius_shop` routing below `sylius_admin` and `sylius_admin_api` in `app/config/routing.yml` and replace it with the following one:
 
   ```yaml
   sylius_shop:

app/AppKernel.php

@@ -26,8 +26,8 @@ class AppKernel extends Kernel
             new \Sylius\Bundle\AdminBundle\SyliusAdminBundle(),
             new \Sylius\Bundle\ShopBundle\SyliusShopBundle(),
 
-            new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), // Required by SyliusApiBundle.
-            new \Sylius\Bundle\ApiBundle\SyliusApiBundle(),
+            new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), // Required by SyliusAdminApiBundle.
+            new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(),
         ];
 
         return array_merge(parent::registerBundles(), $bundles);

app/config/config.yml

@@ -5,7 +5,7 @@ imports:
     - { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" }
     - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" }
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
-    - { resource: "@SyliusApiBundle/Resources/config/app/config.yml" }
+    - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" }
 
     - { resource: "parameters.yml" }
     - { resource: "security.yml" }
@@ -33,6 +33,7 @@ doctrine:
         dbname: "%database_name%"
         user: "%database_user%"
         password: "%database_password%"
+        server_version: "5.5"
         charset: UTF8
 
 doctrine_migrations:

app/config/routing.yml

@@ -5,8 +5,8 @@ sylius_admin:
     resource: "@SyliusAdminBundle/Resources/config/routing.yml"
     prefix: /admin
 
-sylius_api:
-    resource: "@SyliusApiBundle/Resources/config/routing.yml"
+sylius_admin_api:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing.yml"
     prefix: /api
 
 sylius_shop:

app/migrations/Version20170313125424.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace Sylius\Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20170313125424 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_api_access_token RENAME sylius_admin_api_access_token');
+        $this->addSql('ALTER TABLE sylius_api_auth_code RENAME sylius_admin_api_auth_code');
+        $this->addSql('ALTER TABLE sylius_api_client RENAME sylius_admin_api_client');
+        $this->addSql('ALTER TABLE sylius_api_refresh_token RENAME sylius_admin_api_refresh_token');
+        $this->addSql('ALTER TABLE sylius_admin_api_access_token DROP FOREIGN KEY FK_7D83AA7F19EB6921');
+        $this->addSql('ALTER TABLE sylius_admin_api_access_token DROP FOREIGN KEY FK_7D83AA7FA76ED395');
+        $this->addSql('DROP INDEX uniq_7d83aa7f5f37a13b ON sylius_admin_api_access_token');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_2AA4915D5F37A13B ON sylius_admin_api_access_token (token)');
+        $this->addSql('DROP INDEX idx_7d83aa7f19eb6921 ON sylius_admin_api_access_token');
+        $this->addSql('CREATE INDEX IDX_2AA4915D19EB6921 ON sylius_admin_api_access_token (client_id)');
+        $this->addSql('DROP INDEX idx_7d83aa7fa76ed395 ON sylius_admin_api_access_token');
+        $this->addSql('CREATE INDEX IDX_2AA4915DA76ED395 ON sylius_admin_api_access_token (user_id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_access_token ADD CONSTRAINT FK_7D83AA7F19EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_access_token ADD CONSTRAINT FK_7D83AA7FA76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_auth_code DROP FOREIGN KEY FK_C840417919EB6921');
+        $this->addSql('ALTER TABLE sylius_admin_api_auth_code DROP FOREIGN KEY FK_C8404179A76ED395');
+        $this->addSql('DROP INDEX uniq_c84041795f37a13b ON sylius_admin_api_auth_code');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_E366D8485F37A13B ON sylius_admin_api_auth_code (token)');
+        $this->addSql('DROP INDEX idx_c840417919eb6921 ON sylius_admin_api_auth_code');
+        $this->addSql('CREATE INDEX IDX_E366D84819EB6921 ON sylius_admin_api_auth_code (client_id)');
+        $this->addSql('DROP INDEX idx_c8404179a76ed395 ON sylius_admin_api_auth_code');
+        $this->addSql('CREATE INDEX IDX_E366D848A76ED395 ON sylius_admin_api_auth_code (user_id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_auth_code ADD CONSTRAINT FK_C840417919EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_auth_code ADD CONSTRAINT FK_C8404179A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_refresh_token DROP FOREIGN KEY FK_4457852519EB6921');
+        $this->addSql('ALTER TABLE sylius_admin_api_refresh_token DROP FOREIGN KEY FK_44578525A76ED395');
+        $this->addSql('DROP INDEX uniq_445785255f37a13b ON sylius_admin_api_refresh_token');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_9160E3FA5F37A13B ON sylius_admin_api_refresh_token (token)');
+        $this->addSql('DROP INDEX idx_4457852519eb6921 ON sylius_admin_api_refresh_token');
+        $this->addSql('CREATE INDEX IDX_9160E3FA19EB6921 ON sylius_admin_api_refresh_token (client_id)');
+        $this->addSql('DROP INDEX idx_44578525a76ed395 ON sylius_admin_api_refresh_token');
+        $this->addSql('CREATE INDEX IDX_9160E3FAA76ED395 ON sylius_admin_api_refresh_token (user_id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_refresh_token ADD CONSTRAINT FK_4457852519EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_refresh_token ADD CONSTRAINT FK_44578525A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
+    }
+
+    /**
+     * @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('ALTER TABLE sylius_admin_api_access_token DROP FOREIGN KEY FK_2AA4915D19EB6921');
+        $this->addSql('ALTER TABLE sylius_admin_api_access_token DROP FOREIGN KEY FK_2AA4915DA76ED395');
+        $this->addSql('DROP INDEX uniq_2aa4915d5f37a13b ON sylius_admin_api_access_token');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_7D83AA7F5F37A13B ON sylius_admin_api_access_token (token)');
+        $this->addSql('DROP INDEX idx_2aa4915d19eb6921 ON sylius_admin_api_access_token');
+        $this->addSql('CREATE INDEX IDX_7D83AA7F19EB6921 ON sylius_admin_api_access_token (client_id)');
+        $this->addSql('DROP INDEX idx_2aa4915da76ed395 ON sylius_admin_api_access_token');
+        $this->addSql('CREATE INDEX IDX_7D83AA7FA76ED395 ON sylius_admin_api_access_token (user_id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_access_token ADD CONSTRAINT FK_2AA4915D19EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_access_token ADD CONSTRAINT FK_2AA4915DA76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_auth_code DROP FOREIGN KEY FK_E366D84819EB6921');
+        $this->addSql('ALTER TABLE sylius_admin_api_auth_code DROP FOREIGN KEY FK_E366D848A76ED395');
+        $this->addSql('DROP INDEX uniq_e366d8485f37a13b ON sylius_admin_api_auth_code');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_C84041795F37A13B ON sylius_admin_api_auth_code (token)');
+        $this->addSql('DROP INDEX idx_e366d84819eb6921 ON sylius_admin_api_auth_code');
+        $this->addSql('CREATE INDEX IDX_C840417919EB6921 ON sylius_admin_api_auth_code (client_id)');
+        $this->addSql('DROP INDEX idx_e366d848a76ed395 ON sylius_admin_api_auth_code');
+        $this->addSql('CREATE INDEX IDX_C8404179A76ED395 ON sylius_admin_api_auth_code (user_id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_auth_code ADD CONSTRAINT FK_E366D84819EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_auth_code ADD CONSTRAINT FK_E366D848A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_refresh_token DROP FOREIGN KEY FK_9160E3FA19EB6921');
+        $this->addSql('ALTER TABLE sylius_admin_api_refresh_token DROP FOREIGN KEY FK_9160E3FAA76ED395');
+        $this->addSql('DROP INDEX uniq_9160e3fa5f37a13b ON sylius_admin_api_refresh_token');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_445785255F37A13B ON sylius_admin_api_refresh_token (token)');
+        $this->addSql('DROP INDEX idx_9160e3fa19eb6921 ON sylius_admin_api_refresh_token');
+        $this->addSql('CREATE INDEX IDX_4457852519EB6921 ON sylius_admin_api_refresh_token (client_id)');
+        $this->addSql('DROP INDEX idx_9160e3faa76ed395 ON sylius_admin_api_refresh_token');
+        $this->addSql('CREATE INDEX IDX_44578525A76ED395 ON sylius_admin_api_refresh_token (user_id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_refresh_token ADD CONSTRAINT FK_9160E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_refresh_token ADD CONSTRAINT FK_9160E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
+        $this->addSql('ALTER TABLE sylius_admin_api_access_token RENAME sylius_api_access_token');
+        $this->addSql('ALTER TABLE sylius_admin_api_auth_code RENAME sylius_api_auth_code');
+        $this->addSql('ALTER TABLE sylius_admin_api_client RENAME sylius_api_client');
+        $this->addSql('ALTER TABLE sylius_admin_api_refresh_token RENAME sylius_api_refresh_token');
+    }
+}

docs/api/checkouts.rst

@@ -393,7 +393,7 @@ The response contains proposed shipments and for each of them, it has a list of
 
     Because of the custom calculation logic, the regular rules of overriding do not apply for this endpoint.
     In order to have a different response, you have to provide a custom controller and build the message on your own.
-    Exemplary implementation can be found `here <https://github.com/Sylius/Sylius/blob/master/src/Sylius/Bundle/ApiBundle/Controller/ShowAvailableShippingMethodsController.php>`__
+    Exemplary implementation can be found `here <https://github.com/Sylius/Sylius/blob/master/src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailableShippingMethodsController.php>`__
 
 Next step is updating the order with the types of shipping methods that have been selected. A PUT request has to be send for each available shipment.
 
@@ -618,7 +618,7 @@ Definition
 
 .. warning::
 
-    Similar to the shipping step, this one has its own controller, which has to be replaced if you want to make some changes. Exemplary implementation can be found `here <https://github.com/Sylius/Sylius/blob/master/src/Sylius/Bundle/ApiBundle/Controller/ShowAvailablePaymentMethodsController.php>`__
+    Similar to the shipping step, this one has its own controller, which has to be replaced if you want to make some changes. Exemplary implementation can be found `here <https://github.com/Sylius/Sylius/blob/master/src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailablePaymentMethodsController.php>`__
 
 Example
 ^^^^^^^

docs/api/sorting_and_filtration.rst

@@ -7,7 +7,7 @@ do it with sample resources.
 .. note::
 
     To find out by which fields the api resources can be sorted and how they can be filtered you should check the grid configuration of these
-    `here <https://github.com/Sylius/Sylius/tree/master/src/Sylius/Bundle/ApiBundle/Resources/config/grids>`_
+    `here <https://github.com/Sylius/Sylius/tree/master/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids>`_
 
 How to sort resources?
 ----------------------

docs/cookbook/disabling-shop-admin-api.rst

@@ -22,7 +22,7 @@ How to disable Sylius shop?
             // new \Sylius\Bundle\ShopBundle\SyliusShopBundle(), // - remove or leave this line commented
 
             new \FOS\OAuthServerBundle\FOSOAuthServerBundle(),
-            new \Sylius\Bundle\ApiBundle\SyliusApiBundle(),
+            new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(),
 
             new \AppBundle\AppBundle(),
         ];
@@ -100,7 +100,7 @@ How to disable Sylius Admin?
             new \Sylius\Bundle\ShopBundle\SyliusShopBundle(),
 
             new \FOS\OAuthServerBundle\FOSOAuthServerBundle(),
-            new \Sylius\Bundle\ApiBundle\SyliusApiBundle(),
+            new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(),
 
             new \AppBundle\AppBundle(),
         ];
@@ -155,7 +155,7 @@ The part that has to be removed from this file is shown below:
 How to disable Sylius API?
 --------------------------
 
-**1.** Remove SyliusApiBundle from ``app/AppKernel``.
+**1.** Remove SyliusAdminApiBundle from ``app/AppKernel``.
 
 .. code-block:: php
 
@@ -168,7 +168,7 @@ How to disable Sylius API?
             new \Sylius\Bundle\ShopBundle\SyliusShopBundle(),
 
             new \FOS\OAuthServerBundle\FOSOAuthServerBundle(),
-            // new \Sylius\Bundle\ApiBundle\SyliusApiBundle(), // - remove or leave this line commented
+            // new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(), // - remove or leave this line commented
 
             new \AppBundle\AppBundle(),
         ];
@@ -176,21 +176,21 @@ How to disable Sylius API?
         return array_merge(parent::registerBundles(), $bundles);
     }
 
-**2.** Remove SyliusApiBundle's config import from ``app/config/config.yml``.
+**2.** Remove SyliusAdminApiBundle's config import from ``app/config/config.yml``.
 
 Here you've got the line that should disappear from imports:
 
 .. code-block:: yaml
 
     imports:
-    #    - { resource: "@SyliusApiBundle/Resources/config/app/config.yml" } # remove or leave this line commented
+    #    - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" } # remove or leave this line commented
 
-**3.** Remove SyliusApiBundle routing configuration from ``app/config/routing.yml``.
+**3.** Remove SyliusAdminApiBundle routing configuration from ``app/config/routing.yml``.
 
 .. code-block:: yaml
 
     # sylius_shop:
-    #    resource: "@SyliusApiBundle/Resources/config/routing.yml" # remove or leave these lines commented
+    #    resource: "@SyliusAdminApiBundle/Resources/config/routing.yml" # remove or leave these lines commented
 
 **4.** Remove security configuration from ``app/config/security.yml``.
 

phpspec.yml.dist

@@ -23,7 +23,7 @@ suites:
 
     AddressingBundle: { namespace: Sylius\Bundle\AddressingBundle, psr4_prefix: Sylius\Bundle\AddressingBundle, spec_path: src/Sylius/Bundle/AddressingBundle, src_path: src/Sylius/Bundle/AddressingBundle }
     AdminBundle: { namespace: Sylius\Bundle\AdminBundle, psr4_prefix: Sylius\Bundle\AdminBundle, spec_path: src/Sylius/Bundle/AdminBundle, src_path: src/Sylius/Bundle/AdminBundle }
-    ApiBundle: { namespace: Sylius\Bundle\ApiBundle, psr4_prefix: Sylius\Bundle\ApiBundle, spec_path: src/Sylius/Bundle/ApiBundle, src_path: src/Sylius/Bundle/ApiBundle }
+    AdminApiBundle: { namespace: Sylius\Bundle\AdminApiBundle, psr4_prefix: Sylius\Bundle\AdminApiBundle, spec_path: src/Sylius/Bundle/AdminApiBundle, src_path: src/Sylius/Bundle/AdminApiBundle }
     AttributeBundle: { namespace: Sylius\Bundle\AttributeBundle, psr4_prefix: Sylius\Bundle\AttributeBundle, spec_path: src/Sylius/Bundle/AttributeBundle, src_path: src/Sylius/Bundle/AttributeBundle }
     ChannelBundle: { namespace: Sylius\Bundle\ChannelBundle, psr4_prefix: Sylius\Bundle\ChannelBundle, spec_path: src/Sylius/Bundle/ChannelBundle, src_path: src/Sylius/Bundle/ChannelBundle }
     CoreBundle: { namespace: Sylius\Bundle\CoreBundle, psr4_prefix: Sylius\Bundle\CoreBundle, spec_path: src/Sylius/Bundle/CoreBundle, src_path: src/Sylius/Bundle/CoreBundle }

src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Country.yml

@@ -22,7 +22,7 @@ Sylius\Component\Addressing\Model\Country:
     relations:
         -   rel: self
             href:
-                route: sylius_api_country_show
+                route: sylius_admin_api_country_show
                 parameters:
                     code: expr(object.getCode())
                     version: 1

src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Province.yml

@@ -30,7 +30,7 @@ Sylius\Component\Addressing\Model\Province:
     relations:
         -   rel: self
             href:
-                route: sylius_api_province_show
+                route: sylius_admin_api_province_show
                 parameters:
                     countryCode: expr(object.getCountry().getCode())
                     code: expr(object.getCode())
@@ -39,7 +39,7 @@ Sylius\Component\Addressing\Model\Province:
                 groups: [Default, Detailed]
         -   rel: country
             href:
-                route: sylius_api_country_show
+                route: sylius_admin_api_country_show
                 parameters:
                     code: expr(object.getCountry().getCode())
                     version: 1

src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Zone.yml

@@ -38,7 +38,7 @@ Sylius\Component\Addressing\Model\Zone:
     relations:
         -   rel: self
             href:
-                route: sylius_api_zone_show
+                route: sylius_admin_api_zone_show
                 parameters:
                     code: expr(object.getCode())
                     version: 1

src/Sylius/Bundle/AdminApiBundle/Command/CreateClientCommand.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\AdminApiBundle\Command;
 
 use FOS\OAuthServerBundle\Model\ClientManagerInterface;
-use Sylius\Bundle\ApiBundle\Model\Client;
+use Sylius\Bundle\AdminApiBundle\Model\Client;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;

src/Sylius/Bundle/AdminApiBundle/Controller/ProductTaxonPositionController.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Controller;
+namespace Sylius\Bundle\AdminApiBundle\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Sylius\Component\Core\Model\ProductTaxonInterface;

src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailablePaymentMethodsController.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Controller;
+namespace Sylius\Bundle\AdminApiBundle\Controller;
 
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;

src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailableShippingMethodsController.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Controller;
+namespace Sylius\Bundle\AdminApiBundle\Controller;
 
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;

src/Sylius/Bundle/AdminApiBundle/DependencyInjection/Configuration.php

@@ -9,18 +9,18 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\DependencyInjection;
+namespace Sylius\Bundle\AdminApiBundle\DependencyInjection;
 
-use Sylius\Bundle\ApiBundle\Form\Type\ClientType;
-use Sylius\Bundle\ApiBundle\Model\AccessToken;
-use Sylius\Bundle\ApiBundle\Model\AccessTokenInterface;
-use Sylius\Bundle\ApiBundle\Model\AuthCode;
-use Sylius\Bundle\ApiBundle\Model\AuthCodeInterface;
-use Sylius\Bundle\ApiBundle\Model\Client;
-use Sylius\Bundle\ApiBundle\Model\ClientInterface;
-use Sylius\Bundle\ApiBundle\Model\RefreshToken;
-use Sylius\Bundle\ApiBundle\Model\RefreshTokenInterface;
-use Sylius\Bundle\ApiBundle\Model\UserInterface;
+use Sylius\Bundle\AdminApiBundle\Form\Type\ClientType;
+use Sylius\Bundle\AdminApiBundle\Model\AccessToken;
+use Sylius\Bundle\AdminApiBundle\Model\AccessTokenInterface;
+use Sylius\Bundle\AdminApiBundle\Model\AuthCode;
+use Sylius\Bundle\AdminApiBundle\Model\AuthCodeInterface;
+use Sylius\Bundle\AdminApiBundle\Model\Client;
+use Sylius\Bundle\AdminApiBundle\Model\ClientInterface;
+use Sylius\Bundle\AdminApiBundle\Model\RefreshToken;
+use Sylius\Bundle\AdminApiBundle\Model\RefreshTokenInterface;
+use Sylius\Bundle\AdminApiBundle\Model\UserInterface;
 use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
 use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
 use Sylius\Component\Resource\Factory\Factory;
@@ -39,7 +39,7 @@ final class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('sylius_api');
+        $rootNode = $treeBuilder->root('sylius_admin_api');
 
         $rootNode
             ->children()

src/Sylius/Bundle/AdminApiBundle/DependencyInjection/SyliusAdminApiExtension.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\DependencyInjection;
+namespace Sylius\Bundle\AdminApiBundle\DependencyInjection;
 
-use Sylius\Bundle\ApiBundle\Controller\TokenController;
+use Sylius\Bundle\AdminApiBundle\Controller\TokenController;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -24,7 +24,7 @@ use Symfony\Component\DependencyInjection\Reference;
 /**
  * @author Paweł Jędrzejewski <pawel@sylius.org>
  */
-final class SyliusApiExtension extends AbstractResourceExtension implements PrependExtensionInterface
+final class SyliusAdminApiExtension extends AbstractResourceExtension implements PrependExtensionInterface
 {
     /**
      * {@inheritdoc}

src/Sylius/Bundle/AdminApiBundle/EventListener/CartChangeListener.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\EventListener;
+namespace Sylius\Bundle\AdminApiBundle\EventListener;
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Sylius\Component\Core\Model\OrderItemInterface;

src/Sylius/Bundle/AdminApiBundle/Fixture/ApiAccessTokenFixture.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Fixture;
+namespace Sylius\Bundle\AdminApiBundle\Fixture;
 
 use Sylius\Bundle\CoreBundle\Fixture\AbstractResourceFixture;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;

src/Sylius/Bundle/AdminApiBundle/Fixture/ApiClientFixture.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Fixture;
+namespace Sylius\Bundle\AdminApiBundle\Fixture;
 
 use Sylius\Bundle\CoreBundle\Fixture\AbstractResourceFixture;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;

src/Sylius/Bundle/AdminApiBundle/Fixture/Factory/ApiAccessTokenExampleFactory.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Fixture\Factory;
+namespace Sylius\Bundle\AdminApiBundle\Fixture\Factory;
 
 use FOS\OAuthServerBundle\Model\ClientManagerInterface;
-use Sylius\Bundle\ApiBundle\Model\AccessTokenInterface;
-use Sylius\Bundle\ApiBundle\Model\ClientInterface;
-use Sylius\Bundle\ApiBundle\Model\UserInterface;
+use Sylius\Bundle\AdminApiBundle\Model\AccessTokenInterface;
+use Sylius\Bundle\AdminApiBundle\Model\ClientInterface;
+use Sylius\Bundle\AdminApiBundle\Model\UserInterface;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\AbstractExampleFactory;
 use Sylius\Bundle\CoreBundle\Fixture\OptionsResolver\LazyOption;
 use Sylius\Component\Resource\Factory\FactoryInterface;

src/Sylius/Bundle/AdminApiBundle/Fixture/Factory/ApiClientExampleFactory.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Fixture\Factory;
+namespace Sylius\Bundle\AdminApiBundle\Fixture\Factory;
 
 use FOS\OAuthServerBundle\Model\ClientManagerInterface;
-use Sylius\Bundle\ApiBundle\Model\ClientInterface;
+use Sylius\Bundle\AdminApiBundle\Model\ClientInterface;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\AbstractExampleFactory;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;

src/Sylius/Bundle/AdminApiBundle/Form/EventSubscriber/AddUserFormSubscriber.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Form\EventSubscriber;
+namespace Sylius\Bundle\AdminApiBundle\Form\EventSubscriber;
 
 use Sylius\Component\User\Model\UserAwareInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -27,7 +27,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface
      * @var string
      */
     private $entryType;
-    
+
     /**
      * @param string $entryType
      */
@@ -35,7 +35,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface
     {
         $this->entryType = $entryType;
     }
-    
+
     /**
      * @return array
      */
@@ -46,7 +46,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface
             FormEvents::PRE_SUBMIT => 'preSubmit',
         ];
     }
-    
+
     /**
      * @param FormEvent $event
      */
@@ -55,7 +55,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface
         $form = $event->getForm();
         $form->add('user', $this->entryType, ['constraints' => [new Valid()]]);
     }
-    
+
     /**
      * @param FormEvent $event
      */
@@ -74,7 +74,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface
             $this->removeUserField($event);
         }
     }
-    
+
     /**
      * @param array $data
      *
@@ -89,7 +89,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface
         }
         return true;
     }
-    
+
     /**
      * @param FormEvent $event
      */

src/Sylius/Bundle/AdminApiBundle/Form/Type/AddressType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Form\Type;
+namespace Sylius\Bundle\AdminApiBundle\Form\Type;
 
 use Sylius\Bundle\AddressingBundle\Form\Type\AddressType as SyliusAddressType;
 use Symfony\Component\Form\AbstractType;
@@ -59,6 +59,6 @@ final class AddressType extends AbstractType
      */
     public function getBlockPrefix()
     {
-        return 'sylius_api_checkout_address';
+        return 'sylius_admin_api_checkout_address';
     }
 }

src/Sylius/Bundle/AdminApiBundle/Form/Type/ClientType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Form\Type;
+namespace Sylius\Bundle\AdminApiBundle\Form\Type;
 
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -37,6 +37,6 @@ final class ClientType extends AbstractResourceType
      */
     public function getBlockPrefix()
     {
-        return 'sylius_api_client';
+        return 'sylius_admin_api_client';
     }
 }

src/Sylius/Bundle/AdminApiBundle/Form/Type/CustomerProfileType.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Form\Type;
+namespace Sylius\Bundle\AdminApiBundle\Form\Type;
 
-use Sylius\Bundle\ApiBundle\Form\EventSubscriber\AddUserFormSubscriber;
+use Sylius\Bundle\AdminApiBundle\Form\EventSubscriber\AddUserFormSubscriber;
 use Sylius\Bundle\CoreBundle\Form\Type\User\ShopUserType;
 use Sylius\Bundle\CustomerBundle\Form\Type\CustomerGroupChoiceType;
 use Sylius\Bundle\CustomerBundle\Form\Type\CustomerProfileType as BaseCustomerProfileType;

src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderItemType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Form\Type;
+namespace Sylius\Bundle\AdminApiBundle\Form\Type;
 
 use Sylius\Bundle\OrderBundle\Form\Type\OrderItemType as BaseOrderItemType;
 use Sylius\Bundle\ResourceBundle\Form\DataTransformer\ResourceToIdentifierTransformer;
@@ -81,6 +81,6 @@ final class OrderItemType extends AbstractType
      */
     public function getBlockPrefix()
     {
-        return 'sylius_api_order_item';
+        return 'sylius_admin_api_order_item';
     }
 }

src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderPromotionCouponType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Form\Type;
+namespace Sylius\Bundle\AdminApiBundle\Form\Type;
 
 use Sylius\Bundle\ChannelBundle\Form\Type\ChannelChoiceType;
 use Sylius\Bundle\CustomerBundle\Form\Type\CustomerChoiceType;
@@ -50,6 +50,6 @@ final class OrderPromotionCouponType extends AbstractResourceType
      */
     public function getBlockPrefix()
     {
-        return 'sylius_api_order_promotion_coupon';
+        return 'sylius_admin_api_order_promotion_coupon';
     }
 }

src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Form\Type;
+namespace Sylius\Bundle\AdminApiBundle\Form\Type;
 
 use Sylius\Bundle\ChannelBundle\Form\Type\ChannelChoiceType;
 use Sylius\Bundle\CustomerBundle\Form\Type\CustomerChoiceType;
@@ -89,6 +89,6 @@ final class OrderType extends AbstractResourceType
      */
     public function getBlockPrefix()
     {
-        return 'sylius_api_order';
+        return 'sylius_admin_api_order';
     }
 }

src/Sylius/Bundle/AdminApiBundle/Form/Type/ProductType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Form\Type;
+namespace Sylius\Bundle\AdminApiBundle\Form\Type;
 
 use Sylius\Bundle\ProductBundle\Form\Type\ProductType as BaseProductType;
 use Symfony\Component\Form\AbstractType;

src/Sylius/Bundle/AdminApiBundle/Form/Type/ProductVariantType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Form\Type;
+namespace Sylius\Bundle\AdminApiBundle\Form\Type;
 
 use Sylius\Bundle\ProductBundle\Form\Type\ProductVariantType as BaseProductVariantType;
 use Symfony\Component\Form\AbstractType;

src/Sylius/Bundle/AdminApiBundle/Model/AccessToken.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Model;
+namespace Sylius\Bundle\AdminApiBundle\Model;
 
 use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken;
 

src/Sylius/Bundle/AdminApiBundle/Model/AccessTokenInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Model;
+namespace Sylius\Bundle\AdminApiBundle\Model;
 
 use FOS\OAuthServerBundle\Model\AccessTokenInterface as BaseAccessTokenInterface;
 use Sylius\Component\Resource\Model\ResourceInterface;

src/Sylius/Bundle/AdminApiBundle/Model/AuthCode.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Model;
+namespace Sylius\Bundle\AdminApiBundle\Model;
 
 use FOS\OAuthServerBundle\Entity\AuthCode as BaseAuthCode;
 

src/Sylius/Bundle/AdminApiBundle/Model/AuthCodeInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Model;
+namespace Sylius\Bundle\AdminApiBundle\Model;
 
 use FOS\OAuthServerBundle\Model\AuthCodeInterface as BaseAuthCodeInterface;
 use Sylius\Component\Resource\Model\ResourceInterface;

src/Sylius/Bundle/AdminApiBundle/Model/Client.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Model;
+namespace Sylius\Bundle\AdminApiBundle\Model;
 
 use FOS\OAuthServerBundle\Entity\Client as BaseClient;
 

src/Sylius/Bundle/AdminApiBundle/Model/ClientInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Model;
+namespace Sylius\Bundle\AdminApiBundle\Model;
 
 use FOS\OAuthServerBundle\Model\ClientInterface as BaseClientInterface;
 use Sylius\Component\Resource\Model\ResourceInterface;

src/Sylius/Bundle/AdminApiBundle/Model/ClientManager.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Model;
+namespace Sylius\Bundle\AdminApiBundle\Model;
 
 use FOS\OAuthServerBundle\Entity\ClientManager as BaseClientManager;
 

src/Sylius/Bundle/AdminApiBundle/Model/RefreshToken.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Model;
+namespace Sylius\Bundle\AdminApiBundle\Model;
 
 use FOS\OAuthServerBundle\Entity\RefreshToken as BaseRefreshToken;
 

src/Sylius/Bundle/AdminApiBundle/Model/RefreshTokenInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Model;
+namespace Sylius\Bundle\AdminApiBundle\Model;
 
 use FOS\OAuthServerBundle\Model\RefreshTokenInterface as BaseRefreshTokenInterface;
 use Sylius\Component\Resource\Model\ResourceInterface;

src/Sylius/Bundle/AdminApiBundle/Model/UserInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Model;
+namespace Sylius\Bundle\AdminApiBundle\Model;
 
 use Symfony\Component\Security\Core\User\UserInterface as BaseUserInterface;
 

src/Sylius/Bundle/AdminApiBundle/README.md

@@ -1,4 +1,4 @@
-SyliusApiBundle [![Build status...](https://secure.travis-ci.org/Sylius/SyliusApiBundle.png?branch=master)](http://travis-ci.org/Sylius/SyliusApiBundle)
+SyliusAdminApiBundle [![Build status...](https://secure.travis-ci.org/Sylius/SyliusAdminApiBundle.png?branch=master)](http://travis-ci.org/Sylius/SyliusAdminApiBundle)
 ===============
 
 Sylius REST API bundle.

src/Sylius/Bundle/AdminApiBundle/Resources/config/app/config.yml

@@ -0,0 +1,19 @@
+# This file is part of the Sylius package.
+# (c) Paweł Jędrzejewski
+
+imports:
+    - { resource: "@SyliusAdminApiBundle/Resources/config/app/fixtures.yml" }
+
+    - { resource: "@SyliusAdminApiBundle/Resources/config/grids/cart.yml" }
+    - { resource: "@SyliusAdminApiBundle/Resources/config/grids/payments.yml" }
+    - { resource: "@SyliusAdminApiBundle/Resources/config/grids/product.yml" }
+    - { resource: "@SyliusAdminApiBundle/Resources/config/grids/product_variant.yml" }
+    - { resource: "@SyliusAdminApiBundle/Resources/config/grids/promotion.yml" }
+    - { resource: "@SyliusAdminApiBundle/Resources/config/grids/shipments.yml" }
+    - { resource: "@SyliusAdminApiBundle/Resources/config/grids/taxon.yml" }
+
+sylius_admin_api:
+    resources:
+        api_user:
+            classes:
+                model: "%sylius.model.admin_user.class%"

src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/AccessToken.orm.xml

@@ -12,15 +12,15 @@
 -->
 
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <mapped-superclass name="Sylius\Bundle\ApiBundle\Model\AccessToken" table="sylius_api_access_token">
+    <mapped-superclass name="Sylius\Bundle\AdminApiBundle\Model\AccessToken" table="sylius_admin_api_access_token">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>
 
-        <many-to-one field="client" target-entity="Sylius\Bundle\ApiBundle\Model\ClientInterface">
+        <many-to-one field="client" target-entity="Sylius\Bundle\AdminApiBundle\Model\ClientInterface">
             <join-column name="client_id" referenced-column-name="id" />
         </many-to-one>
-        <many-to-one field="user" target-entity="Sylius\Bundle\ApiBundle\Model\UserInterface">
+        <many-to-one field="user" target-entity="Sylius\Bundle\AdminApiBundle\Model\UserInterface">
             <join-column name="user_id" referenced-column-name="id" nullable="true" />
         </many-to-one>
     </mapped-superclass>

src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/AuthCode.orm.xml

@@ -12,15 +12,15 @@
 -->
 
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <mapped-superclass name="Sylius\Bundle\ApiBundle\Model\AuthCode" table="sylius_api_auth_code">
+    <mapped-superclass name="Sylius\Bundle\AdminApiBundle\Model\AuthCode" table="sylius_admin_api_auth_code">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>
 
-        <many-to-one field="client" target-entity="Sylius\Bundle\ApiBundle\Model\ClientInterface">
+        <many-to-one field="client" target-entity="Sylius\Bundle\AdminApiBundle\Model\ClientInterface">
             <join-column name="client_id" referenced-column-name="id" />
         </many-to-one>
-        <many-to-one field="user" target-entity="Sylius\Bundle\ApiBundle\Model\UserInterface">
+        <many-to-one field="user" target-entity="Sylius\Bundle\AdminApiBundle\Model\UserInterface">
             <join-column name="user_id" referenced-column-name="id" nullable="true" />
         </many-to-one>
     </mapped-superclass>

src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/Client.orm.xml

@@ -12,7 +12,7 @@
 -->
 
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <mapped-superclass name="Sylius\Bundle\ApiBundle\Model\Client" table="sylius_api_client">
+    <mapped-superclass name="Sylius\Bundle\AdminApiBundle\Model\Client" table="sylius_admin_api_client">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>

src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/RefreshToken.orm.xml

@@ -12,15 +12,15 @@
 -->
 
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <mapped-superclass name="Sylius\Bundle\ApiBundle\Model\RefreshToken" table="sylius_api_refresh_token">
+    <mapped-superclass name="Sylius\Bundle\AdminApiBundle\Model\RefreshToken" table="sylius_admin_api_refresh_token">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>
 
-        <many-to-one field="client" target-entity="Sylius\Bundle\ApiBundle\Model\ClientInterface">
+        <many-to-one field="client" target-entity="Sylius\Bundle\AdminApiBundle\Model\ClientInterface">
             <join-column name="client_id" referenced-column-name="id" />
         </many-to-one>
-        <many-to-one field="user" target-entity="Sylius\Bundle\ApiBundle\Model\UserInterface">
+        <many-to-one field="user" target-entity="Sylius\Bundle\AdminApiBundle\Model\UserInterface">
             <join-column name="user_id" referenced-column-name="id" nullable="true" />
         </many-to-one>
     </mapped-superclass>

src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/cart.yml

@@ -1,6 +1,6 @@
 sylius_grid:
     grids:
-        sylius_api_cart:
+        sylius_admin_api_cart:
             driver:
                 name: doctrine/orm
                 options:

src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/payments.yml

@@ -1,6 +1,6 @@
 sylius_grid:
     grids:
-        sylius_api_payment:
+        sylius_admin_api_payment:
             driver:
                 name: doctrine/orm
                 options:

src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/product.yml

@@ -1,6 +1,6 @@
 sylius_grid:
     grids:
-        sylius_api_product:
+        sylius_admin_api_product:
             driver:
                 name: doctrine/orm
                 options:

src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/product_variant.yml

@@ -1,6 +1,6 @@
 sylius_grid:
     grids:
-        sylius_api_product_variant:
+        sylius_admin_api_product_variant:
             driver:
                 name: doctrine/orm
                 options:

src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/promotion.yml

@@ -1,6 +1,6 @@
 sylius_grid:
     grids:
-        sylius_api_promotion:
+        sylius_admin_api_promotion:
             driver:
                 name: doctrine/orm
                 options:

src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/shipments.yml

@@ -1,6 +1,6 @@
 sylius_grid:
     grids:
-        sylius_api_shipment:
+        sylius_admin_api_shipment:
             driver:
                 name: doctrine/orm
                 options:

src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/taxon.yml

@@ -1,6 +1,6 @@
 sylius_grid:
     grids:
-        sylius_api_taxon:
+        sylius_admin_api_taxon:
             driver:
                 name: doctrine/orm
                 options:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing.yml

@@ -4,6 +4,6 @@
 fos_oauth_server_token:
   resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"
 
-sylius_api:
-    resource: "@SyliusApiBundle/Resources/config/routing/main.yml"
+sylius_admin_api:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/main.yml"
     prefix: /v{version}

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/adjustment.yml

@@ -1,4 +1,4 @@
-sylius_api_adjustment_index:
+sylius_admin_api_adjustment_index:
     path: /
     methods: [GET]
     defaults:
@@ -10,7 +10,7 @@ sylius_api_adjustment_index:
                 arguments: [$orderId]
             paginate: false
 
-sylius_api_adjustment_create:
+sylius_admin_api_adjustment_create:
     path: /
     methods: [POST]
     defaults:
@@ -18,7 +18,7 @@ sylius_api_adjustment_create:
         _sylius:
             serialization_version: $version
 
-sylius_api_adjustment_update:
+sylius_admin_api_adjustment_update:
     path: /{id}
     methods: [PUT, PATCH]
     defaults:
@@ -26,7 +26,7 @@ sylius_api_adjustment_update:
         _sylius:
             serialization_version: $version
 
-sylius_api_adjustment_delete:
+sylius_admin_api_adjustment_delete:
     path: /{id}
     methods: [DELETE]
     defaults:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/cart.yml

@@ -1,37 +1,37 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_carts:
+sylius_admin_api_carts:
     resource: |
         alias: sylius.order
         path: '/'
         only: [index]
-        grid: sylius_api_cart
-        section: api
+        grid: sylius_admin_api_cart
+        section: admin_api
         serialization_version: $version
     type: sylius.resource_api
 
-sylius_api_cart_create:
+sylius_admin_api_cart_create:
     path: /
     methods: [POST]
     defaults:
         _controller: sylius.controller.order:createAction
         _sylius:
             serialization_version: $version
-            form: Sylius\Bundle\ApiBundle\Form\Type\OrderType
+            form: Sylius\Bundle\AdminApiBundle\Form\Type\OrderType
             serialization_groups: [DetailedCart]
 
-sylius_api_cart_update:
+sylius_admin_api_cart_update:
     path: /{id}
     methods: [PUT, PATCH]
     defaults:
         _controller: sylius.controller.order:updateAction
         _sylius:
             serialization_version: $version
-            form: Sylius\Bundle\ApiBundle\Form\Type\OrderPromotionCouponType
+            form: Sylius\Bundle\AdminApiBundle\Form\Type\OrderPromotionCouponType
             serialization_groups: [DetailedCart]
 
-sylius_api_cart_delete:
+sylius_admin_api_cart_delete:
     path: /{id}
     methods: [DELETE]
     defaults:
@@ -44,7 +44,7 @@ sylius_api_cart_delete:
                 method: findCartById
                 arguments: [$id]
 
-sylius_api_cart_show:
+sylius_admin_api_cart_show:
     path: /{id}
     methods: [GET]
     defaults:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/cart_item.yml

@@ -1,27 +1,27 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_cart_item_create:
+sylius_admin_api_cart_item_create:
     path: /items/
     methods: [POST]
     defaults:
         _controller: sylius.controller.order_item:createAction
         _sylius:
             serialization_version: $version
-            form: Sylius\Bundle\ApiBundle\Form\Type\OrderItemType
+            form: Sylius\Bundle\AdminApiBundle\Form\Type\OrderItemType
             factory:
                 method: createForCart
                 arguments:
                   - "expr:notFoundOnNull(service('sylius.repository.order').findCartById($cartId))"
             serialization_groups: [DetailedCart]
 
-sylius_api_cart_item:
+sylius_admin_api_cart_item:
     resource: |
         alias: sylius.order_item
         path: 'items'
         only: [update, delete]
-        section: api
-        form: Sylius\Bundle\ApiBundle\Form\Type\OrderItemType
+        section: admin_api
+        form: Sylius\Bundle\AdminApiBundle\Form\Type\OrderItemType
         serialization_version: $version
         criteria:
             cart: $cartId

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/channel.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_channel:
+sylius_admin_api_channel:
     resource: |
         identifier: code
         alias: sylius.channel
-        section: api
+        section: admin_api
         only: ['show', 'index']
         serialization_version: $version
         criteria:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/checkout.yml

@@ -2,7 +2,7 @@
 # (c) Paweł Jędrzejewski
 #
 
-sylius_api_checkout_show:
+sylius_admin_api_checkout_show:
     path: /{id}
     methods: [GET]
     defaults:
@@ -11,14 +11,14 @@ sylius_api_checkout_show:
             serialization_version: $version
             serialization_groups: [Detailed]
 
-sylius_api_checkout_addressing:
+sylius_admin_api_checkout_addressing:
     path: /addressing/{orderId}
     methods: [PUT]
     defaults:
         _controller: sylius.controller.order:updateAction
         _sylius:
             serialization_version: $version
-            form: Sylius\Bundle\ApiBundle\Form\Type\AddressType
+            form: Sylius\Bundle\AdminApiBundle\Form\Type\AddressType
             repository:
                 method: find
                 arguments: [$orderId]
@@ -26,13 +26,13 @@ sylius_api_checkout_addressing:
                 graph: sylius_order_checkout
                 transition: address
 
-sylius_api_checkout_available_shipping_methods:
+sylius_admin_api_checkout_available_shipping_methods:
     path: /select-shipping/{orderId}
     methods: [GET]
     defaults:
         _controller: sylius.controller.show_available_shipping_methods:showAction
 
-sylius_api_checkout_select_shipping:
+sylius_admin_api_checkout_select_shipping:
     path: /select-shipping/{orderId}
     methods: [PUT]
     defaults:
@@ -47,13 +47,13 @@ sylius_api_checkout_select_shipping:
                 graph: sylius_order_checkout
                 transition: select_shipping
 
-sylius_api_checkout_available_payment_methods:
+sylius_admin_api_checkout_available_payment_methods:
     path: /select-payment/{orderId}
     methods: [GET]
     defaults:
         _controller: sylius.controller.show_available_payment_methods:showAction
 
-sylius_api_checkout_select_payment:
+sylius_admin_api_checkout_select_payment:
     path: /select-payment/{orderId}
     methods: [PUT, PATCH]
     defaults:
@@ -68,7 +68,7 @@ sylius_api_checkout_select_payment:
                 graph: sylius_order_checkout
                 transition: select_payment
 
-sylius_api_checkout_complete:
+sylius_admin_api_checkout_complete:
     path: /complete/{orderId}
     methods: [PUT]
     defaults:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/country.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_country:
+sylius_admin_api_country:
     resource: |
         identifier: code
         alias: sylius.country
-        section: api
+        section: admin_api
         except: ['update']
         serialization_version: $version
         criteria:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/currency.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_currency:
+sylius_admin_api_currency:
     resource: |
         identifier: code
         alias: sylius.currency
-        section: api
+        section: admin_api
         except: ['update']
         serialization_version: $version
         criteria:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/customer.yml

@@ -1,7 +1,7 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_customer_index:
+sylius_admin_api_customer_index:
     path: /
     methods: [GET]
     defaults:
@@ -14,7 +14,7 @@ sylius_api_customer_index:
             sorting:
                 id: desc
 
-sylius_api_customer_show:
+sylius_admin_api_customer_show:
     path: /{id}
     methods: [GET]
     defaults:
@@ -23,7 +23,7 @@ sylius_api_customer_show:
             serialization_version: $version
             serialization_groups: [Detailed]
 
-sylius_api_customer_create:
+sylius_admin_api_customer_create:
     path: /
     methods: [POST]
     defaults:
@@ -32,9 +32,9 @@ sylius_api_customer_create:
             serialization_version: $version
             serialization_groups: [Detailed]
             form:
-                type: Sylius\Bundle\ApiBundle\Form\Type\CustomerProfileType
+                type: Sylius\Bundle\AdminApiBundle\Form\Type\CustomerProfileType
 
-sylius_api_customer_update:
+sylius_admin_api_customer_update:
     path: /{id}
     methods: [PUT, PATCH]
     defaults:
@@ -42,9 +42,9 @@ sylius_api_customer_update:
         _sylius:
             serialization_version: $version
             form:
-                type: Sylius\Bundle\ApiBundle\Form\Type\CustomerProfileType
+                type: Sylius\Bundle\AdminApiBundle\Form\Type\CustomerProfileType
 
-sylius_api_customer_delete:
+sylius_admin_api_customer_delete:
     path: /{id}
     methods: [DELETE]
     defaults:
@@ -53,7 +53,7 @@ sylius_api_customer_delete:
             serialization_version: $version
             csrf_protection: false
 
-sylius_api_customer_order_index:
+sylius_admin_api_customer_order_index:
     path: /{id}/orders/
     methods: [GET]
     defaults:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/exchange_rate.yml

@@ -1,15 +1,15 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_exchange_rate:
+sylius_admin_api_exchange_rate:
     resource: |
         alias: sylius.exchange_rate
-        section: api
+        section: admin_api
         only: [index, create]
         serialization_version: $version
     type: sylius.resource_api
 
-sylius_api_exchange_rate_update:
+sylius_admin_api_exchange_rate_update:
     path: /exchange-rates/{sourceCurrencyCode}-{targetCurrencyCode}
     methods: [PUT, PATCH]
     defaults:
@@ -21,7 +21,7 @@ sylius_api_exchange_rate_update:
                 method: findOneWithCurrencyPair
                 arguments: [$sourceCurrencyCode, $targetCurrencyCode]
 
-sylius_api_exchange_rate_delete:
+sylius_admin_api_exchange_rate_delete:
     path: /exchange-rates/{sourceCurrencyCode}-{targetCurrencyCode}
     methods: [DELETE]
     defaults:
@@ -33,7 +33,7 @@ sylius_api_exchange_rate_delete:
                 arguments: [$sourceCurrencyCode, $targetCurrencyCode]
             csrf_protection: false
 
-sylius_api_exchange_rate_show:
+sylius_admin_api_exchange_rate_show:
     path: /exchange-rates/{sourceCurrencyCode}-{targetCurrencyCode}
     methods: [GET]
     defaults:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/locale.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_locale:
+sylius_admin_api_locale:
     resource: |
         identifier: code
         alias: sylius.locale
-        section: api
+        section: admin_api
         except: ['update']
         serialization_version: $version
         criteria:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/main.yml

@@ -0,0 +1,96 @@
+# This file is part of the Sylius package.
+# (c) Paweł Jędrzejewski
+
+sylius_admin_api_channel:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/channel.yml"
+
+sylius_admin_api_country:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/country.yml"
+
+sylius_admin_api_currency:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/currency.yml"
+
+sylius_admin_api_locale:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/locale.yml"
+
+sylius_admin_api_product:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/product.yml"
+
+sylius_admin_api_product_attribute:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/product_attribute.yml"
+
+sylius_admin_api_product_option:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/product_option.yml"
+
+sylius_admin_api_product_variant:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/product_variant.yml"
+    prefix: /products/{productCode}
+
+sylius_admin_api_promotion:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/promotion.yml"
+
+sylius_admin_api_promotion_coupon:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/promotion_coupon.yml"
+    prefix: /promotions/{promotionCode}/coupons
+
+sylius_admin_api_taxon:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/taxon.yml"
+
+sylius_admin_api_product_taxon_position:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/product_taxon_position.yml"
+
+sylius_admin_api_cart:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/cart.yml"
+    prefix: /carts
+
+sylius_admin_api_adjustment:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/adjustment.yml"
+    prefix: /orders/{orderId}/adjustments
+
+sylius_admin_api_cart_item:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/cart_item.yml"
+    prefix: /carts/{cartId}
+
+sylius_admin_api_order:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/order.yml"
+
+sylius_admin_api_checkout:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/checkout.yml"
+    prefix: /checkouts
+
+sylius_admin_api_tax_category:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/tax_category.yml"
+
+sylius_admin_api_tax_rate:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/tax_rate.yml"
+
+sylius_admin_api_shipping_category:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/shipping_category.yml"
+
+sylius_admin_api_shipping_method:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/shipping_method.yml"
+
+sylius_admin_api_shipment:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/shipment.yml"
+
+sylius_admin_api_payment_method:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/payment_method.yml"
+
+sylius_admin_api_payment:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/payment.yml"
+
+sylius_admin_api_exchange_rate:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/exchange_rate.yml"
+
+sylius_admin_api_province:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/province.yml"
+    prefix: /countries/{countryCode}/provinces
+
+sylius_admin_api_zone:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/zone.yml"
+
+sylius_admin_api_customer:
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/customer.yml"
+    prefix: /customers
+
+

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/order.yml

@@ -1,28 +1,28 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_order:
+sylius_admin_api_order:
     resource: |
         alias: sylius.order
-        section: api
+        section: admin_api
         only: [show]
         grid: sylius_admin_order
         serialization_version: $version
     type: sylius.resource_api
 
-sylius_api_order_cancel:
+sylius_admin_api_order_cancel:
     path: /orders/{id}/cancel
     methods: [PUT]
     defaults:
         _controller: sylius.controller.order:applyStateMachineTransitionAction
         _sylius:
-            section: api
+            section: admin_api
             state_machine:
                 graph: sylius_order
                 transition: cancel
             return_content: false
 
-sylius_api_order_shipment_ship:
+sylius_admin_api_order_shipment_ship:
     path: /orders/{orderId}/shipments/{id}/ship
     methods: [PUT]
     defaults:
@@ -37,10 +37,10 @@ sylius_api_order_shipment_ship:
             state_machine:
                 graph: sylius_shipment
                 transition: ship
-            section: api
+            section: admin_api
             form: Sylius\Bundle\ShippingBundle\Form\Type\ShipmentShipType
 
-sylius_api_order_payment_complete:
+sylius_admin_api_order_payment_complete:
     path: /orders/{orderId}/payments/{id}/complete
     methods: [PUT]
     defaults:
@@ -55,5 +55,5 @@ sylius_api_order_payment_complete:
             state_machine:
                 graph: sylius_payment
                 transition: complete
-            section: api
+            section: admin_api
             return_content: false

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/payment.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_payments:
+sylius_admin_api_payments:
     resource: |
         alias: sylius.payment
-        section: api
+        section: admin_api
         only: ['show', 'index']
-        grid: sylius_api_payment
+        grid: sylius_admin_api_payment
         serialization_version: $version
     type: sylius.resource_api

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/payment_method.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_payment_method:
+sylius_admin_api_payment_method:
     resource: |
         identifier: code
         alias: sylius.payment_method
-        section: api
+        section: admin_api
         only: ['show']
         serialization_version: $version
         criteria:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product.yml

@@ -1,13 +1,13 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_product:
+sylius_admin_api_product:
     resource: |
         identifier: code
         alias: sylius.product
-        section: api
-        grid: sylius_api_product
-        form: Sylius\Bundle\ApiBundle\Form\Type\ProductType
+        section: admin_api
+        grid: sylius_admin_api_product
+        form: Sylius\Bundle\AdminApiBundle\Form\Type\ProductType
         serialization_version: $version
         criteria:
             code: $code

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_attribute.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_product_attribute:
+sylius_admin_api_product_attribute:
     resource: |
         identifier: code
         alias: sylius.product_attribute
-        section: api
+        section: admin_api
         only: ['index', 'show']
         serialization_version: $version
         criteria:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_option.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_product_option:
+sylius_admin_api_product_option:
     resource: |
         identifier: code
         alias: sylius.product_option
-        section: api
+        section: admin_api
         only: ['index', 'show']
         serialization_version: $version
         criteria:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_taxon_position.yml

@@ -1,4 +1,4 @@
-sylius_api_taxon_products_update_position:
+sylius_admin_api_taxon_products_update_position:
     path: /taxons/{taxonCode}/products
     methods: [PUT]
     defaults:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_variant.yml

@@ -1,12 +1,12 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_product_variant:
+sylius_admin_api_product_variant:
     resource: |
         path: 'variants'
-        grid: sylius_api_product_variant
+        grid: sylius_admin_api_product_variant
         alias: sylius.product_variant
-        section: api
+        section: admin_api
         only: ['index']
         serialization_version: $version
         vars:
@@ -15,7 +15,7 @@ sylius_api_product_variant:
                     productCode: $productCode
     type: sylius.resource_api
 
-sylius_api_product_variant_create:
+sylius_admin_api_product_variant_create:
     path: /variants/
     methods: [POST]
     defaults:
@@ -23,47 +23,47 @@ sylius_api_product_variant_create:
         _sylius:
             serialization_groups: [Default, Detailed]
             serialization_version: $version
-            section: api
-            form: Sylius\Bundle\ApiBundle\Form\Type\ProductVariantType
+            section: admin_api
+            form: Sylius\Bundle\AdminApiBundle\Form\Type\ProductVariantType
             factory:
                 method: createForProduct
                 arguments:
                   - expr:notFoundOnNull(service('sylius.repository.product').findOneByCode($productCode))
 
-sylius_api_product_variant_update:
+sylius_admin_api_product_variant_update:
     path: /variants/{code}
     methods: [PUT, PATCH]
     defaults:
         _controller: sylius.controller.product_variant:updateAction
         _sylius:
             serialization_version: $version
-            section: api
-            form: Sylius\Bundle\ApiBundle\Form\Type\ProductVariantType
+            section: admin_api
+            form: Sylius\Bundle\AdminApiBundle\Form\Type\ProductVariantType
             repository:
                 method: findOneByCodeAndProductCode
                 arguments: [$code, $productCode]
 
-sylius_api_product_variant_delete:
+sylius_admin_api_product_variant_delete:
     path: /variants/{code}
     methods: [DELETE]
     defaults:
         _controller: sylius.controller.product_variant:deleteAction
         _sylius:
             serialization_version: $version
-            section: api
+            section: admin_api
             repository:
                 method: findOneByCodeAndProductCode
                 arguments: [$code, $productCode]
             csrf_protection: false
 
-sylius_api_product_variant_show:
+sylius_admin_api_product_variant_show:
     path: /variants/{code}
     methods: [GET]
     defaults:
         _controller: sylius.controller.product_variant:showAction
         _sylius:
             serialization_version: $version
-            section: api
+            section: admin_api
             serialization_groups: [Default, Detailed]
             repository:
                 method: findOneByCodeAndProductCode

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/promotion.yml

@@ -1,12 +1,12 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_promotion:
+sylius_admin_api_promotion:
     resource: |
         identifier: code
         alias: sylius.promotion
-        section: api
-        grid: sylius_api_promotion
+        section: admin_api
+        grid: sylius_admin_api_promotion
         serialization_version: $version
         criteria:
             code: $code

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/promotion_coupon.yml

@@ -1,7 +1,7 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_promotion_coupon_index:
+sylius_admin_api_promotion_coupon_index:
     path: /
     methods: [GET]
     defaults:
@@ -9,18 +9,18 @@ sylius_api_promotion_coupon_index:
         _sylius:
             serialization_version: $version
             serialization_groups: [Default]
-            section: api
+            section: admin_api
             criteria:
                 promotion: $promotionCode
 
-sylius_api_promotion_coupon_create:
+sylius_admin_api_promotion_coupon_create:
     path: /
     methods: [POST]
     defaults:
         _controller: sylius.controller.promotion_coupon:createAction
         _sylius:
             serialization_version: $version
-            section: api
+            section: admin_api
             factory:
                 method: createForPromotion
                 arguments:
@@ -28,19 +28,19 @@ sylius_api_promotion_coupon_create:
             criteria:
                 promotion: $promotionCode
 
-sylius_api_promotion_coupon_update:
+sylius_admin_api_promotion_coupon_update:
     path: /{code}
     methods: [PUT, PATCH]
     defaults:
         _controller: sylius.controller.promotion_coupon:updateAction
         _sylius:
             serialization_version: $version
-            section: api
+            section: admin_api
             repository:
                 method: findOneByCodeAndPromotionCode
                 arguments: [$code, $promotionCode]
 
-sylius_api_promotion_coupon_show:
+sylius_admin_api_promotion_coupon_show:
     path: /{code}
     methods: [GET]
     defaults:
@@ -48,19 +48,19 @@ sylius_api_promotion_coupon_show:
         _sylius:
             serialization_version: $version
             serialization_groups: [Default, Detailed]
-            section: api
+            section: admin_api
             repository:
                 method: findOneByCodeAndPromotionCode
                 arguments: [$code, $promotionCode]
 
-sylius_api_promotion_coupon_delete:
+sylius_admin_api_promotion_coupon_delete:
     path: /{code}
     methods: [DELETE]
     defaults:
         _controller: sylius.controller.promotion_coupon:deleteAction
         _sylius:
             serialization_version: $version
-            section: api
+            section: admin_api
             csrf_protection: false
             repository:
                 method: findOneByCodeAndPromotionCode

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/province.yml

@@ -1,7 +1,7 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_province_delete:
+sylius_admin_api_province_delete:
     path: /{code}
     methods: [DELETE]
     defaults:
@@ -12,7 +12,7 @@ sylius_api_province_delete:
                 code: $code
             csrf_protection: false
 
-sylius_api_province_show:
+sylius_admin_api_province_show:
     path: /{code}
     methods: [GET]
     defaults:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipment.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_shipments:
+sylius_admin_api_shipments:
     resource: |
         alias: sylius.shipment
-        section: api
+        section: admin_api
         only: ['show', 'index']
-        grid: sylius_api_shipment
+        grid: sylius_admin_api_shipment
         serialization_version: $version
     type: sylius.resource_api

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipping_category.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_shipping_category:
+sylius_admin_api_shipping_category:
     resource: |
         identifier: code
         alias: sylius.shipping_category
-        section: api
+        section: admin_api
         serialization_version: $version
         criteria:
             code: $code

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipping_method.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_shipping_method:
+sylius_admin_api_shipping_method:
     resource: |
         identifier: code
         alias: sylius.shipping_method
-        section: api
+        section: admin_api
         only: ['show']
         serialization_version: $version
         criteria:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/tax_category.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_tax_category:
+sylius_admin_api_tax_category:
     resource: |
         identifier: code
         alias: sylius.tax_category
-        section: api
+        section: admin_api
         serialization_version: $version
         criteria:
             code: $code

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/tax_rate.yml

@@ -1,11 +1,11 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_tax_rate:
+sylius_admin_api_tax_rate:
     resource: |
         identifier: code
         alias: sylius.tax_rate
-        section: api
+        section: admin_api
         only: ['show', 'index']
         serialization_version: $version
         criteria:

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/taxon.yml

@@ -1,13 +1,13 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_taxon:
+sylius_admin_api_taxon:
     resource: |
         identifier: code
         alias: sylius.taxon
-        section: api
+        section: admin_api
         form: Sylius\Bundle\TaxonomyBundle\Form\Type\TaxonType
-        grid: sylius_api_taxon
+        grid: sylius_admin_api_taxon
         serialization_version: $version
         criteria:
             code: $code

src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/zone.yml

@@ -1,18 +1,18 @@
 # This file is part of the Sylius package.
 # (c) Paweł Jędrzejewski
 
-sylius_api_zone:
+sylius_admin_api_zone:
     resource: |
         identifier: code
         alias: sylius.zone
-        section: api
+        section: admin_api
         except: ['create']
         serialization_version: $version
         criteria:
             code: $code
     type: sylius.resource_api
 
-sylius_api_zone_create:
+sylius_admin_api_zone_create:
     path: /zones/{type}
     methods: [POST]
     defaults:

src/Sylius/Bundle/AdminApiBundle/Resources/config/services.xml

@@ -19,12 +19,12 @@
         <import resource="services/fixtures_factories.xml" />
     </imports>
     <services>
-        <service id="sylius.oauth_server.client_manager" class="Sylius\Bundle\ApiBundle\Model\ClientManager">
+        <service id="sylius.oauth_server.client_manager" class="Sylius\Bundle\AdminApiBundle\Model\ClientManager">
             <argument type="service" id="fos_oauth_server.entity_manager" />
             <argument>%fos_oauth_server.model.client.class%</argument>
         </service>
 
-        <service id="sylius.listener.api.add_to_cart" class="Sylius\Bundle\ApiBundle\EventListener\CartChangeListener">
+        <service id="sylius.listener.api.add_to_cart" class="Sylius\Bundle\AdminApiBundle\EventListener\CartChangeListener">
             <argument type="service" id="sylius.order_processing.order_processor.composite" />
             <argument type="service" id="sylius.manager.order" />
             <tag name="kernel.event_listener" event="sylius.order_item.pre_create" method="recalculateOrderOnAdd" />

src/Sylius/Bundle/AdminApiBundle/Resources/config/services/controller.xml

@@ -13,17 +13,17 @@
 
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sylius.controller.show_available_payment_methods" class="Sylius\Bundle\ApiBundle\Controller\ShowAvailablePaymentMethodsController">
+        <service id="sylius.controller.show_available_payment_methods" class="Sylius\Bundle\AdminApiBundle\Controller\ShowAvailablePaymentMethodsController">
             <argument type="service" id="sm.factory" />
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="sylius.payment_methods_resolver" />
             <argument type="service" id="fos_rest.view_handler" />
         </service>
-        <service id="sylius.controller.update_product_taxon_position" class="Sylius\Bundle\ApiBundle\Controller\ProductTaxonPositionController">
+        <service id="sylius.controller.update_product_taxon_position" class="Sylius\Bundle\AdminApiBundle\Controller\ProductTaxonPositionController">
             <argument type="service" id="sylius.repository.product_taxon" />
             <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
-        <service id="sylius.controller.show_available_shipping_methods" class="Sylius\Bundle\ApiBundle\Controller\ShowAvailableShippingMethodsController">
+        <service id="sylius.controller.show_available_shipping_methods" class="Sylius\Bundle\AdminApiBundle\Controller\ShowAvailableShippingMethodsController">
             <argument type="service" id="sm.factory" />
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="sylius.shipping_methods_resolver" />

src/Sylius/Bundle/AdminApiBundle/Resources/config/services/fixture.xml

@@ -13,13 +13,13 @@
 
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sylius.fixture.api_client" class="Sylius\Bundle\ApiBundle\Fixture\ApiClientFixture">
+        <service id="sylius.fixture.api_client" class="Sylius\Bundle\AdminApiBundle\Fixture\ApiClientFixture">
             <argument type="service" id="sylius.manager.api_client" />
             <argument type="service" id="sylius.fixture.example_factory.api_client" />
             <tag name="sylius_fixtures.fixture" />
         </service>
 
-        <service id="sylius.fixture.api_access_token" class="Sylius\Bundle\ApiBundle\Fixture\ApiAccessTokenFixture">
+        <service id="sylius.fixture.api_access_token" class="Sylius\Bundle\AdminApiBundle\Fixture\ApiAccessTokenFixture">
             <argument type="service" id="sylius.manager.api_access_token" />
             <argument type="service" id="sylius.fixture.example_factory.api_access_token" />
             <tag name="sylius_fixtures.fixture" />

src/Sylius/Bundle/AdminApiBundle/Resources/config/services/fixtures_factories.xml

@@ -13,11 +13,11 @@
 
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sylius.fixture.example_factory.api_client" class="Sylius\Bundle\ApiBundle\Fixture\Factory\ApiClientExampleFactory">
+        <service id="sylius.fixture.example_factory.api_client" class="Sylius\Bundle\AdminApiBundle\Fixture\Factory\ApiClientExampleFactory">
             <argument type="service" id="fos_oauth_server.client_manager.default" />
         </service>
 
-        <service id="sylius.fixture.example_factory.api_access_token" class="Sylius\Bundle\ApiBundle\Fixture\Factory\ApiAccessTokenExampleFactory">
+        <service id="sylius.fixture.example_factory.api_access_token" class="Sylius\Bundle\AdminApiBundle\Fixture\Factory\ApiAccessTokenExampleFactory">
             <argument type="service" id="sylius.factory.api_access_token" />
             <argument type="service" id="sylius.repository.admin_user" />
             <argument type="service" id="sylius.repository.api_client" />

src/Sylius/Bundle/AdminApiBundle/Resources/config/services/form.xml

@@ -26,48 +26,48 @@
     </parameters>
 
     <services>
-        <service id="sylius.form.type.api_client" class="Sylius\Bundle\ApiBundle\Form\Type\ClientType">
+        <service id="sylius.form.type.api_client" class="Sylius\Bundle\AdminApiBundle\Form\Type\ClientType">
             <argument>%sylius.model.api_client.class%</argument>
             <argument>%sylius.form.type.api_client.validation_groups%</argument>
             <tag name="form.type" />
         </service>
 
-        <service id="sylius.form.type.api_order" class="Sylius\Bundle\ApiBundle\Form\Type\OrderType">
+        <service id="sylius.form.type.api_order" class="Sylius\Bundle\AdminApiBundle\Form\Type\OrderType">
             <argument>%sylius.model.order.class%</argument>
             <argument>%sylius.form.type.api_order.validation_groups%</argument>
             <argument type="service" id="sylius.repository.locale" />
             <tag name="form.type" />
         </service>
 
-        <service id="sylius.form.type.api_order_promotion_coupon" class="Sylius\Bundle\ApiBundle\Form\Type\OrderPromotionCouponType">
+        <service id="sylius.form.type.api_order_promotion_coupon" class="Sylius\Bundle\AdminApiBundle\Form\Type\OrderPromotionCouponType">
             <argument>%sylius.model.order.class%</argument>
             <argument>%sylius.form.type.api_order.validation_groups%</argument>
             <tag name="form.type" />
         </service>
 
-        <service id="sylius.form.type.api_customer" class="Sylius\Bundle\ApiBundle\Form\Type\CustomerProfileType">
+        <service id="sylius.form.type.api_customer" class="Sylius\Bundle\AdminApiBundle\Form\Type\CustomerProfileType">
             <argument>%sylius.model.customer.class%</argument>
             <argument>%sylius.form.type.api_customer.validation_groups%</argument>
             <tag name="form.type" />
         </service>
 
-        <service id="sylius.form.type.api_product" class="Sylius\Bundle\ApiBundle\Form\Type\ProductType">
+        <service id="sylius.form.type.api_product" class="Sylius\Bundle\AdminApiBundle\Form\Type\ProductType">
             <tag name="form.type" />
         </service>
 
-        <service id="sylius.form.type.api_product_variant" class="Sylius\Bundle\ApiBundle\Form\Type\ProductVariantType">
+        <service id="sylius.form.type.api_product_variant" class="Sylius\Bundle\AdminApiBundle\Form\Type\ProductVariantType">
             <tag name="form.type" />
         </service>
 
-        <service id="sylius.form.type.api_checkout_address" class="Sylius\Bundle\ApiBundle\Form\Type\AddressType">
+        <service id="sylius.form.type.api_checkout_address" class="Sylius\Bundle\AdminApiBundle\Form\Type\AddressType">
             <tag name="form.type" />
         </service>
 
-        <service id="sylius.form.extension.type.api_order_item" class="Sylius\Bundle\ApiBundle\Form\Type\OrderItemType">
+        <service id="sylius.form.extension.type.api_order_item" class="Sylius\Bundle\AdminApiBundle\Form\Type\OrderItemType">
             <argument type="service" id="sylius.repository.product_variant" />
             <tag name="form.type" />
         </service>
-        <service id="sylius.form.type.api_order_item" class="Sylius\Bundle\ApiBundle\Form\Type\OrderItemType">
+        <service id="sylius.form.type.api_order_item" class="Sylius\Bundle\AdminApiBundle\Form\Type\OrderItemType">
             <argument type="service" id="sylius.repository.product_variant" />
             <tag name="form.type" />
         </service>

src/Sylius/Bundle/AdminApiBundle/SyliusAdminApiBundle.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle;
+namespace Sylius\Bundle\AdminApiBundle;
 
 use Sylius\Bundle\ResourceBundle\AbstractResourceBundle;
 use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
@@ -17,7 +17,7 @@ use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
 /**
  * @author Paweł Jędrzejewski <pawel@sylius.org>
  */
-final class SyliusApiBundle extends AbstractResourceBundle
+final class SyliusAdminApiBundle extends AbstractResourceBundle
 {
     /**
      * {@inheritdoc}
@@ -34,6 +34,6 @@ final class SyliusApiBundle extends AbstractResourceBundle
      */
     protected function getModelNamespace()
     {
-        return 'Sylius\Bundle\ApiBundle\Model';
+        return 'Sylius\Bundle\AdminApiBundle\Model';
     }
 }

src/Sylius/Bundle/AdminApiBundle/Tests/Fixture/ApiAccessTokenFixtureTest.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Tests\Fixture;
+namespace Sylius\Bundle\AdminApiBundle\Tests\Fixture;
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
-use Sylius\Bundle\ApiBundle\Fixture\ApiAccessTokenFixture;
+use Sylius\Bundle\AdminApiBundle\Fixture\ApiAccessTokenFixture;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 
 /**

src/Sylius/Bundle/AdminApiBundle/Tests/Fixture/ApiCredentialsFixtureTest.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\ApiBundle\Tests\Fixture;
+namespace Sylius\Bundle\AdminApiBundle\Tests\Fixture;
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
-use Sylius\Bundle\ApiBundle\Fixture\ApiClientFixture;
+use Sylius\Bundle\AdminApiBundle\Fixture\ApiClientFixture;
 
 /**
  * @author Łukasz Chruściel <lukasz.chrusciel@lakion.com>

src/Sylius/Bundle/AdminApiBundle/composer.json

@@ -38,10 +38,10 @@
         "bin-dir": "bin"
     },
     "autoload": {
-        "psr-4": { "Sylius\\Bundle\\ApiBundle\\": "" }
+        "psr-4": { "Sylius\\Bundle\\AdminApiBundle\\": "" }
     },
     "autoload-dev": {
-        "psr-4": { "Sylius\\Bundle\\ApiBundle\\spec\\": "spec/" }
+        "psr-4": { "Sylius\\Bundle\\AdminApiBundle\\spec\\": "spec/" }
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

src/Sylius/Bundle/AdminApiBundle/phpspec.yml.dist

@@ -0,0 +1,5 @@
+suites:
+    main:
+        namespace: Sylius\Bundle\AdminApiBundle
+        psr4_prefix: Sylius\Bundle\AdminApiBundle
+        src_path: .

src/Sylius/Bundle/AdminApiBundle/spec/Command/CreateClientCommandSpec.php

@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace spec\Sylius\Bundle\ApiBundle\Command;
+namespace spec\Sylius\Bundle\AdminApiBundle\Command;
 
 use FOS\OAuthServerBundle\Model\ClientManager;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Sylius\Bundle\ApiBundle\Model\Client;
-use Sylius\Bundle\ApiBundle\Command\CreateClientCommand;
+use Sylius\Bundle\AdminApiBundle\Model\Client;
+use Sylius\Bundle\AdminApiBundle\Command\CreateClientCommand;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

src/Sylius/Bundle/AdminApiBundle/spec/EventListener/CartChangeListenerSpec.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace spec\Sylius\Bundle\ApiBundle\EventListener;
+namespace spec\Sylius\Bundle\AdminApiBundle\EventListener;
 
 use Doctrine\Common\Persistence\ObjectManager;
 use PhpSpec\ObjectBehavior;
-use Sylius\Bundle\ApiBundle\EventListener\CartChangeListener;
+use Sylius\Bundle\AdminApiBundle\EventListener\CartChangeListener;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\OrderItemInterface;
 use Sylius\Component\Order\Processor\OrderProcessorInterface;