From b906dde059b1a83ca79084e3c0b0d908bf063bc6 Mon Sep 17 00:00:00 2001 From: Hugo Sales Date: Sun, 6 Sep 2020 21:38:37 +0000 Subject: [PATCH] [EXCEPTION][UI][UX] Add RedirectException, which can be thrown anywhere to redirect somewhere, and an exception handler --- src/Controller/Network.php | 14 ++++----- src/Controller/Security.php | 16 +++++----- src/Controller/UserPanel.php | 12 ++++---- src/Core/Controller.php | 16 ++++++++++ src/Util/Exception/RedirectException.php | 37 ++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 21 deletions(-) create mode 100644 src/Util/Exception/RedirectException.php diff --git a/src/Controller/Network.php b/src/Controller/Network.php index fbbbd4363b..91c5b871c3 100644 --- a/src/Controller/Network.php +++ b/src/Controller/Network.php @@ -110,27 +110,25 @@ END; public function replies(Request $request) { - $actor_id = Common::ensureLoggedIn()->getActor()->getId(); + $actor_id = Common::ensureLoggedIn()->getId(); return [ '_template' => 'network/public.html.twig', 'notes' => DB::dql('select n from App\Entity\Note n ' . - 'where n.reply_to is not null and n.gsactor_id = ' . $actor_id . - 'order by n.created DESC' - ), + 'where n.reply_to is not null and n.gsactor_id = :id ' . + 'order by n.created DESC', ['id' => $gsactor_id]), ]; } public function favourites(Request $request) { - $actor_id = Common::ensureLoggedIn()->getActor()->getId(); + $actor_id = Common::ensureLoggedIn()->getId(); return [ '_template' => 'network/public.html.twig', 'notes' => DB::dql('select f from App\Entity\Favourite f ' . - 'where f.gsactor_id = ' . $actor_id . - 'order by f.created DESC' - ), + 'where f.gsactor_id = :id ' . + 'order by f.created DESC', ['id' => $gsactor_id]), ]; } } diff --git a/src/Controller/Security.php b/src/Controller/Security.php index c4833632a9..4704a71a19 100644 --- a/src/Controller/Security.php +++ b/src/Controller/Security.php @@ -82,14 +82,16 @@ class Security extends Controller } $actor = GSActor::create(['nickname' => $data['nickname']]); - $user = LocalUser::create([ - 'nickname' => $data['nickname'], - 'email' => $data['email'], - 'password' => LocalUser::hashPassword($data['password']), - ]); - - DB::persist($user); DB::persist($actor); + DB::flush(); + $user = LocalUser::create([ + 'id' => $actor->getId(), + 'nickname' => $data['nickname'], + 'outgoing_email' => $data['email'], + 'incoming_email' => $data['email'], + 'password' => LocalUser::hashPassword($data['password']), + ]); + DB::persist($user); // generate a signed url and email it to the user if (Common::config('site', 'use_email')) { diff --git a/src/Controller/UserPanel.php b/src/Controller/UserPanel.php index 6f6962cffb..8d976e33cf 100644 --- a/src/Controller/UserPanel.php +++ b/src/Controller/UserPanel.php @@ -68,8 +68,8 @@ class UserPanel extends AbstractController public function personal_info(Request $request) { $user = Common::user(); - $actor = $user->getActor(); - $extra = ['self_tags' => $actor->getSelfTags()]; + $user = $user->getActor(); + $extra = ['self_tags' => $user->getSelfTags()]; $form_definition = [ ['nickname', TextType::class, ['label' => _m('Nickname'), 'required' => true, 'help' => _m('1-64 lowercase letters or numbers, no punctuation or spaces.')]], ['full_name', TextType::class, ['label' => _m('Full Name'), 'required' => false, 'help' => _m('A full name is required, if empty it will be set to your nickname.')]], @@ -80,7 +80,7 @@ class UserPanel extends AbstractController ['save', SubmitType::class, ['label' => _m('Save')]], ]; $extra_step = function ($data, $extra_args) use ($user) { $user->setNickname($data['nickname']); }; - $form = Form::handle($form_definition, $request, $actor, $extra, $extra_step, [['self_tags' => $extra['self_tags']]]); + $form = Form::handle($form_definition, $request, $user, $extra, $extra_step, [['self_tags' => $extra['self_tags']]]); return ['_template' => 'settings/profile.html.twig', 'prof' => $form->createView()]; } @@ -136,8 +136,8 @@ class UserPanel extends AbstractController } else { throw new ClientException('Invalid form'); } - $actor = Common::actor(); - $actor_id = $actor->getId(); + $user = Common::user(); + $actor_id = $user->getId(); $file = Media::validateAndStoreFile($sfile, Common::config('avatar', 'dir'), $title = null, $is_local = true, $use_unique = $actor_id); $old_file = null; $avatar = DB::find('avatar', ['gsactor_id' => $actor_id]); @@ -154,7 +154,7 @@ class UserPanel extends AbstractController if ($old_file != null) { @unlink($old_file); } - Event::handle('delete_cached_avatar', [$actor->getNickname()]); + Event::handle('delete_cached_avatar', [$user->getNickname()]); } return ['_template' => 'settings/avatar.html.twig', 'avatar' => $form->createView()]; diff --git a/src/Core/Controller.php b/src/Core/Controller.php index dd154efa17..4db979c761 100644 --- a/src/Core/Controller.php +++ b/src/Core/Controller.php @@ -30,11 +30,14 @@ namespace App\Core; +use App\Util\Exception\RedirectException; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Event\ControllerEvent; +use Symfony\Component\HttpKernel\Event\ExceptionEvent; use Symfony\Component\HttpKernel\Event\ViewEvent; use Symfony\Component\HttpKernel\KernelEvents; @@ -95,10 +98,23 @@ class Controller extends AbstractController implements EventSubscriberInterface return $event; } + public function onKernelException(ExceptionEvent $event) + { + if (($except = $event->getThrowable()) instanceof RedirectException) { + if (($redir = $except->redirect_response) != null) { + $event->setResponse($redir); + } else { + $event->setResponse(new RedirectResponse($event->getRequest()->getPathInfo())); + } + } + return $event; + } + public static function getSubscribedEvents() { return [ KernelEvents::CONTROLLER => 'onKernelController', + KernelEvents::EXCEPTION => 'onKernelException', KernelEvents::VIEW => 'onKernelView', ]; } diff --git a/src/Util/Exception/RedirectException.php b/src/Util/Exception/RedirectException.php new file mode 100644 index 0000000000..a461dabf2b --- /dev/null +++ b/src/Util/Exception/RedirectException.php @@ -0,0 +1,37 @@ +. +// }}} + +namespace App\Util\Exception; + +use App\Core\Router\Router; +use Exception; +use Symfony\Component\HttpFoundation\RedirectResponse; + +class RedirectException extends Exception +{ + public ?RedirectResponse $redirect_response = null; + + public function __construct(string $url_id = '', $message = '', $code = 302, Exception $previous_exception = null) + { + if (!empty($url_id)) { + $this->redirect_response = new RedirectResponse(Router::url($urlid)); + } + parent::__construct($message, $code, $previous_exception); + } +}