Merge pull request 'feature/update-to-soko-web-0.5' (!26) from feature/update-to-soko-web-0.5 into master

Reviewed-on: #26

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "esoko/soko-web": "0.4",
+    "esoko/soko-web": "0.5",
     "firebase/php-jwt": "^6.4"
   },
   "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": "f7786e07bcb0373560ae67549fa28f0b",
+    "content-hash": "05dba423c5e5dd40b5a7b9d4180d3673",
     "packages": [
         {
             "name": "esoko/soko-web",
-            "version": "v0.4",
+            "version": "v0.5",
             "source": {
                 "type": "git",
                 "url": "https://git.esoko.eu/esoko/soko-web.git",
-                "reference": "948b36c80d324e07339a543d97b9e629487f3a45"
+                "reference": "3893ed22316e84aa4ffab7fbb3d5e823b928b001"
             },
             "require": {
                 "phpmailer/phpmailer": "^6.8",
@@ -33,7 +33,7 @@
                 "GNU GPL 3.0"
             ],
             "description": "Lightweight web framework",
-            "time": "2023-04-16T18:52:06+00:00"
+            "time": "2023-04-18T21:17:08+00:00"
         },
         {
             "name": "firebase/php-jwt",

src/Controller/LoginController.php

@@ -226,16 +226,12 @@ class LoginController
         $passwordResetter->setToken($token);
         $passwordResetter->setExpiresDate($expires);
 
-        \Container::$dbConnection->startTransaction();
-
         if ($existingResetter !== null) {
             $this->pdm->deleteFromDb($existingResetter);
         }
 
         $this->pdm->saveToDb($passwordResetter);
 
-        \Container::$dbConnection->commit();
-
         $this->sendPasswordResetEmail($user->getEmail(), $token, $expires);
 
         return new JsonContent(['success' => true]);
@@ -275,8 +271,6 @@ class LoginController
             return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
         }
 
-        \Container::$dbConnection->startTransaction();
-
         $this->pdm->deleteFromDb($resetter);
 
         $user = $this->userRepository->getById($resetter->getUserId());
@@ -284,8 +278,6 @@ class LoginController
 
         $this->pdm->saveToDb($user);
 
-        \Container::$dbConnection->commit();
-
         $this->request->setUser($user);
 
         $this->deleteRedirectUrl();

views/error/500.php

@@ -0,0 +1,11 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>500 | Internal server error</h2>
+    <p>An error occured during processing your request. <a href="<?= Container::$routeCollection->getRoute('home')->generateLink() ?>" title="<?= $_ENV['APP_NAME'] ?>">Back to start.</a></p>
+    <?php if (isset($exceptionToPrint)): ?>
+            <pre class="marginTop">
+<?= $exceptionToPrint ?>
+            </pre>
+    <?php endif; ?>
+@endsection

web.php

@@ -108,11 +108,13 @@ $appConfig = [
     'antiCsrfTokenErrorResponse' => ['error' => 'no_valid_anti_csrf_token'],
     'antiCsrfTokenExceptions' => ['/oauth/token'],
     'loginRouteId' => 'login',
-    'error404View' => 'error/404'
+    'error404View' => 'error/404',
+    'error500View' => 'error/500'
 ];
 
 $httpReponse = new HttpResponse(
     Container::$request,
+    Container::$dbConnection,
     Container::$routeCollection,
     $appConfig,
     $_SERVER['REQUEST_METHOD'],