mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-17 05:06:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3267 from wallabag/revert-client-credentials

Browse source 
Revert client_credentials grant types
This commit is contained in:
Jérémy Benoist 2017-07-09 21:22:28 +02:00 committed by GitHub
commit 337e807297
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/ApiBundle/Controller/DeveloperController.php
View file

@ -43,7 +43,7 @@ class DeveloperController extends Controller
$clientForm->handleRequest($request); $clientForm->handleRequest($request);
if ($clientForm->isSubmitted() && $clientForm->isValid()) { if ($clientForm->isSubmitted() && $clientForm->isValid()) {
$client->setAllowedGrantTypes(['client_credentials', 'token', 'authorization_code', 'password', 'refresh_token']); $client->setAllowedGrantTypes(['token', 'authorization_code', 'password', 'refresh_token']);
$em->persist($client); $em->persist($client);
$em->flush(); $em->flush();

22
tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
View file

@ -34,7 +34,7 @@ class DeveloperControllerTest extends WallabagCoreTestCase
$this->assertContains('My app', $alert[0]); $this->assertContains('My app', $alert[0]);
} }
public function testCreateTokenFromPasswords() public function testCreateToken()
{ {
$client = $this->getClient(); $client = $this->getClient();
$apiClient = $this->createApiClientForUser('admin'); $apiClient = $this->createApiClientForUser('admin');
@ -56,26 +56,6 @@ class DeveloperControllerTest extends WallabagCoreTestCase
$this->assertArrayHasKey('refresh_token', $data); $this->assertArrayHasKey('refresh_token', $data);
} }
public function testCreateTokenFromClientCredentialsOnly()
{
$client = $this->getClient();
$apiClient = $this->createApiClientForUser('admin', ['client_credentials']);
$client->request('POST', '/oauth/v2/token', [
'grant_type' => 'client_credentials',
'client_id' => $apiClient->getPublicId(),
'client_secret' => $apiClient->getSecret(),
]);
$this->assertSame(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);
// Client Credentials created-clients have no refresh tokens
}
public function testListingClient() public function testListingClient()
{ {
$this->logInAs('admin'); $this->logInAs('admin');