Merge pull request #2351 from wallabag/fix-api-client-deletion

Changed relation between API client and refresh token

diff --git a/app/config/routing.yml b/app/config/routing.yml
index 2be74d7f08fcc46d960e193f3098e2405bcf58e0..750ed43568657bfa1b7b3a43988bac3b5e9f1f09 100644 (file)
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -12,6 +12,11 @@ wallabag_user:
     type: annotation
     prefix: /users
 
+wallabag_api:
+    resource: "@WallabagApiBundle/Controller/"
+    type: annotation
+    prefix: /
+
 wallabag_api:
     resource: "@WallabagApiBundle/Resources/config/routing.yml"
     prefix: /

diff --git a/src/Wallabag/CoreBundle/Controller/DeveloperController.php b/src/Wallabag/ApiBundle/Controller/DeveloperController.php
similarity index 97%
rename from src/Wallabag/CoreBundle/Controller/DeveloperController.php
rename to src/Wallabag/ApiBundle/Controller/DeveloperController.php
index f3492b74e77831ec1ad280596d0d74b99fcf489f..5a36a2605595f6e2503a06ab8e493ae0967df544 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/DeveloperController.php
+++ b/src/Wallabag/ApiBundle/Controller/DeveloperController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\ApiBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Wallabag\ApiBundle\Entity\Client;
-use Wallabag\CoreBundle\Form\Type\ClientType;
+use Wallabag\ApiBundle\Form\Type\ClientType;
 
 class DeveloperController extends Controller
 {

diff --git a/src/Wallabag/ApiBundle/Entity/Client.php b/src/Wallabag/ApiBundle/Entity/Client.php
index 3e2f491c012ad94e43609dad08ce4ea6b0a335ed..f7898ac82852292835175581a2ea0b797738ed1d 100644 (file)
--- a/src/Wallabag/ApiBundle/Entity/Client.php
+++ b/src/Wallabag/ApiBundle/Entity/Client.php
@@ -25,6 +25,16 @@ class Client extends BaseClient
      */
     protected $name;
 
+    /**
+     * @ORM\OneToMany(targetEntity="RefreshToken", mappedBy="client", cascade={"remove"})
+     */
+    protected $refreshTokens;
+
+    /**
+     * @ORM\OneToMany(targetEntity="AccessToken", mappedBy="client", cascade={"remove"})
+     */
+    protected $accessTokens;
+
     public function __construct()
     {
         parent::__construct();

diff --git a/src/Wallabag/CoreBundle/Form/Type/ClientType.php b/src/Wallabag/ApiBundle/Form/Type/ClientType.php
similarity index 97%
rename from src/Wallabag/CoreBundle/Form/Type/ClientType.php
rename to src/Wallabag/ApiBundle/Form/Type/ClientType.php
index d1fa94e6c314b548b85650a4aaa119ec25f37bbe..0ea1a9c5c6469c60c4126ba5773cf1172d4a7894 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/ClientType.php
+++ b/src/Wallabag/ApiBundle/Form/Type/ClientType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Form\Type;
+namespace Wallabag\ApiBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;

diff --git a/tests/Wallabag/CoreBundle/Controller/DeveloperControllerTest.php b/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
similarity index 72%
rename from tests/Wallabag/CoreBundle/Controller/DeveloperControllerTest.php
rename to tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
index 97ed0d58fa01ce99abfd65bf2f0163344e582a59..95befa9cab2f4fe2502b7776a784c8d022d62905 100644 (file)
--- a/tests/Wallabag/CoreBundle/Controller/DeveloperControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\ApiBundle\Controller;
 
 use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
@@ -33,6 +33,32 @@ class DeveloperControllerTest extends WallabagCoreTestCase
         $this->assertContains('My app', $alert[0]);
     }
 
+    /**
+     * @depends testCreateClient
+     */
+    public function testCreateToken()
+    {
+        $client = $this->getClient();
+        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+        $apiClient = $em->getRepository('WallabagApiBundle:Client')->findOneByName('My app');
+
+        $client->request('POST', '/oauth/v2/token', [
+            'grant_type' => 'password',
+            'client_id' => $apiClient->getPublicId(),
+            'client_secret' => $apiClient->getSecret(),
+            'username' => 'admin',
+            'password' => 'mypassword',
+        ]);
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+
+        $data = json_decode($client->getResponse()->getContent(), true);
+        $this->assertArrayHasKey('access_token', $data);
+        $this->assertArrayHasKey('expires_in', $data);
+        $this->assertArrayHasKey('token_type', $data);
+        $this->assertArrayHasKey('refresh_token', $data);
+    }
+
     public function testListingClient()
     {
         $this->logInAs('admin');