use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\JsonResponse;
use Wallabag\UserBundle\Entity\User;
+use Wallabag\ApiBundle\Entity\Client;
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)"}
* }
* )
*
->setStatusCode(JsonResponse::HTTP_BAD_REQUEST);
}
+ // create a default client
+ $client = new Client($user);
+ $client->setName($request->request->get('client_name', 'Default client'));
+
+ $this->getDoctrine()->getManager()->persist($client);
+
+ $user->addClient($client);
+
$userManager->updateUser($user);
// dispatch a created event so the associated config will be created
$event = new UserEvent($user, $request);
$this->get('event_dispatcher')->dispatch(FOSUserEvents::USER_CREATED, $event);
- return $this->sendUser($user, JsonResponse::HTTP_CREATED);
+ return $this->sendUser($user, 'user_api_with_client', JsonResponse::HTTP_CREATED);
}
/**
* Send user response.
*
- * @param User $user
- * @param int $status HTTP Status code to send
+ * @param User $user
+ * @param string $group Used to define with serialized group might be used
+ * @param int $status HTTP Status code to send
*
* @return JsonResponse
*/
- private function sendUser(User $user, $status = JsonResponse::HTTP_OK)
+ private function sendUser(User $user, $group = 'user_api', $status = JsonResponse::HTTP_OK)
{
$json = $this->get('serializer')->serialize(
$user,
'json',
- SerializationContext::create()->setGroups(['user_api'])
+ SerializationContext::create()->setGroups([$group])
);
return (new JsonResponse())
use Doctrine\ORM\Mapping as ORM;
use FOS\OAuthServerBundle\Entity\Client as BaseClient;
use Wallabag\UserBundle\Entity\User;
+use JMS\Serializer\Annotation\Groups;
+use JMS\Serializer\Annotation\SerializedName;
+use JMS\Serializer\Annotation\VirtualProperty;
/**
* @ORM\Table("oauth2_clients")
* @var string
*
* @ORM\Column(name="name", type="text", nullable=false)
+ *
+ * @Groups({"user_api_with_client"})
*/
protected $name;
*/
protected $accessTokens;
+ /**
+ * @var string
+ *
+ * @SerializedName("client_secret")
+ * @Groups({"user_api_with_client"})
+ */
+ protected $secret;
+
/**
* @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="clients")
*/
{
return $this->user;
}
+
+ /**
+ * @VirtualProperty
+ * @SerializedName("client_id")
+ * @Groups({"user_api_with_client"})
+ */
+ public function getClientId()
+ {
+ return $this->getId().'_'.$this->getRandomId();
+ }
}
<table class="striped">
<tr>
<td>{{ 'developer.existing_clients.field_id'|trans }}</td>
- <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td>
+ <td><strong><code>{{ client.clientId }}</code></strong></td>
</tr>
<tr>
<td>{{ 'developer.existing_clients.field_secret'|trans }}</td>
use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation\Groups;
use JMS\Serializer\Annotation\XmlRoot;
+use JMS\Serializer\Annotation\Accessor;
use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface;
use Scheb\TwoFactorBundle\Model\TrustedComputerInterface;
use FOS\UserBundle\Model\User as BaseUser;
* @ORM\Id
* @ORM\GeneratedValue(strategy="AUTO")
*
- * @Groups({"user_api"})
+ * @Groups({"user_api", "user_api_with_client"})
*/
protected $id;
*
* @ORM\Column(name="name", type="text", nullable=true)
*
- * @Groups({"user_api"})
+ * @Groups({"user_api", "user_api_with_client"})
*/
protected $name;
/**
* @var string
*
- * @Groups({"user_api"})
+ * @Groups({"user_api", "user_api_with_client"})
*/
protected $username;
/**
* @var string
*
- * @Groups({"user_api"})
+ * @Groups({"user_api", "user_api_with_client"})
*/
protected $email;
*
* @ORM\Column(name="created_at", type="datetime")
*
- * @Groups({"user_api"})
+ * @Groups({"user_api", "user_api_with_client"})
*/
protected $createdAt;
*
* @ORM\Column(name="updated_at", type="datetime")
*
- * @Groups({"user_api"})
+ * @Groups({"user_api", "user_api_with_client"})
*/
protected $updatedAt;
private $authCode;
/**
- * @var bool Enabled yes/no
+ * @var bool
+ *
* @ORM\Column(type="boolean")
*/
private $twoFactorAuthentication = false;
private $trusted;
/**
+ * @var ArrayCollection
+ *
* @ORM\OneToMany(targetEntity="Wallabag\ApiBundle\Entity\Client", mappedBy="user", cascade={"remove"})
*/
protected $clients;
+ /**
+ * @see getFirstClient() below
+ *
+ * @Groups({"user_api_with_client"})
+ * @Accessor(getter="getFirstClient")
+ */
+ protected $default_client;
+
public function __construct()
{
parent::__construct();
{
return $this->clients;
}
+
+ /**
+ * Only used by the API when creating a new user it'll also return the first client (which was also created at the same time).
+ *
+ * @return Client
+ */
+ public function getFirstClient()
+ {
+ if (!empty($this->clients)) {
+ return $this->clients->first();
+ }
+ }
}
'text' => 'my annotation',
'quote' => 'my quote',
'ranges' => [
- ['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31]
+ ['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31],
],
]);
$this->client->request('POST', $prefixUrl.'/'.$entry->getId().'.json', [], [], $headers, $content);
'text' => 'my annotation',
'quote' => $longQuote,
'ranges' => [
- ['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31]
+ ['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31],
],
]);
$this->client->request('POST', $prefixUrl.'/'.$entry->getId().'.json', [], [], $headers, $content);
$this->assertArrayHasKey('username', $content);
$this->assertArrayHasKey('created_at', $content);
$this->assertArrayHasKey('updated_at', $content);
+ $this->assertArrayHasKey('default_client', $content);
$this->assertEquals('wallabag@google.com', $content['email']);
$this->assertEquals('google', $content['username']);
+ $this->assertArrayHasKey('client_secret', $content['default_client']);
+ $this->assertArrayHasKey('client_id', $content['default_client']);
+
+ $this->assertEquals('Default client', $content['default_client']['name']);
+
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
$this->client->getContainer()->get('craue_config')->set('api_user_registration', 0);
'username' => 'google',
'password' => 'googlegoogle',
'email' => 'wallabag@google.com',
+ 'client_name' => 'My client name !!',
]);
$this->assertEquals(201, $client->getResponse()->getStatusCode());
$this->assertArrayHasKey('username', $content);
$this->assertArrayHasKey('created_at', $content);
$this->assertArrayHasKey('updated_at', $content);
+ $this->assertArrayHasKey('default_client', $content);
$this->assertEquals('wallabag@google.com', $content['email']);
$this->assertEquals('google', $content['username']);
+ $this->assertArrayHasKey('client_secret', $content['default_client']);
+ $this->assertArrayHasKey('client_id', $content['default_client']);
+
+ $this->assertEquals('My client name !!', $content['default_client']['name']);
+
$this->assertEquals('application/json', $client->getResponse()->headers->get('Content-Type'));
$client->getContainer()->get('craue_config')->set('api_user_registration', 0);
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
-use Wallabag\CoreBundle\Command\CleanDuplicatesCommand;
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
use Wallabag\CoreBundle\Command\ShowUserCommand;
-use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\UserBundle\Entity\User;
class ShowUserCommandTest extends WallabagCoreTestCase
projects / github / wallabag / wallabag.git / commitdiff
