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

Fix login

Browse Source 
We cannot write to an empty response.
This commit is contained in:
Franz Liedke 2015-07-01 22:45:14 +02:00
parent 1e640ba632
commit ba776bb20f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ use Flarum\Forum\Events\UserLoggedIn;
use Flarum\Core\Repositories\UserRepositoryInterface; use Flarum\Core\Repositories\UserRepositoryInterface;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
use Zend\Diactoros\Response\EmptyResponse; use Zend\Diactoros\Response\EmptyResponse;
use Zend\Diactoros\Response\JsonResponse;
class LoginAction extends BaseAction class LoginAction extends BaseAction
{ {
@ -32,11 +33,8 @@ class LoginAction extends BaseAction
if (isset($data->userId)) { if (isset($data->userId)) {
event(new UserLoggedIn($this->users->findOrFail($data->userId), $data->token)); event(new UserLoggedIn($this->users->findOrFail($data->userId), $data->token));
$response = $this->success();
$response->getBody()->write(json_encode($data));
return $this->withRememberCookie( return $this->withRememberCookie(
$response, new JsonResponse($data),
$data->token $data->token
); );
} else { } else {