mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-22 17:11:07 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
Changed relation between API client and refresh token
This commit is contained in:
Nicolas Lœuillet 2016-10-08 13:31:54 +02:00 committed by GitHub
commit 93a95c09bf
5 changed files with 45 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/config/routing.yml
View file

@ -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: /

4
src/Wallabag/CoreBundle/Controller/DeveloperController.php → src/Wallabag/ApiBundle/Controller/DeveloperController.php
View file

@ -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
{

10
src/Wallabag/ApiBundle/Entity/Client.php
View file

@ -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();

2
src/Wallabag/CoreBundle/Form/Type/ClientType.php → src/Wallabag/ApiBundle/Form/Type/ClientType.php
View file

@ -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;

28
tests/Wallabag/CoreBundle/Controller/DeveloperControllerTest.php → tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
View file

@ -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');