Merge pull request 'add autocomplete values for username and password fields' (!64) from feature/add-autocompletes-for-usernames-and-passwords into develop

Reviewed-on: #64

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "esoko/soko-web": "0.6.1",
+    "esoko/soko-web": "0.10",
     "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": "8b291ef6518a20a7cdd71ac2c19763d8",
+    "content-hash": "db04b12ad70bbdfe83841fa292277ec6",
     "packages": [
         {
             "name": "esoko/soko-web",
-            "version": "0.6.1",
+            "version": "0.10",
             "source": {
                 "type": "git",
                 "url": "https://git.esoko.eu/esoko/soko-web.git",
-                "reference": "445774e59a4891b2e67d151b0cf7b7b880c40e48"
+                "reference": "fd286c9cffadc4a26609bfa00944f8014a2f3f59"
             },
             "require": {
                 "phpmailer/phpmailer": "^6.8",
@@ -33,7 +33,7 @@
                 "GNU GPL 3.0"
             ],
             "description": "Lightweight web framework",
-            "time": "2023-04-19T22:24:31+00:00"
+            "time": "2023-05-02T10:55:47+00:00"
         },
         {
             "name": "fzaninotto/faker",

src/Controller/GameFlowController.php

@@ -138,7 +138,7 @@ class GameFlowController implements IAuthenticationRequired
         // if the last round was played ($currentPlace == null) or history is explicitly requested (for initializing)
         if (!isset($currentPlace) || $withHistory) {
 
-            $withRelations = [User::class, PlaceInChallenge::class, Place::class];
+            $withRelations = ['user', 'place_in_challange', 'place'];
             foreach ($this->guessRepository->getAllInChallenge($challenge, $withRelations) as $guess) {
                 $round = $guess->getPlaceInChallenge()->getRound();
 
@@ -187,7 +187,7 @@ class GameFlowController implements IAuthenticationRequired
 
             $prevRound = $currentRound - 1;
             if ($prevRound >= 0) {
-                foreach ($this->guessRepository->getAllInChallengeByRound($prevRound, $challenge, [User::class]) as $guess) {
+                foreach ($this->guessRepository->getAllInChallengeByRound($prevRound, $challenge, ['user']) as $guess) {
                     if ($guess->getUser()->getId() != $userId) {
                         $response['allResults'][] = [
                             'userName' => $guess->getUser()->getDisplayName(),
@@ -216,7 +216,7 @@ class GameFlowController implements IAuthenticationRequired
         $session = \Container::$request->session();
         $userId = $session->get('userId');
         $challengeToken_str = \Container::$request->query('challengeToken');
-        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, [Challenge::class]);
+        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, ['challenge']);
 
         if (!isset($userInChallenge)) {
             return new JsonContent(['error' => 'game_not_found']);
@@ -337,7 +337,7 @@ class GameFlowController implements IAuthenticationRequired
         $session = \Container::$request->session();
         $userId = $session->get('userId');
         $challengeToken_str = \Container::$request->query('challengeToken');
-        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, [Challenge::class]);
+        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, ['challenge']);
 
         if (!isset($userInChallenge)) {
             return new JsonContent(['error' => 'game_not_found']);
@@ -345,7 +345,7 @@ class GameFlowController implements IAuthenticationRequired
 
         $challenge = $userInChallenge->getChallenge();
         $currentRound = $userInChallenge->getCurrentRound();
-        $currentPlaceInChallenge = $this->placeInChallengeRepository->getByRoundInChallenge($currentRound, $challenge, [Place::class, Map::class]);
+        $currentPlaceInChallenge = $this->placeInChallengeRepository->getByRoundInChallenge($currentRound, $challenge, ['place', 'map']);
         $currentPlace = $currentPlaceInChallenge->getPlace();
         $map = $currentPlace->getMap();
 

src/Controller/MapAdminController.php

@@ -218,7 +218,7 @@ class MapAdminController implements IAuthenticationRequired, ISecured
             \Container::$persistentDataManager->deleteFromDb($userInChallenge);
         }
 
-        foreach ($this->guessRepository->getAllInChallenge($challenge, [PlaceInChallenge::class]) as $guess) {
+        foreach ($this->guessRepository->getAllInChallenge($challenge, ['place_in_challange']) as $guess) {
             \Container::$persistentDataManager->deleteFromDb($guess);
         }
 

src/Repository/GuessRepository.php

@@ -53,7 +53,7 @@ class GuessRepository
     public function getAllInChallenge(Challenge $challenge, array $withRelations = []): Generator
     {
         if (count($withRelations)) {
-            $necessaryRelations = [PlaceInChallenge::class];
+            $necessaryRelations = ['place_in_challenge'];
             $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
         }
 
@@ -67,7 +67,7 @@ class GuessRepository
     public function getAllInChallengeByRound(int $round, Challenge $challenge, array $withRelations = []): Generator
     {
         if (count($withRelations)) {
-            $necessaryRelations = [PlaceInChallenge::class];
+            $necessaryRelations = ['place_in_challenge'];
             $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
         }
 

src/Repository/UserInChallengeRepository.php

@@ -29,7 +29,7 @@ class UserInChallengeRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('challenge_id', '=', $challenge->getId());
 
-        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserInChallenge::class, true, [User::class]);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserInChallenge::class, true, ['user']);
     }
 
     public function getByUserIdAndChallenge(int $userId, Challenge $challenge): ?UserInChallenge
@@ -44,7 +44,7 @@ class UserInChallengeRepository
     public function getByUserIdAndToken(int $userId, string $token_str, array $withRelations = []): ?UserInChallenge
     {
         if (count($withRelations)) {
-            $necessaryRelations = [Challenge::class];
+            $necessaryRelations = ['challange'];
             $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
         }
 

views/account/account.php

@@ -9,12 +9,12 @@
             <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password or with Google to modify your account.</p>
                 <div class="inputWithButton">
-                    <input type="password" class="text name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                    <input type="password" class="text name="password" placeholder="Current password" autocomplete="current-password" required minlength="6" autofocus><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php elseif ($user['password'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password to modify your account.</p>
-                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" autocomplete="current-password" required minlength="6" autofocus>
             <?php elseif ($user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with Google to modify your account.</p>
                 <div class="inputWithButton">
@@ -24,9 +24,9 @@
             <?php endif; ?>
             <hr>
             <?php /* TODO: disabled for the time being, email modification should be implemented */ ?>
-            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled>
-            <input type="password" class="text big fullWidth marginTop" name="password_new" placeholder="New password" minlength="6">
-            <input type="password" class="text big fullWidth marginTop" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
+            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" value="<?= $user['email'] ?>" disabled>
+            <input type="password" class="text big fullWidth marginTop" name="password_new" placeholder="New password" autocomplete="new-password" minlength="6">
+            <input type="password" class="text big fullWidth marginTop" name="password_new_confirm" placeholder="New password confirmation" autocomplete="new-password" minlength="6">
             <p id="accountFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit" name="submit" disabled>Save</button>

views/account/delete.php

@@ -7,15 +7,16 @@
     <div class="box">
         <form id="deleteAccountForm" action="/account/delete" method="post" data-redirect-on-success="/">
             <p class="justify marginBottom">Are you sure you want to delete your account? This cannot be undone!</p>
+            <input type="email" style="display: none;" name="email" autocomplete="username" value="<?= $user['email'] ?>">
             <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password or with Google to delete your account.</p>
                 <div class="inputWithButton">
-                    <input type="password" class="text" name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                    <input type="password" class="text" name="password" placeholder="Current password" autocomplete="current-password" required minlength="6" autofocus><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php elseif ($user['password'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password to delete your account.</p>
-                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" autocomplete="current-password" required minlength="6" autofocus>
             <?php elseif ($user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with Google to delete your account.</p>
                 <div class="inputWithButton">

views/login/login.php

@@ -4,8 +4,8 @@
     <h2>Login</h2>
     <div class="box">
         <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">
+            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" required autofocus>
+            <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password autocomplete="current-password"" required minlength="6">
             <p id="loginFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit">Login</button>

views/login/password_reset_request.php

@@ -6,7 +6,7 @@
     <h2>Request password reset</h2>
     <div class="box">
         <form id="passwordResetForm" action="/password/requestReset" method="post" data-redirect-on-success="/password/requestReset/success">
-            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= isset($email) ? $email : '' ?>" required autofocus>
+            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" value="<?= isset($email) ? $email : '' ?>" required autofocus>
             <?php if (!empty($_ENV['RECAPTCHA_SITEKEY'])): ?>
                 <div class="marginTop">
                     <div class="g-recaptcha" data-sitekey="<?= $_ENV['RECAPTCHA_SITEKEY'] ?>"></div>

views/login/reset_password.php

@@ -5,9 +5,9 @@
     <div class="box">
         <?php if ($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">
+                <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" value="<?= $email ?>" disabled>
+                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" autocomplete="new-password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" autocomplete="new-password" required minlength="6">
                 <p id="resetPasswordFormError" class="formError justify marginTop"></p>
                 <div class="right">
                     <button class="marginTop" type="submit">Reset password</button>

views/login/signup.php

@@ -9,12 +9,12 @@
         <form id="signupForm" action="/signup" method="post" data-redirect-on-success="/signup/success">
             <?php if (isset($email)): ?>
                 <p class="justify">No user found with the given email address. Sign up with one click!</p>
-                <input type="email" class="text big fullWidth marginTop" name="email" placeholder="Email address" value="<?= $email ?>" required>
-                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password confirmation" required minlength="6" autofocus>
+                <input type="email" class="text big fullWidth marginTop" name="email" placeholder="Email address" autocomplete="username" value="<?= $email ?>" required>
+                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password confirmation" autocomplete="new-password" required minlength="6" autofocus>
             <?php else: ?>
-                <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">
-                <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" minlength="6">
+                <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" required autofocus>
+                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" autocomplete="new-password" required minlength="6">
+                <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" autocomplete="new-password" minlength="6">
             <?php endif; ?>
             <?php if (!empty($_ENV['RECAPTCHA_SITEKEY'])): ?>
                 <div class="marginTop">

web.php

@@ -4,6 +4,7 @@ use SokoWeb\Response\HttpResponse;
 use SokoWeb\Routing\RouteCollection;
 use SokoWeb\Session\DatabaseSessionHandler;
 use SokoWeb\Request\Request;
+use SokoWeb\Request\Session;
 use MapGuesser\Controller\MapsController;
 use MapGuesser\Controller\HomeController;
 use MapGuesser\Controller\LoginController;
@@ -90,27 +91,21 @@ Container::$routeCollection->group('admin', function (RouteCollection $routeColl
 });
 
 if (isset($_COOKIE['COOKIES_CONSENT'])) {
-    Container::$sessionHandler = new DatabaseSessionHandler(Container::$dbConnection);
+    Container::$sessionHandler = new DatabaseSessionHandler(
+        Container::$dbConnection,
+        'sessions',
+        new DateTime('-7 days')
+    );
 
     session_set_save_handler(Container::$sessionHandler, true);
     session_start([
         'gc_probability' => 0, // old sessions are deleted by MaintainDatabaseCommand
-        'cookie_lifetime' => 604800,
+        'cookie_lifetime' => 0,
         'cookie_path' => '/',
         'cookie_httponly' => true,
         'cookie_samesite' => 'Lax'
     ]);
 
-    if (isset($_COOKIE[session_name()])) {
-        // extend session cookie lifetime is cookie already exists
-        setcookie(session_name(), session_id(), [
-            'expires' => time() + 604800,
-            'path' => '/',
-            'httponly' => true,
-            'samesite' => 'Lax'
-        ]);
-    }
-
     // this is needed to handle old type of session IDs
     if (!Container::$sessionHandler->validateId(session_id())) {
         session_regenerate_id(true);
@@ -124,7 +119,7 @@ Container::$request = new Request(
     $_GET,
     $_POST,
     getallheaders(),
-    $_SESSION,
+    new Session($_SESSION),
     new UserRepository()
 );