Merge pull request 'remove unnecessary use in web.php' (!60) from bugfix/remove-unnecessary-use into develop

Reviewed-on: #60

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "esoko/soko-web": "0.1",
+    "esoko/soko-web": "0.4",
     "fzaninotto/faker": "^1.9"
   },
   "require-dev": {

composer.lock

@@ -4,15 +4,15 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4c91d823e927375028a2b3c9d974a8bd",
+    "content-hash": "5e355d5efeb34e7e0ad2a69b1ec109d6",
     "packages": [
         {
             "name": "esoko/soko-web",
-            "version": "v0.1",
+            "version": "v0.4",
             "source": {
                 "type": "git",
                 "url": "https://git.esoko.eu/esoko/soko-web.git",
-                "reference": "a17a88e9d44e42cef3d996fc66b4dd1134b85def"
+                "reference": "948b36c80d324e07339a543d97b9e629487f3a45"
             },
             "require": {
                 "phpmailer/phpmailer": "^6.8",
@@ -33,7 +33,7 @@
                 "GNU GPL 3.0"
             ],
             "description": "Lightweight web framework",
-            "time": "2023-04-07T17:32:15+00:00"
+            "time": "2023-04-16T18:52:06+00:00"
         },
         {
             "name": "fzaninotto/faker",

docker-compose.yml

@@ -29,6 +29,12 @@ services:
             MYSQL_DATABASE: 'mapguesser'
             MYSQL_USER: 'mapguesser'
             MYSQL_PASSWORD: 'mapguesser'
+    adminer:
+        image: adminer:4.8.1-standalone
+        ports:
+        - 9090:8080
+        environment:
+            - ADMINER_DEFAULT_SERVER=mariadb
     mail:
         image: marcopas/docker-mailslurper:latest
         ports:

public/index.php

@@ -1,53 +1,3 @@
 <?php
 
 require '../web.php';
-
-$method = strtolower($_SERVER['REQUEST_METHOD']);
-$url = substr($_SERVER['REQUEST_URI'], strlen('/'));
-if (($pos = strpos($url, '?')) !== false) {
-    $url = substr($url, 0, $pos);
-}
-$url = rawurldecode($url);
-
-$match = Container::$routeCollection->match($method, $url == '' ? [] : explode('/', $url));
-
-if ($match !== null) {
-    list($route, $params) = $match;
-
-    Container::$request->setParsedRouteParams($params);
-
-    $handler = $route->getHandler();
-    $controller = new $handler[0](Container::$request);
-
-    if ($controller instanceof SokoWeb\Interfaces\Authorization\ISecured) {
-        $authorized = $controller->authorize();
-    } else {
-        $authorized = true;
-    }
-
-    if ($method === 'post' && Container::$request->post('anti_csrf_token') !== Container::$request->session()->get('anti_csrf_token')) {
-        $content = new SokoWeb\Response\JsonContent(['error' => 'no_valid_anti_csrf_token']);
-        header('Content-Type: text/html; charset=UTF-8', true, 403);
-        $content->render();
-        return;
-    }
-
-    if ($authorized) {
-        $response = call_user_func([$controller, $handler[1]]);
-
-        if ($response instanceof SokoWeb\Interfaces\Response\IContent) {
-            header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
-            $response->render();
-
-            return;
-        } elseif ($response instanceof SokoWeb\Interfaces\Response\IRedirect) {
-            header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
-
-            return;
-        }
-    }
-}
-
-$content = new SokoWeb\Response\HtmlContent('error/404');
-header('Content-Type: text/html; charset=UTF-8', true, 404);
-$content->render();

public/static/js/maps.js

@@ -141,9 +141,7 @@
     if (document.getElementById('challengeButton')) {
         document.getElementById('challengeButton').onclick = function () {
             MapGuesser.showModal('challenge');
-            document.getElementById('createNewChallengeButton').href = '/challenge/new/' + this.dataset.mapId;
             document.getElementById('playMode').style.visibility = 'hidden';
-            
             var timeLimit = document.getElementById('timeLimit').value;
             document.getElementById('timeLimitLabel').innerText = 'Time limit of ' + Util.printTimeForHuman(timeLimit);
         };

src/Controller/GameController.php

@@ -2,7 +2,7 @@
 
 use DateTime;
 use Faker\Factory;
-use SokoWeb\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
 use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Response\HtmlContent;
 use SokoWeb\Response\JsonContent;
@@ -21,7 +21,7 @@ use MapGuesser\Repository\PlaceRepository;
 use MapGuesser\Repository\UserInChallengeRepository;
 use SokoWeb\Response\Redirect;
 
-class GameController implements ISecured
+class GameController implements IAuthenticationRequired
 {
     const NUMBER_OF_ROUNDS = 5;
 
@@ -53,9 +53,9 @@ class GameController implements ISecured
         $this->userInChallengeRepository = new UserInChallengeRepository();
     }
 
-    public function authorize(): bool
+    public function isAuthenticationRequired(): bool
     {
-        return !empty($_ENV['ENABLE_GAME_FOR_GUESTS']) || $this->request->user() !== null;
+        return empty($_ENV['ENABLE_GAME_FOR_GUESTS']);
     }
 
     public function getGame(): IContent

src/Controller/GameFlowController.php

@@ -1,7 +1,7 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use SokoWeb\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
 use SokoWeb\Interfaces\Request\IRequest;
 use MapGuesser\Util\Geo\Position;
 use SokoWeb\Response\JsonContent;
@@ -15,17 +15,14 @@ use MapGuesser\PersistentData\Model\Place;
 use MapGuesser\PersistentData\Model\PlaceInChallenge;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\UserPlayedPlace;
-use MapGuesser\Repository\ChallengeRepository;
 use MapGuesser\Repository\GuessRepository;
-use MapGuesser\Repository\MapRepository;
 use MapGuesser\Repository\MultiRoomRepository;
 use MapGuesser\Repository\PlaceInChallengeRepository;
 use MapGuesser\Repository\PlaceRepository;
 use MapGuesser\Repository\UserInChallengeRepository;
 use MapGuesser\Repository\UserPlayedPlaceRepository;
-use MapGuesser\Repository\UserRepository;
 
-class GameFlowController implements ISecured
+class GameFlowController implements IAuthenticationRequired
 {
     const NUMBER_OF_ROUNDS = 5;
     const MAX_SCORE = 1000;
@@ -61,9 +58,9 @@ class GameFlowController implements ISecured
         $this->guessRepository = new GuessRepository();
     }
 
-    public function authorize(): bool
+    public function isAuthenticationRequired(): bool
     {
-        return !empty($_ENV['ENABLE_GAME_FOR_GUESTS']) || $this->request->user() !== null;
+        return empty($_ENV['ENABLE_GAME_FOR_GUESTS']);
     }
 
     public function initialData(): IContent

src/Controller/LoginController.php

@@ -36,6 +36,8 @@ class LoginController
 
     private UserPlayedPlaceRepository $userPlayedPlaceRepository;
 
+    private string $redirectUrl;
+
     public function __construct(IRequest $request)
     {
         $this->request = $request;
@@ -44,15 +46,19 @@ class LoginController
         $this->userConfirmationRepository = new UserConfirmationRepository();
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
         $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
+        $this->redirectUrl = $this->request->session()->has('redirect_after_login') ?
+            $this->request->session()->get('redirect_after_login') :
+            \Container::$routeCollection->getRoute('index')->generateLink();
     }
 
     public function getLoginForm()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        return new HtmlContent('login/login');
+        return new HtmlContent('login/login', ['redirectUrl' => $this->redirectUrl]);
     }
 
     public function getGoogleLoginRedirect(): IRedirect
@@ -66,7 +72,7 @@ class LoginController
         $oAuth = new GoogleOAuth(new Request());
         $url = $oAuth->getDialogUrl(
             $state,
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('login-google-action')->generateLink(),
+            $this->request->getBase() . \Container::$routeCollection->getRoute('login-google-action')->generateLink(),
             $nonce
         );
 
@@ -76,7 +82,8 @@ class LoginController
     public function getSignupForm()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         if ($this->request->session()->has('tmp_user_data')) {
@@ -98,7 +105,8 @@ class LoginController
     public function getSignupWithGoogleForm()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         if (!$this->request->session()->has('google_user_data')) {
@@ -109,13 +117,14 @@ class LoginController
 
         $user = $this->userRepository->getByEmail($userData['email']);
 
-        return new HtmlContent('login/google_signup', ['found' => $user !== null, 'email' => $userData['email']]);
+        return new HtmlContent('login/google_signup', ['found' => $user !== null, 'email' => $userData['email'], 'redirectUrl' => $this->redirectUrl]);
     }
 
     public function getRequestPasswordResetForm()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         return new HtmlContent('login/password_reset_request', ['email' => $this->request->query('email')]);
@@ -129,7 +138,8 @@ class LoginController
     public function getResetPasswordForm()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         $token = $this->request->query('token');
@@ -141,12 +151,13 @@ class LoginController
 
         $user = $this->userRepository->getById($resetter->getUserId());
 
-        return new HtmlContent('login/reset_password', ['success' => true, 'token' => $token, 'email' => $user->getEmail()]);
+        return new HtmlContent('login/reset_password', ['success' => true, 'token' => $token, 'email' => $user->getEmail(), 'redirectUrl' => $this->redirectUrl]);
     }
 
     public function login(): IContent
     {
         if ($this->request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent(['success' => true]);
         }
 
@@ -171,7 +182,7 @@ class LoginController
 
             return new JsonContent([
                 'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('signup')->generateLink()
+                    'target' => \Container::$routeCollection->getRoute('signup')->generateLink()
                 ]
             ]);
         }
@@ -198,13 +209,15 @@ class LoginController
 
         $this->request->setUser($user);
 
+        $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
     }
 
     public function loginWithGoogle()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
@@ -214,7 +227,7 @@ class LoginController
         $oAuth = new GoogleOAuth(new Request());
         $tokenData = $oAuth->getToken(
             $this->request->query('code'),
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('login-google-action')->generateLink()
+            $this->request->getBase() . \Container::$routeCollection->getRoute('login-google-action')->generateLink()
         );
 
         if (!isset($tokenData['id_token'])) {
@@ -242,7 +255,8 @@ class LoginController
 
         $this->request->setUser($user);
 
-        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        $this->deleteRedirectUrl();
+        return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
     }
 
     public function logout(): IRedirect
@@ -255,7 +269,8 @@ class LoginController
     public function signup(): IContent
     {
         if ($this->request->user() !== null) {
-            return new JsonContent(['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()]]);
+            $this->deleteRedirectUrl();
+            return new JsonContent(['redirect' => ['target' => $this->redirectUrl]]);
         }
 
         $user = $this->userRepository->getByEmail($this->request->post('email'));
@@ -274,7 +289,8 @@ class LoginController
 
                 $this->request->setUser($user);
 
-                $data = ['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('index')->generateLink()]];
+                $this->deleteRedirectUrl();
+                $data = ['redirect' => ['target' => $this->redirectUrl]];
             } else {
                 $data = [
                     'error' => [
@@ -355,6 +371,7 @@ class LoginController
     public function signupWithGoogle(): IContent
     {
         if ($this->request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent(['success' => true]);
         }
 
@@ -384,6 +401,7 @@ class LoginController
         $this->request->session()->delete('google_user_data');
         $this->request->setUser($user);
 
+        $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
     }
 
@@ -404,7 +422,8 @@ class LoginController
     public function activate()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
@@ -426,13 +445,15 @@ class LoginController
 
         $this->request->setUser($user);
 
-        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        $this->deleteRedirectUrl();
+        return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
     }
 
     public function cancel()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
@@ -461,9 +482,10 @@ class LoginController
     public function requestPasswordReset(): IContent
     {
         if ($this->request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent([
                 'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()
+                    'target' => $this->redirectUrl
                 ]
             ]);
         }
@@ -538,9 +560,10 @@ class LoginController
     public function resetPassword(): IContent
     {
         if ($this->request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent([
                 'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()
+                    'target' => $this->redirectUrl
                 ]
             ]);
         }
@@ -551,7 +574,7 @@ class LoginController
         if ($resetter === null || $resetter->getExpiresDate() < new DateTime()) {
             return new JsonContent([
                 'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token])
+                    'target' => \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token])
                 ]
             ]);
         }
@@ -581,6 +604,7 @@ class LoginController
 
         $this->request->setUser($user);
 
+        $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
     }
 
@@ -591,9 +615,9 @@ class LoginController
         $mail->setSubject('Welcome to ' . $_ENV['APP_NAME'] . ' - Activate your account');
         $mail->setBodyFromTemplate('signup', [
             'EMAIL' => $email,
-            'ACTIVATE_LINK' => $this->request->getBase() . '/' .
+            'ACTIVATE_LINK' => $this->request->getBase() .
                 \Container::$routeCollection->getRoute('signup.activate')->generateLink(['token' => $token]),
-            'CANCEL_LINK' => $this->request->getBase() . '/' .
+            'CANCEL_LINK' => $this->request->getBase() .
                 \Container::$routeCollection->getRoute('signup.cancel')->generateLink(['token' => $token]),
             'ACTIVATABLE_UNTIL' => (clone $created)->add(new DateInterval('P1D'))->format('Y-m-d H:i T')
         ]);
@@ -635,10 +659,15 @@ class LoginController
         $mail->setSubject($_ENV['APP_NAME'] . ' - Password reset');
         $mail->setBodyFromTemplate('password-reset', [
             'EMAIL' => $email,
-            'RESET_LINK' => $this->request->getBase() . '/' .
+            'RESET_LINK' => $this->request->getBase() .
                 \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token]),
             'EXPIRES' => $expires->format('Y-m-d H:i T')
         ]);
         $mail->send();
     }
+
+    private function deleteRedirectUrl(): void
+    {
+        $this->request->session()->delete('redirect_after_login');
+    }
 }

src/Controller/MapAdminController.php

@@ -2,6 +2,7 @@
 
 use DateTime;
 use SokoWeb\Interfaces\Authentication\IUser;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
 use SokoWeb\Interfaces\Authorization\ISecured;
 use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IContent;
@@ -22,7 +23,7 @@ use SokoWeb\Response\JsonContent;
 use MapGuesser\Util\Geo\Bounds;
 use MapGuesser\Util\Panorama\Pov;
 
-class MapAdminController implements ISecured
+class MapAdminController implements IAuthenticationRequired, ISecured
 {
     private static string $unnamedMapName = '[unnamed map]';
 
@@ -57,11 +58,14 @@ class MapAdminController implements ISecured
         $this->userInChallengeRepository = new UserInChallengeRepository();
     }
 
+    public function isAuthenticationRequired(): bool
+    {
+        return true;
+    }
+
     public function authorize(): bool
     {
-        $user = $this->request->user();
-
-        return $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN);
+        return $this->request->user()->hasPermission(IUser::PERMISSION_ADMIN);
     }
 
     public function getMapEditor(): IContent

src/Controller/UserController.php

@@ -2,7 +2,7 @@
 
 use DateTime;
 use SokoWeb\Http\Request;
-use SokoWeb\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
 use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IContent;
 use SokoWeb\Interfaces\Response\IRedirect;
@@ -19,7 +19,7 @@ use SokoWeb\Response\JsonContent;
 use SokoWeb\Response\Redirect;
 use SokoWeb\Util\JwtParser;
 
-class UserController implements ISecured
+class UserController implements IAuthenticationRequired
 {
     private IRequest $request;
 
@@ -46,11 +46,9 @@ class UserController implements ISecured
         $this->guessRepository = new GuessRepository();
     }
 
-    public function authorize(): bool
+    public function isAuthenticationRequired(): bool
     {
-        $user = $this->request->user();
-
-        return $user !== null;
+        return true;
     }
 
     public function getAccount(): IContent
@@ -80,7 +78,7 @@ class UserController implements ISecured
 
         $url = $oAuth->getDialogUrl(
             $state,
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink(),
+            $this->request->getBase() . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink(),
             $nonce,
             $user->getEmail()
         );
@@ -102,7 +100,7 @@ class UserController implements ISecured
         $oAuth = new GoogleOAuth(new Request());
         $tokenData = $oAuth->getToken(
             $this->request->query('code'),
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink()
+            $this->request->getBase() . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink()
         );
 
         if (!isset($tokenData['id_token'])) {

views/login/google_signup.php

@@ -5,7 +5,7 @@
 @section(main)
     <h2>Sign up</h2>
     <div class="box">
-        <form id="googleSignupForm" action="/signup/google" method="post" data-redirect-on-success="/">
+        <form id="googleSignupForm" action="/signup/google" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
             <?php if ($found): ?>
                 <p class="justify">Please confirm that you link your account to your Google account.</p>
             <?php else: ?>

views/login/login.php

@@ -3,7 +3,7 @@
 @section(main)
     <h2>Login</h2>
     <div class="box">
-        <form id="loginForm" action="/login" method="post" data-redirect-on-success="/">
+        <form id="loginForm" action="/login" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
             <input type="email" class="text big fullWidth" name="email" placeholder="Email address" required autofocus>
             <input type="password"  class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6">
             <p id="loginFormError" class="formError justify marginTop"></p>

views/login/reset_password.php

@@ -4,7 +4,7 @@
     <h2>Reset password</h2>
     <div class="box">
         <?php if ($success) : ?>
-            <form id="resetPasswordForm" action="/password/reset/<?= $token ?>" method="post" data-redirect-on-success="/">
+            <form id="resetPasswordForm" action="/password/reset/<?= $token ?>" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
                 <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
                 <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6" autofocus>
                 <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" required minlength="6">

views/maps.php

@@ -96,7 +96,6 @@ TODO: condition!
                     </div>
                 </div>
                 <div class="buttonContainer">
-                    <?php if (!empty($_ENV['ENABLE_GAME_FOR_GUESTS']) || Container::$request->user()): ?>
                     <?php if ($isAdmin): ?>
                         <button class="button fullWidth noRightRadius playButton" data-map-id="<?= $map['id'] ?>" data-map-name="<?= htmlspecialchars($map['name']) ?>" title="Play map '<?= $map['name'] ?>'">Play this map</button>
                         <a class="button yellow fullWidth noLeftRadius noRightRadius" href="/admin/mapEditor/<?= $map['id']; ?>" title="Edit map '<?= $map['name'] ?>'">Edit</a>
@@ -104,9 +103,6 @@ TODO: condition!
                     <?php else: ?>
                         <button class="button fullWidth playButton" data-map-id="<?= $map['id'] ?>" data-map-name="<?= htmlspecialchars($map['name']) ?>" title="Play map '<?= $map['name'] ?>'">Play this map</button>
                     <?php endif; ?>
-                    <?php else: ?>
-                        <a href="/login" class="button fullWidth" title="Play map '<?= $map['name'] ?>'">Play this map</a>
-                    <?php endif; ?>
                 </div>
             </div>
         <?php endforeach; ?>

views/tests/view_complex.php

@@ -1,22 +0,0 @@
-@css(test1.css)
-@js(test1.js)
-@js(test2_<?= $some['expression'] ?>)
-
-@extra
-<?php phpinfo() ?>
-@endextra
-
-@extends(parent)
-
-@section(section1)
-<div>Test HTML with @extends - section 1</div>
-@endsection
-
-@section(section2)
-<div>Test HTML with @extends - section 2</div>
-@endsection
-
-@extra
-<?php $a = 'test_string' ?>
-EXTRA
-@endextra

views/tests/view_invalid_multiple_extends.php

@@ -1,5 +0,0 @@
-@extends(parent1)
-
-@extends(parent2)
-
-<div>Test HTML with multiple @extends</div>

views/tests/view_invalid_multiple_sections_open.php

@@ -1,6 +0,0 @@
-@extends(parent)
-
-@section(section1)
-@section(section2)
-
-<div>Test HTML with opening @section before previous closed</div>

views/tests/view_invalid_section_not_open.php

@@ -1,4 +0,0 @@
-@extends(parent)
-
-<div>Test HTML with @endsection when no section is open</div>
-@endsection

views/tests/view_invalid_section_without_extends.php

@@ -1,3 +0,0 @@
-@section(section1)
-
-<div>Test HTML with @section but without @extends</div>

views/tests/view_with_assets.php

@@ -1,4 +0,0 @@
-@css(test.css)
-@js(test.js)
-@js(test_<?= $some['expression'] ?>)
-<div>Test HTML with @css and @js</div>

views/tests/view_with_extends.php

@@ -1,5 +0,0 @@
-@extends(parent)
-
-@section(section1)
-<div>Test HTML with @extends</div>
-@endsection

views/tests/view_without_extends.php

@@ -1 +0,0 @@
-<div>Test HTML without @extends</div>

web.php

@@ -1,5 +1,18 @@
 <?php
 
+use SokoWeb\Response\HttpResponse;
+use SokoWeb\Routing\RouteCollection;
+use SokoWeb\Session\DatabaseSessionHandler;
+use SokoWeb\Request\Request;
+use MapGuesser\Controller\MapsController;
+use MapGuesser\Controller\HomeController;
+use MapGuesser\Controller\LoginController;
+use MapGuesser\Controller\UserController;
+use MapGuesser\Controller\GameController;
+use MapGuesser\Controller\GameFlowController;
+use MapGuesser\Controller\MapAdminController;
+use MapGuesser\Repository\UserRepository;
+
 require 'main.php';
 
 if (!empty($_ENV['DEV'])) {
@@ -10,74 +23,74 @@ if (!empty($_ENV['DEV'])) {
     ini_set('display_errors', '0');
 }
 
-Container::$routeCollection = new SokoWeb\Routing\RouteCollection();
+Container::$routeCollection = new RouteCollection();
 
-Container::$routeCollection->get('index', '', [MapGuesser\Controller\MapsController::class, 'getMaps']);
-Container::$routeCollection->get('startSession', 'startSession.json', [MapGuesser\Controller\HomeController::class, 'startSession']);
-Container::$routeCollection->group('login', function (SokoWeb\Routing\RouteCollection $routeCollection) {
-    $routeCollection->get('login', '', [MapGuesser\Controller\LoginController::class, 'getLoginForm']);
-    $routeCollection->post('login-action', '', [MapGuesser\Controller\LoginController::class, 'login']);
-    $routeCollection->get('login-google', 'google', [MapGuesser\Controller\LoginController::class, 'getGoogleLoginRedirect']);
-    $routeCollection->get('login-google-action', 'google/code', [MapGuesser\Controller\LoginController::class, 'loginWithGoogle']);
+Container::$routeCollection->get('index', '', [MapsController::class, 'getMaps']);
+Container::$routeCollection->get('startSession', 'startSession.json', [HomeController::class, 'startSession']);
+Container::$routeCollection->group('login', function (RouteCollection $routeCollection) {
+    $routeCollection->get('login', '', [LoginController::class, 'getLoginForm']);
+    $routeCollection->post('login-action', '', [LoginController::class, 'login']);
+    $routeCollection->get('login-google', 'google', [LoginController::class, 'getGoogleLoginRedirect']);
+    $routeCollection->get('login-google-action', 'google/code', [LoginController::class, 'loginWithGoogle']);
 });
-Container::$routeCollection->group('signup', function (SokoWeb\Routing\RouteCollection $routeCollection) {
-    $routeCollection->get('signup', '', [MapGuesser\Controller\LoginController::class, 'getSignupForm']);
-    $routeCollection->post('signup-action', '', [MapGuesser\Controller\LoginController::class, 'signup']);
-    $routeCollection->get('signup-google', 'google', [MapGuesser\Controller\LoginController::class, 'getSignupWithGoogleForm']);
-    $routeCollection->post('signup-google-action', 'google', [MapGuesser\Controller\LoginController::class, 'signupWithGoogle']);
-    $routeCollection->post('signup.reset', 'reset', [MapGuesser\Controller\LoginController::class, 'resetSignup']);
-    $routeCollection->post('signup-google.reset', 'google/reset', [MapGuesser\Controller\LoginController::class, 'resetGoogleSignup']);
-    $routeCollection->get('signup.success', 'success', [MapGuesser\Controller\LoginController::class, 'getSignupSuccess']);
-    $routeCollection->get('signup.activate', 'activate/{token}', [MapGuesser\Controller\LoginController::class, 'activate']);
-    $routeCollection->get('signup.cancel', 'cancel/{token}', [MapGuesser\Controller\LoginController::class, 'cancel']);
+Container::$routeCollection->group('signup', function (RouteCollection $routeCollection) {
+    $routeCollection->get('signup', '', [LoginController::class, 'getSignupForm']);
+    $routeCollection->post('signup-action', '', [LoginController::class, 'signup']);
+    $routeCollection->get('signup-google', 'google', [LoginController::class, 'getSignupWithGoogleForm']);
+    $routeCollection->post('signup-google-action', 'google', [LoginController::class, 'signupWithGoogle']);
+    $routeCollection->post('signup.reset', 'reset', [LoginController::class, 'resetSignup']);
+    $routeCollection->post('signup-google.reset', 'google/reset', [LoginController::class, 'resetGoogleSignup']);
+    $routeCollection->get('signup.success', 'success', [LoginController::class, 'getSignupSuccess']);
+    $routeCollection->get('signup.activate', 'activate/{token}', [LoginController::class, 'activate']);
+    $routeCollection->get('signup.cancel', 'cancel/{token}', [LoginController::class, 'cancel']);
 });
-Container::$routeCollection->group('password', function (SokoWeb\Routing\RouteCollection $routeCollection) {
-    $routeCollection->get('password-requestReset', 'requestReset', [MapGuesser\Controller\LoginController::class, 'getRequestPasswordResetForm']);
-    $routeCollection->post('password-requestReset-action', 'requestReset', [MapGuesser\Controller\LoginController::class, 'requestPasswordReset']);
-    $routeCollection->get('password-requestReset.success', 'requestReset/success', [MapGuesser\Controller\LoginController::class, 'getRequestPasswordResetSuccess']);
-    $routeCollection->get('password-reset', 'reset/{token}', [MapGuesser\Controller\LoginController::class, 'getResetPasswordForm']);
-    $routeCollection->post('password-reset.action', 'reset/{token}', [MapGuesser\Controller\LoginController::class, 'resetPassword']);
+Container::$routeCollection->group('password', function (RouteCollection $routeCollection) {
+    $routeCollection->get('password-requestReset', 'requestReset', [LoginController::class, 'getRequestPasswordResetForm']);
+    $routeCollection->post('password-requestReset-action', 'requestReset', [LoginController::class, 'requestPasswordReset']);
+    $routeCollection->get('password-requestReset.success', 'requestReset/success', [LoginController::class, 'getRequestPasswordResetSuccess']);
+    $routeCollection->get('password-reset', 'reset/{token}', [LoginController::class, 'getResetPasswordForm']);
+    $routeCollection->post('password-reset.action', 'reset/{token}', [LoginController::class, 'resetPassword']);
 });
-Container::$routeCollection->get('logout', 'logout', [MapGuesser\Controller\LoginController::class, 'logout']);
-Container::$routeCollection->group('account', function (SokoWeb\Routing\RouteCollection $routeCollection) {
-    $routeCollection->get('account', '', [MapGuesser\Controller\UserController::class, 'getAccount']);
-    $routeCollection->post('account-action', '', [MapGuesser\Controller\UserController::class, 'saveAccount']);
-    $routeCollection->get('account.delete', 'delete', [MapGuesser\Controller\UserController::class, 'getDeleteAccount']);
-    $routeCollection->post('account.delete-action', 'delete', [MapGuesser\Controller\UserController::class, 'deleteAccount']);
-    $routeCollection->get('account.googleAuthenticate', 'googleAuthenticate', [MapGuesser\Controller\UserController::class, 'getGoogleAuthenticateRedirect']);
-    $routeCollection->get('account.googleAuthenticate-action', 'googleAuthenticate/code', [MapGuesser\Controller\UserController::class, 'authenticateWithGoogle']);
+Container::$routeCollection->get('logout', 'logout', [LoginController::class, 'logout']);
+Container::$routeCollection->group('account', function (RouteCollection $routeCollection) {
+    $routeCollection->get('account', '', [UserController::class, 'getAccount']);
+    $routeCollection->post('account-action', '', [UserController::class, 'saveAccount']);
+    $routeCollection->get('account.delete', 'delete', [UserController::class, 'getDeleteAccount']);
+    $routeCollection->post('account.delete-action', 'delete', [UserController::class, 'deleteAccount']);
+    $routeCollection->get('account.googleAuthenticate', 'googleAuthenticate', [UserController::class, 'getGoogleAuthenticateRedirect']);
+    $routeCollection->get('account.googleAuthenticate-action', 'googleAuthenticate/code', [UserController::class, 'authenticateWithGoogle']);
 });
-//Container::$routeCollection->get('maps', 'maps', [MapGuesser\Controller\MapsController::class, 'getMaps']);
-Container::$routeCollection->group('game', function (SokoWeb\Routing\RouteCollection $routeCollection) {
-    $routeCollection->get('game', '{mapId}', [MapGuesser\Controller\GameController::class, 'getGame']);
-    $routeCollection->post('game.prepare-json', '{mapId}/prepare.json', [MapGuesser\Controller\GameController::class, 'prepareGame']);
-    $routeCollection->post('game.initialData-json', '{mapId}/initialData.json', [MapGuesser\Controller\GameFlowController::class, 'initialData']);
-    $routeCollection->post('game.guess-json', '{mapId}/guess.json', [MapGuesser\Controller\GameFlowController::class, 'guess']);
+//Container::$routeCollection->get('maps', 'maps', [MapsController::class, 'getMaps']);
+Container::$routeCollection->group('game', function (RouteCollection $routeCollection) {
+    $routeCollection->get('game', '{mapId}', [GameController::class, 'getGame']);
+    $routeCollection->post('game.prepare-json', '{mapId}/prepare.json', [GameController::class, 'prepareGame']);
+    $routeCollection->post('game.initialData-json', '{mapId}/initialData.json', [GameFlowController::class, 'initialData']);
+    $routeCollection->post('game.guess-json', '{mapId}/guess.json', [GameFlowController::class, 'guess']);
 });
-Container::$routeCollection->group('multiGame', function (SokoWeb\Routing\RouteCollection $routeCollection) {
-    $routeCollection->get('multiGame.new', 'new/{mapId}', [MapGuesser\Controller\GameController::class, 'getNewMultiGame']);
-    $routeCollection->get('multiGame', '{roomId}', [MapGuesser\Controller\GameController::class, 'getMultiGame']);
-    $routeCollection->post('multiGame.prepare-json', '{roomId}/prepare.json', [MapGuesser\Controller\GameController::class, 'prepareMultiGame']);
-    $routeCollection->post('multiGame.initialData-json', '{roomId}/initialData.json', [MapGuesser\Controller\GameFlowController::class, 'multiInitialData']);
-    $routeCollection->post('multiGame.nextRound-json', '{roomId}/nextRound.json', [MapGuesser\Controller\GameFlowController::class, 'multiNextRound']);
-    $routeCollection->post('multiGame.guess-json', '{roomId}/guess.json', [MapGuesser\Controller\GameFlowController::class, 'multiGuess']);
+Container::$routeCollection->group('multiGame', function (RouteCollection $routeCollection) {
+    $routeCollection->get('multiGame.new', 'new/{mapId}', [GameController::class, 'getNewMultiGame']);
+    $routeCollection->get('multiGame', '{roomId}', [GameController::class, 'getMultiGame']);
+    $routeCollection->post('multiGame.prepare-json', '{roomId}/prepare.json', [GameController::class, 'prepareMultiGame']);
+    $routeCollection->post('multiGame.initialData-json', '{roomId}/initialData.json', [GameFlowController::class, 'multiInitialData']);
+    $routeCollection->post('multiGame.nextRound-json', '{roomId}/nextRound.json', [GameFlowController::class, 'multiNextRound']);
+    $routeCollection->post('multiGame.guess-json', '{roomId}/guess.json', [GameFlowController::class, 'multiGuess']);
 });
-Container::$routeCollection->group('challenge', function (SokoWeb\Routing\RouteCollection $routeCollection) {
-    $routeCollection->post('challenge.create', 'create.json', [\MapGuesser\Controller\GameController::class, 'createNewChallenge']);
-    $routeCollection->get('challenge', '{challengeToken}', [MapGuesser\Controller\GameController::class, 'getChallenge']);
-    $routeCollection->post('challenge.prepare-json', '{challengeToken}/prepare.json', [MapGuesser\Controller\GameController::class, 'prepareChallenge']);
-    $routeCollection->post('challenge.initialData-json', '{challengeToken}/initialData.json', [MapGuesser\Controller\GameFlowController::class, 'challengeInitialData']);
-    $routeCollection->post('challenge.guess-json', '{challengeToken}/guess.json', [MapGuesser\Controller\GameFlowController::class, 'challengeGuess']);
+Container::$routeCollection->group('challenge', function (RouteCollection $routeCollection) {
+    $routeCollection->post('challenge.create', 'create.json', [GameController::class, 'createNewChallenge']);
+    $routeCollection->get('challenge', '{challengeToken}', [GameController::class, 'getChallenge']);
+    $routeCollection->post('challenge.prepare-json', '{challengeToken}/prepare.json', [GameController::class, 'prepareChallenge']);
+    $routeCollection->post('challenge.initialData-json', '{challengeToken}/initialData.json', [GameFlowController::class, 'challengeInitialData']);
+    $routeCollection->post('challenge.guess-json', '{challengeToken}/guess.json', [GameFlowController::class, 'challengeGuess']);
 });
-Container::$routeCollection->group('admin', function (SokoWeb\Routing\RouteCollection $routeCollection) {
-    $routeCollection->get('admin.mapEditor', 'mapEditor/{mapId?}', [MapGuesser\Controller\MapAdminController::class, 'getMapEditor']);
-    $routeCollection->get('admin.place', 'place.json/{placeId}', [MapGuesser\Controller\MapAdminController::class, 'getPlace']);
-    $routeCollection->post('admin.saveMap', 'saveMap/{mapId}/json', [MapGuesser\Controller\MapAdminController::class, 'saveMap']);
-    $routeCollection->post('admin.deleteMap', 'deleteMap/{mapId}', [MapGuesser\Controller\MapAdminController::class, 'deleteMap']);
+Container::$routeCollection->group('admin', function (RouteCollection $routeCollection) {
+    $routeCollection->get('admin.mapEditor', 'mapEditor/{mapId?}', [MapAdminController::class, 'getMapEditor']);
+    $routeCollection->get('admin.place', 'place.json/{placeId}', [MapAdminController::class, 'getPlace']);
+    $routeCollection->post('admin.saveMap', 'saveMap/{mapId}/json', [MapAdminController::class, 'saveMap']);
+    $routeCollection->post('admin.deleteMap', 'deleteMap/{mapId}', [MapAdminController::class, 'deleteMap']);
 });
 
 if (isset($_COOKIE['COOKIES_CONSENT'])) {
-    Container::$sessionHandler = new SokoWeb\Session\DatabaseSessionHandler();
+    Container::$sessionHandler = new DatabaseSessionHandler();
 
     session_set_save_handler(Container::$sessionHandler, true);
     session_start([
@@ -106,14 +119,32 @@ if (isset($_COOKIE['COOKIES_CONSENT'])) {
     $_SESSION = [];
 }
 
-Container::$request = new SokoWeb\Request\Request(
+Container::$request = new Request(
     $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'],
     $_GET,
     $_POST,
+    getallheaders(),
     $_SESSION,
-    new MapGuesser\Repository\UserRepository()
+    new UserRepository()
 );
 
 if (!Container::$request->session()->has('anti_csrf_token')) {
     Container::$request->session()->set('anti_csrf_token', bin2hex(random_bytes(16)));
 }
+
+$appConfig = [
+    'antiCsrfTokenName' => 'anti_csrf_token',
+    'antiCsrfTokenErrorResponse' => ['error' => 'no_valid_anti_csrf_token'],
+    'antiCsrfTokenExceptions' => [],
+    'loginRouteId' => 'login',
+    'error404View' => 'error/404'
+];
+
+$httpReponse = new HttpResponse(
+    Container::$request,
+    Container::$routeCollection,
+    $appConfig,
+    $_SERVER['REQUEST_METHOD'],
+    $_SERVER['REQUEST_URI']
+);
+$httpReponse->render();