Add ability to name the client

diff --git a/src/Wallabag/ApiBundle/Controller/UserRestController.php b/src/Wallabag/ApiBundle/Controller/UserRestController.php
index becbbb9ef4c0d77f5f024fe06cef1ba81e885f47..7471f5f62bea79c1d211fd9d1a926dfb2cb42701 100644 (file)
--- a/src/Wallabag/ApiBundle/Controller/UserRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/UserRestController.php
@@ -28,13 +28,14 @@ class UserRestController extends WallabagRestController
     }
 
     /**
-     * Register an user.
+     * Register an user and create a client.
      *
      * @ApiDoc(
      *      requirements={
      *          {"name"="username", "dataType"="string", "required"=true, "description"="The user's username"},
      *          {"name"="password", "dataType"="string", "required"=true, "description"="The user's password"},
-     *          {"name"="email", "dataType"="string", "required"=true, "description"="The user's email"}
+     *          {"name"="email", "dataType"="string", "required"=true, "description"="The user's email"},
+     *          {"name"="client_name", "dataType"="string", "required"=true, "description"="The client name (to be used by your app)"}
      *      }
      * )
      *
@@ -100,7 +101,7 @@ class UserRestController extends WallabagRestController
 
         // create a default client
         $client = new Client($user);
-        $client->setName('Default client');
+        $client->setName($request->request->get('client_name', 'Default client'));
 
         $this->getDoctrine()->getManager()->persist($client);
 

diff --git a/tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php
index 9f01a976020b7e7e6a1d0a4c2ea008de87df6a12..4e65f130ea4d58cd63486f7cd4d5f516dae760e7 100644 (file)
--- a/tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php
@@ -85,6 +85,7 @@ class UserRestControllerTest extends WallabagApiTestCase
             'username' => 'google',
             'password' => 'googlegoogle',
             'email' => 'wallabag@google.com',
+            'client_name' => 'My client name !!',
         ]);
 
         $this->assertEquals(201, $client->getResponse()->getStatusCode());
@@ -104,7 +105,7 @@ class UserRestControllerTest extends WallabagApiTestCase
         $this->assertArrayHasKey('client_secret', $content['default_client']);
         $this->assertArrayHasKey('client_id', $content['default_client']);
 
-        $this->assertEquals('Default client', $content['default_client']['name']);
+        $this->assertEquals('My client name !!', $content['default_client']['name']);
 
         $this->assertEquals('application/json', $client->getResponse()->headers->get('Content-Type'));