Chore/dependencies

src/Application.php

@@ -101,9 +101,9 @@ private function initApp(Request $request): void
             'controller_namespace' => '\\taust\\controllers',
         ]);
 
-        if (!utils\CurrentUser::currentId()) {
+        if (!auth\CurrentUser::currentId()) {
             $user_id = $request->cookies->getString('taust_session', '');
-            utils\CurrentUser::set($user_id);
+            auth\CurrentUser::set($user_id);
         }
 
         $available_locales = utils\Locale::availableLocales();
@@ -123,7 +123,7 @@ private function initApp(Request $request): void
             'environment' => \Minz\Configuration::$environment,
             'errors' => [],
             'error' => null,
-            'current_user' => utils\CurrentUser::get(),
+            'current_user' => auth\CurrentUser::get(),
             'current_locale' => $locale,
             'navigation_active' => null,
             'is_app_page' => $page !== null,

src/Router.php

@@ -18,9 +18,9 @@ public static function load(): \Minz\Router
         $router->addRoute('GET', '/', 'Dashboard#index', 'home');
         $router->addRoute('POST', '/', 'Metrics#create', 'create metrics');
 
-        $router->addRoute('GET', '/login', 'Auth#login', 'login');
-        $router->addRoute('POST', '/login', 'Auth#createSession', 'create session');
-        $router->addRoute('POST', '/logout', 'Auth#deleteSession', 'logout');
+        $router->addRoute('GET', '/login', 'Authentications#login', 'login');
+        $router->addRoute('POST', '/login', 'Authentications#createSession', 'create session');
+        $router->addRoute('POST', '/logout', 'Authentications#deleteSession', 'logout');
 
         $router->addRoute('GET', '/profile', 'Users#show', 'user');
         $router->addRoute('POST', '/profile', 'Users#update', 'update user');

src/utils/CurrentUser.php → src/auth/CurrentUser.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace taust\utils;
+namespace taust\auth;
 
 use taust\models;
 
@@ -33,6 +33,17 @@ public static function get(): ?models\User
         return self::$instance;
     }
 
+    public static function require(): models\User
+    {
+        $current_user = self::get();
+
+        if (!$current_user) {
+            throw new MissingCurrentUserError();
+        }
+
+        return $current_user;
+    }
+
     public static function set(string $user_id): void
     {
         $_SESSION['current_user_id'] = $user_id;

src/errors/MissingCurrentUserError.php → src/auth/MissingCurrentUserError.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace taust\errors;
+namespace taust\auth;
 
 /**
  * @author Marien Fressinaud <dev@marienfressinaud.fr>

src/controllers/Alarms.php

@@ -4,9 +4,9 @@
 
 use Minz\Request;
 use Minz\Response;
+use taust\auth;
 use taust\forms;
 use taust\models;
-use taust\utils;
 
 /**
  * @author  Marien Fressinaud <dev@marienfressinaud.fr>
@@ -22,7 +22,7 @@ class Alarms extends BaseController
      */
     public function index(Request $request): Response
     {
-        $this->requireCurrentUser();
+        auth\CurrentUser::require();
 
         return Response::ok('alarms/index.phtml', [
             'ongoing_alarms' => models\Alarm::listOngoingOrderByDescCreatedAt(),
@@ -44,10 +44,9 @@ public function index(Request $request): Response
      */
     public function finish(Request $request): Response
     {
-        $this->requireCurrentUser();
+        auth\CurrentUser::require();
 
-        $id = $request->parameters->getString('id', '');
-        $alarm = models\Alarm::require($id);
+        $alarm = models\Alarm::requireFromRequest($request);
         $from = $request->parameters->getString('from', '');
 
         $form = new forms\BaseForm();

src/controllers/Announcements.php

@@ -4,9 +4,9 @@
 
 use Minz\Request;
 use Minz\Response;
+use taust\auth;
 use taust\forms;
 use taust\models;
-use taust\utils;
 
 class Announcements extends BaseController
 {
@@ -20,8 +20,7 @@ class Announcements extends BaseController
      */
     public function show(Request $request): Response
     {
-        $id = $request->parameters->getString('id', '');
-        $announcement = models\Announcement::require($id);
+        $announcement = models\Announcement::requireFromRequest($request);
 
         return Response::ok('announcements/show.phtml', [
             'announcement' => $announcement,
@@ -40,10 +39,9 @@ public function show(Request $request): Response
      */
     public function edit(Request $request): Response
     {
-        $this->requireCurrentUser();
+        auth\CurrentUser::require();
 
-        $id = $request->parameters->getString('id', '');
-        $announcement = models\Announcement::require($id);
+        $announcement = models\Announcement::requireFromRequest($request);
 
         return Response::ok('announcements/edit.phtml', [
             'announcement' => $announcement,
@@ -71,10 +69,9 @@ public function edit(Request $request): Response
      */
     public function update(Request $request): Response
     {
-        $this->requireCurrentUser();
+        auth\CurrentUser::require();
 
-        $id = $request->parameters->getString('id', '');
-        $announcement = models\Announcement::require($id);
+        $announcement = models\Announcement::requireFromRequest($request);
 
         $form = new forms\Announcement(model: $announcement);
         $form->handleRequest($request);
@@ -108,10 +105,9 @@ public function update(Request $request): Response
      */
     public function updateStatus(Request $request): Response
     {
-        $this->requireCurrentUser();
+        auth\CurrentUser::require();
 
-        $id = $request->parameters->getString('id', '');
-        $announcement = models\Announcement::require($id);
+        $announcement = models\Announcement::requireFromRequest($request);
 
         $form = new forms\AnnouncementStatus(model: $announcement);
         $form->handleRequest($request);
@@ -139,10 +135,9 @@ public function updateStatus(Request $request): Response
      */
     public function delete(Request $request): Response
     {
-        $this->requireCurrentUser();
+        auth\CurrentUser::require();
 
-        $id = $request->parameters->getString('id', '');
-        $announcement = models\Announcement::require($id);
+        $announcement = models\Announcement::requireFromRequest($request);
 
         $page_id = $announcement->page_id;