github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-04 00:03:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bubble up exception for invalid confirmation token

Browse Source 
This way, the error handler can simply be amended to deal with this
exception type with a dedicated error message or page.

Refs #1337.
Closes #1528.
This commit is contained in:
Franz Liedke 2019-08-14 19:45:54 +02:00 committed by Daniël Klabbers
parent 6e089c12d4
commit 5d768db6d2
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Forum/Controller/ConfirmEmailController.php
View File

@ -12,13 +12,11 @@ namespace Flarum\Forum\Controller;
use Flarum\Foundation\Application; use Flarum\Foundation\Application;
use Flarum\Http\SessionAuthenticator; use Flarum\Http\SessionAuthenticator;
use Flarum\User\Command\ConfirmEmail; use Flarum\User\Command\ConfirmEmail;
use Flarum\User\Exception\InvalidConfirmationTokenException;
use Illuminate\Contracts\Bus\Dispatcher; use Illuminate\Contracts\Bus\Dispatcher;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Server\RequestHandlerInterface; use Psr\Http\Server\RequestHandlerInterface;
use Zend\Diactoros\Response\HtmlResponse;
use Zend\Diactoros\Response\RedirectResponse; use Zend\Diactoros\Response\RedirectResponse;
class ConfirmEmailController implements RequestHandlerInterface class ConfirmEmailController implements RequestHandlerInterface
@ -56,15 +54,11 @@ class ConfirmEmailController implements RequestHandlerInterface
*/ */
public function handle(Request $request): ResponseInterface public function handle(Request $request): ResponseInterface
{ {
try { $token = Arr::get($request->getQueryParams(), 'token');
$token = Arr::get($request->getQueryParams(), 'token');
$user = $this->bus->dispatch( $user = $this->bus->dispatch(
new ConfirmEmail($token) new ConfirmEmail($token)
); );
} catch (InvalidConfirmationTokenException $e) {
return new HtmlResponse('Invalid confirmation token');
}
$session = $request->getAttribute('session'); $session = $request->getAttribute('session');
$this->authenticator->logIn($session, $user->id); $this->authenticator->logIn($session, $user->id);