github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-21 11:37:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update TokenAction for new architecture

Browse Source
This commit is contained in:
Toby Zerner 2015-05-04 10:30:56 +09:30
parent c43d1c6335
commit 2e80cbd8a7
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
framework/core/src/Api/Actions/TokenAction.php
View File

@ -1,15 +1,17 @@
<?php namespace Flarum\Api\Actions;
use Illuminate\Http\JsonResponse;
use Illuminate\Contracts\Bus\Dispatcher;
use Flarum\Api\Request;
use Flarum\Core\Commands\GenerateAccessTokenCommand;
use Flarum\Core\Repositories\UserRepositoryInterface;
use Flarum\Api\Actions\BaseAction;
use Illuminate\Http\JsonResponse;
use Illuminate\Contracts\Bus\Dispatcher;
class TokenAction extends BaseAction
class TokenAction implements ActionInterface
{
protected $users;
protected $bus;
public function __construct(UserRepositoryInterface $users, Dispatcher $bus)
{
$this->users = $users;
@ -19,21 +21,25 @@ class TokenAction extends BaseAction
/**
* Log in and return a token.
*
* @return Response
* @param \Flarum\Api\Request $request
* @return \Flarum\Api\Response
*/
public function run(ApiParams $params)
public function handle(Request $request)
{
$identification = $params->get('identification');
$password = $params->get('password');
$identification = $request->get('identification');
$password = $request->get('password');
$user = $this->users->findByIdentification($identification);
if (! $user || ! $user->checkPassword($password)) {
return $this->respondWithError('invalidCredentials', 401);
return;
// throw an exception
// return $this->respondWithError('invalidCredentials', 401);
}
$command = new GenerateAccessTokenCommand($user->id);
$token = $this->dispatch($command, $params);
$token = $this->bus->dispatch(
new GenerateAccessTokenCommand($user->id)
);
return new JsonResponse([
'token' => $token->id,

2
framework/core/src/Api/Request.php
View File

@ -11,7 +11,7 @@ class Request
public $http;
public function __construct(array $input, Actor $actor, IlluminateRequest $http = null)
public function __construct(array $input, Actor $actor = null, IlluminateRequest $http = null)
{
$this->input = $input;
$this->actor = $actor;

4
framework/core/src/Forum/Actions/LoginAction.php
View File

@ -3,6 +3,7 @@
use Illuminate\Http\Request;
use Flarum\Forum\Events\UserLoggedIn;
use Flarum\Core\Repositories\UserRepositoryInterface;
use Flarum\Api\Request as ApiRequest;
class LoginAction extends BaseAction
{
@ -17,7 +18,8 @@ class LoginAction extends BaseAction
public function handle(Request $request, $routeParams = [])
{
$response = $this->callAction('Flarum\Api\Actions\TokenAction', $request->only('identification', 'password'));
$response = app('Flarum\Api\Actions\TokenAction')
->handle(new ApiRequest($request->only('identification', 'password')));
$data = $response->getData();
if (! empty($data->token)) {