database/migrations/data/20230923_1905_username.php

@@ -1,20 +0,0 @@
-<?php
-
-use MapGuesser\PersistentData\Model\User;
-use MapGuesser\Repository\UserRepository;
-use MapGuesser\Util\UsernameGenerator;
-use SokoWeb\Database\Query\Select;
-
-$select = new Select(Container::$dbConnection);
-$users = Container::$persistentDataManager->selectMultipleFromDb($select, User::class);
-$userRepository = new UserRepository();
-$usernameGenerator = new UsernameGenerator();
-
-foreach ($users as $user) {
-    do {
-        $username = $usernameGenerator->generate();
-    } while ($userRepository->getByUsername($username));
-
-    $user->setUsername($username);
-    Container::$persistentDataManager->saveToDb($user);
-}

database/migrations/structure/20230923_1905_username.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `users`
-  ADD `username` VARCHAR(255) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL AFTER `email`,
-  ADD UNIQUE `username` (`username`);

public/static/js/mapguesser.js

@@ -183,23 +183,12 @@ var MapGuesser = {
         document.getElementById('cover').style.visibility = 'hidden';
     },
 
-    observeInput: function (form, observedInputs) {
+    observeInput: function (input, buttonToToggle) {
-        var anyChanged = false;
+        if (input.defaultValue !== input.value) {
-
+            buttonToToggle.disabled = false;
-        for (var i = 0; i < observedInputs.length; i++) {
+        } else {
-            var input = form.elements[observedInputs[i]];
+            buttonToToggle.disabled = true;
-            if (input.type === 'checkbox') {
-                if (input.defaultChecked !== input.checked) {
-                    anyChanged = true;
-                }
-            } else {
-                if (input.defaultValue !== input.value) {
-                    anyChanged = true;
-                }
-            }
         }
-
-        form.elements['submit_button'].disabled = !anyChanged;
     },
 
     observeInputsInForm: function (form, observedInputs) {
@@ -210,19 +199,19 @@ var MapGuesser = {
                 case 'INPUT':
                 case 'TEXTAREA':
                     input.oninput = function () {
-                        MapGuesser.observeInput(form, observedInputs);
+                        MapGuesser.observeInput(this, form.elements.submit);
                     };
                     break;
                 case 'SELECT':
                     input.onchange = function () {
-                        MapGuesser.observeInput(form, observedInputs);
+                        MapGuesser.observeInput(this, form.elements.submit);
                     };
                     break;
             }
         }
 
         form.onreset = function () {
-            form.elements['submit_button'].disabled = true;
+            form.elements.submit.disabled = true;
         }
     }
 };

src/Controller/LoginController.php

@@ -14,7 +14,6 @@ use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;
 use MapGuesser\Repository\UserPlayedPlaceRepository;
 use MapGuesser\Repository\UserRepository;
-use MapGuesser\Util\UsernameGenerator;
 use SokoWeb\Response\HtmlContent;
 use SokoWeb\Response\JsonContent;
 use SokoWeb\Response\Redirect;
@@ -90,13 +89,8 @@ class LoginController
         return new HtmlContent('login/signup', $data);
     }
 
-    public function getSignupSuccess()
+    public function getSignupSuccess(): IContent
     {
-        if (\Container::$request->user() !== null) {
-            $this->deleteRedirectUrl();
-            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
-        }
-
         return new HtmlContent('login/signup_success');
     }
 
@@ -159,7 +153,7 @@ class LoginController
             return new JsonContent(['success' => true]);
         }
 
-        $user = $this->userRepository->getByEmailOrUsername(\Container::$request->post('email'));
+        $user = $this->userRepository->getByEmail(\Container::$request->post('email'));
 
         if ($user === null) {
             if (strlen(\Container::$request->post('password')) < 6) {
@@ -190,7 +184,7 @@ class LoginController
 
             return new JsonContent([
                 'error' => [
-                    'errorText' => 'User found with the given email address / username, but the account is not activated. ' .
+                    'errorText' => 'User found with the given email address, but the account is not activated. ' .
                         'Please check your email and click on the activation link!'
                 ]
             ]);
@@ -271,131 +265,134 @@ class LoginController
             return new JsonContent(['redirect' => ['target' => $this->redirectUrl]]);
         }
 
-        $newUser = new User();
+        $user = $this->userRepository->getByEmail(\Container::$request->post('email'));
 
-        $googleUserData = \Container::$request->session()->get('google_user_data');
+        if ($user !== null) {
-        if ($googleUserData !== null) {
+            if ($user->getActive()) {
-            $user = $this->userRepository->getByEmail($googleUserData['email']);
+                if (!$user->checkPassword(\Container::$request->post('password'))) {
-
-            if ($user !== null) {
-                return new JsonContent([
-                    'error' => [
-                        'errorText' => 'There is a user already registered with the email address of this Google account, ' .
-                            'but Google account is not linked to the user. Please <a href="/login?email=' .
-                            urlencode($googleUserData['email']) . '" title="Login">login</a> first to link your Google account!'
-                    ]
-                ]);
-            }
-
-            $newUser->setActive(true);
-            $newUser->setEmail($googleUserData['email']);
-            $newUser->setGoogleSub($googleUserData['sub']);
-        } else {
-            $user = $this->userRepository->getByEmailOrUsername(\Container::$request->post('email'));
-
-            if ($user !== null) {
-                if ($user->getActive()) {
-                    if (!$user->checkPassword(\Container::$request->post('password'))) {
-                        return new JsonContent([
-                            'error' => [
-                                'errorText' => 'There is a user already registered with the given email address / username, ' .
-                                    'but the given password is wrong. You can <a href="/password/requestReset?email=' .
-                                    urlencode($user->getEmail()) . '" title="Request password reset">request password reset</a>!'
-                            ]
-                        ]);
-                    }
-
-                    \Container::$request->setUser($user);
-
-                    $this->deleteRedirectUrl();
-                    $data = ['redirect' => ['target' => $this->redirectUrl]];
-                } else {
-                    $data = [
-                        'error' => [
-                            'errorText' => 'There is a user already registered with the given email address / username. ' .
-                                'Please check your email and click on the activation link!'
-                        ]
-                    ];
-                }
-                return new JsonContent($data);
-            }
-
-            if (!empty($_ENV['RECAPTCHA_SITEKEY'])) {
-                if (!\Container::$request->post('g-recaptcha-response')) {
-                    return new JsonContent(['error' => ['errorText' => 'Please check "I\'m not a robot" in the reCAPTCHA box!']]);
-                }
-
-                $captchaValidator = new CaptchaValidator();
-                $captchaResponse = $captchaValidator->validate(\Container::$request->post('g-recaptcha-response'));
-                if (!$captchaResponse['success']) {
-                    return new JsonContent(['error' => ['errorText' => 'reCAPTCHA challenge failed. Please try again!']]);
-                }
-            }
-
-            if (filter_var(\Container::$request->post('email'), FILTER_VALIDATE_EMAIL) === false) {
-                return new JsonContent(['error' => ['errorText' => 'The given email address is not valid.']]);
-            }
-
-            if (\Container::$request->session()->has('tmp_user_data')) {
-                $tmpUserData = \Container::$request->session()->get('tmp_user_data');
-
-                $tmpUser = new User();
-                $tmpUser->setPassword($tmpUserData['password_hashed']);
-
-                if (!$tmpUser->checkPassword(\Container::$request->post('password'))) {
-                    return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
-                }
-            } else {
-                if (strlen(\Container::$request->post('password')) < 6) {
                     return new JsonContent([
                         'error' => [
-                            'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
+                            'errorText' => 'There is a user already registered with the given email address, ' .
+                                'but the given password is wrong. You can <a href="/password/requestReset?email=' .
+                                urlencode($user->getEmail()) . '" title="Request password reset">request password reset</a>!'
                         ]
                     ]);
                 }
 
-                if (\Container::$request->post('password') !== \Container::$request->post('password_confirm')) {
+                \Container::$request->setUser($user);
-                    return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
+
-                }
+                $this->deleteRedirectUrl();
+                $data = ['redirect' => ['target' => $this->redirectUrl]];
+            } else {
+                $data = [
+                    'error' => [
+                        'errorText' => 'There is a user already registered with the given email address. ' .
+                            'Please check your email and click on the activation link!'
+                    ]
+                ];
+            }
+            return new JsonContent($data);
+        }
+
+        if (!empty($_ENV['RECAPTCHA_SITEKEY'])) {
+            if (!\Container::$request->post('g-recaptcha-response')) {
+                return new JsonContent(['error' => ['errorText' => 'Please check "I\'m not a robot" in the reCAPTCHA box!']]);
             }
 
-            $newUser->setActive(false);
+            $captchaValidator = new CaptchaValidator();
-            $newUser->setEmail(\Container::$request->post('email'));
+            $captchaResponse = $captchaValidator->validate(\Container::$request->post('g-recaptcha-response'));
-            $newUser->setPlainPassword(\Container::$request->post('password'));
+            if (!$captchaResponse['success']) {
+                return new JsonContent(['error' => ['errorText' => 'reCAPTCHA challenge failed. Please try again!']]);
+            }
         }
 
-        if (strlen(\Container::$request->post('username')) > 0 && preg_match('/^[a-zA-Z0-9_\-\.]+$/', \Container::$request->post('username')) !== 1) {
+        if (filter_var(\Container::$request->post('email'), FILTER_VALIDATE_EMAIL) === false) {
-            return new JsonContent(['error' => ['errorText' => 'Username can contain only english letters, digits, - (hyphen), . (dot), _ (underscore).']]);
+            return new JsonContent(['error' => ['errorText' => 'The given email address is not valid.']]);
         }
 
-        $newUser->setUsername(strlen(\Container::$request->post('username')) > 0 ? \Container::$request->post('username') : (new UsernameGenerator())->generate());
+        if (\Container::$request->session()->has('tmp_user_data')) {
-        $newUser->setCreatedDate(new DateTime());
+            $tmpUserData = \Container::$request->session()->get('tmp_user_data');
 
-        \Container::$persistentDataManager->saveToDb($newUser);
+            $tmpUser = new User();
+            $tmpUser->setPassword($tmpUserData['password_hashed']);
 
-        if ($googleUserData !== null) {
+            if (!$tmpUser->checkPassword(\Container::$request->post('password'))) {
-            $this->sendWelcomeEmail($newUser->getEmail());
+                return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
-
+            }
-            \Container::$request->setUser($newUser);
         } else {
-            $token = bin2hex(random_bytes(16));
+            if (strlen(\Container::$request->post('password')) < 6) {
+                return new JsonContent([
+                    'error' => [
+                        'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
+                    ]
+                ]);
+            }
 
-            $confirmation = new UserConfirmation();
+            if (\Container::$request->post('password') !== \Container::$request->post('password_confirm')) {
-            $confirmation->setUser($newUser);
+                return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
-            $confirmation->setToken($token);
+            }
-            $confirmation->setLastSentDate(new DateTime());
-
-            \Container::$persistentDataManager->saveToDb($confirmation);
-
-            $this->sendConfirmationEmail($newUser->getEmail(), $token, $newUser->getCreatedDate());
         }
 
+        $user = new User();
+        $user->setEmail(\Container::$request->post('email'));
+        $user->setPlainPassword(\Container::$request->post('password'));
+        $user->setCreatedDate(new DateTime());
+
+        \Container::$persistentDataManager->saveToDb($user);
+
+        $token = bin2hex(random_bytes(16));
+
+        $confirmation = new UserConfirmation();
+        $confirmation->setUser($user);
+        $confirmation->setToken($token);
+        $confirmation->setLastSentDate(new DateTime());
+
+        \Container::$persistentDataManager->saveToDb($confirmation);
+
+        $this->sendConfirmationEmail($user->getEmail(), $token, $user->getCreatedDate());
+
         \Container::$request->session()->delete('tmp_user_data');
-        \Container::$request->session()->delete('google_user_data');
 
         return new JsonContent(['success' => true]);
     }
 
+    public function signupWithGoogle(): IContent
+    {
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
+            return new JsonContent(['success' => true]);
+        }
+
+        $userData = \Container::$request->session()->get('google_user_data');
+
+        $user = $this->userRepository->getByEmail($userData['email']);
+
+        if ($user === null) {
+            $sendWelcomeEmail = true;
+
+            $user = new User();
+            $user->setEmail($userData['email']);
+            $user->setCreatedDate(new DateTime());
+        } else {
+            $sendWelcomeEmail = false;
+        }
+
+        $user->setActive(true);
+        $user->setGoogleSub($userData['sub']);
+
+        \Container::$persistentDataManager->saveToDb($user);
+
+        if ($sendWelcomeEmail) {
+            $this->sendWelcomeEmail($user->getEmail());
+        }
+
+        \Container::$request->session()->delete('google_user_data');
+        \Container::$request->setUser($user);
+
+        $this->deleteRedirectUrl();
+        return new JsonContent(['success' => true]);
+    }
+
     public function resetSignup(): IContent
     {
         \Container::$request->session()->delete('tmp_user_data');
@@ -485,12 +482,12 @@ class LoginController
             }
         }
 
-        $user = $this->userRepository->getByEmailOrUsername(\Container::$request->post('email'));
+        $user = $this->userRepository->getByEmail(\Container::$request->post('email'));
 
         if ($user === null) {
             return new JsonContent([
                 'error' => [
-                    'errorText' => 'No user found with the given email address / username. You can <a href="/signup" title="Sign up">sign up</a>!'
+                    'errorText' => 'No user found with the given email address. You can <a href="/signup" title="Sign up">sign up</a>!'
                 ]
             ]);
         }
@@ -500,7 +497,7 @@ class LoginController
 
             return new JsonContent([
                 'error' => [
-                    'errorText' => 'User found with the given email address / username, but the account is not activated. ' .
+                    'errorText' => 'User found with the given email address, but the account is not activated. ' .
                         'Please check your email and click on the activation link!'
                 ]
             ]);

src/Controller/UserController.php

@@ -8,7 +8,6 @@ use SokoWeb\Interfaces\Response\IRedirect;
 use SokoWeb\OAuth\GoogleOAuth;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\Repository\GuessRepository;
-use MapGuesser\Repository\UserRepository;
 use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Repository\UserInChallengeRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;
@@ -20,8 +19,6 @@ use SokoWeb\Util\JwtParser;
 
 class UserController implements IAuthenticationRequired
 {
-    private UserRepository $userRepository;
-
     private UserConfirmationRepository $userConfirmationRepository;
 
     private UserPasswordResetterRepository $userPasswordResetterRepository;
@@ -34,7 +31,6 @@ class UserController implements IAuthenticationRequired
 
     public function __construct()
     {
-        $this->userRepository = new UserRepository();
         $this->userConfirmationRepository = new UserConfirmationRepository();
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
         $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
@@ -57,130 +53,6 @@ class UserController implements IAuthenticationRequired
         return new HtmlContent('account/account', ['user' => $user->toArray()]);
     }
 
-    public function getGoogleConnectRedirect(): IRedirect
-    {
-        /**
-         * @var User $user
-         */
-        $user = \Container::$request->user();
-
-        $state = bin2hex(random_bytes(16));
-        $nonce = bin2hex(random_bytes(16));
-
-        \Container::$request->session()->set('oauth_state', $state);
-        \Container::$request->session()->set('oauth_nonce', $nonce);
-
-        $oAuth = new GoogleOAuth(new Request());
-
-        $url = $oAuth->getDialogUrl(
-            $state,
-            \Container::$request->getBase() . \Container::$routeCollection->getRoute('account.googleConnect-confirm')->generateLink(),
-            $nonce,
-            $user->getEmail()
-        );
-
-        return new Redirect($url, IRedirect::TEMPORARY);
-    }
-
-    public function getGoogleConnectConfirm(): IContent
-    {
-        $defaultError = 'Authentication with Google failed. Please <a href="' . \Container::$routeCollection->getRoute('account.googleConnect')->generateLink() . '" title="Connect with Google">try again</a>!';
-
-        if (\Container::$request->query('state') !== \Container::$request->session()->get('oauth_state')) {
-            return new HtmlContent('account/google_connect', ['success' => false, 'error' => $defaultError]);
-        }
-
-        $oAuth = new GoogleOAuth(new Request());
-        $tokenData = $oAuth->getToken(
-            \Container::$request->query('code'),
-            \Container::$request->getBase() . \Container::$routeCollection->getRoute('account.googleConnect-confirm')->generateLink()
-        );
-        if (!isset($tokenData['id_token'])) {
-            return new HtmlContent('account/google_connect', ['success' => false, 'error' => $defaultError]);
-        }
-
-        $jwtParser = new JwtParser($tokenData['id_token']);
-        $idToken = $jwtParser->getPayload();
-        if ($idToken['nonce'] !== \Container::$request->session()->get('oauth_nonce')) {
-            return new HtmlContent('account/google_connect', ['success' => false, 'error' => $defaultError]);
-        }
-
-        $anotherUser = $this->userRepository->getByGoogleSub($idToken['sub']);
-        if ($anotherUser !== null) {
-            return new HtmlContent('account/google_connect', [
-                'success' => false,
-                'error' => 'This Google account is linked to another account.'
-            ]);
-        }
-
-        \Container::$request->session()->set('google_user_data', $idToken);
-
-        /**
-         * @var User $user
-         */
-        $user = \Container::$request->user();
-
-        return new HtmlContent('account/google_connect', [
-            'success' => true,
-            'googleAccount' => $idToken['email'],
-            'userEmail' => $user->getEmail()
-        ]);
-    }
-
-    public function connectGoogle(): IContent
-    {
-        /**
-         * @var User $user
-         */
-        $user = \Container::$request->user();
-        if (!$user->checkPassword(\Container::$request->post('password'))) {
-            return new JsonContent([
-                'error' => [
-                    'errorText' => 'The given password is wrong.'
-                ]
-            ]);
-        }
-
-        $googleUserData = \Container::$request->session()->get('google_user_data');
-        $user->setGoogleSub($googleUserData['sub']);
-        \Container::$persistentDataManager->saveToDb($user);
-
-        return new JsonContent(['success' => true]);
-    }
-
-    public function getGoogleDisconnectConfirm(): IContent
-    {
-        /**
-         * @var User $user
-         */
-        $user = \Container::$request->user();
-
-        return new HtmlContent('account/google_disconnect', [
-            'success' => true,
-            'userEmail' => $user->getEmail()
-        ]);
-    }
-
-    public function disconnectGoogle(): IContent
-    {
-        /**
-         * @var User $user
-         */
-        $user = \Container::$request->user();
-        if (!$user->checkPassword(\Container::$request->post('password'))) {
-            return new JsonContent([
-                'error' => [
-                    'errorText' => 'The given password is wrong.'
-                ]
-            ]);
-        }
-
-        $user->setGoogleSub(null);
-        \Container::$persistentDataManager->saveToDb($user);
-
-        return new JsonContent(['success' => true]);
-    }
-
     public function getGoogleAuthenticateRedirect(): IRedirect
     {
         /**
@@ -276,32 +148,6 @@ class UserController implements IAuthenticationRequired
             return new JsonContent(['error' => ['errorText' => $error]]);
         }
 
-        $newEmail = \Container::$request->post('email');
-        if ($newEmail !== $user->getEmail()) {
-            if (!filter_var($newEmail, FILTER_VALIDATE_EMAIL)) {
-                return new JsonContent(['error' => ['errorText' => 'The given email address is not valid.']]);
-            }
-
-            if ($this->userRepository->getByEmail($newEmail) !== null) {
-                return new JsonContent(['error' => ['errorText' => 'The given email address belongs to another account.']]);
-            }
-
-            $user->setEmail($newEmail);
-        }
-
-        $newUsername = \Container::$request->post('username');
-        if (strlen($newUsername) > 0 && $newUsername !== $user->getUsername()) {
-            if (preg_match('/^[a-zA-Z0-9_\-\.]+$/', $newUsername) !== 1) {
-                return new JsonContent(['error' => ['errorText' => 'Username can contain only english letters, digits, - (hyphen), . (dot), _ (underscore).']]);
-            }
-
-            if ($this->userRepository->getByUsername($newUsername) !== null) {
-                return new JsonContent(['error' => ['errorText' => 'The given username is already taken.']]);
-            }
-
-            $user->setUsername($newUsername);
-        }
-
         if (strlen(\Container::$request->post('password_new')) > 0) {
             if (strlen(\Container::$request->post('password_new')) < 6) {
                 return new JsonContent([

src/PersistentData/Model/User.php

@@ -8,14 +8,12 @@ class User extends Model implements IUser
 {
     protected static string $table = 'users';
 
-    protected static array $fields = ['email', 'username', 'password', 'type', 'active', 'google_sub', 'created'];
+    protected static array $fields = ['email', 'password', 'type', 'active', 'google_sub', 'created'];
 
     private static array $types = ['user', 'admin'];
 
     private string $email = '';
 
-    private string $username = '';
-
     private ?string $password = null;
 
     private string $type = 'user';
@@ -31,11 +29,6 @@ class User extends Model implements IUser
         $this->email = $email;
     }
 
-    public function setUsername(string $username): void
-    {
-        $this->username = $username;
-    }
-
     public function setPassword(?string $hashedPassword): void
     {
         $this->password = $hashedPassword;
@@ -78,11 +71,6 @@ class User extends Model implements IUser
         return $this->email;
     }
 
-    public function getUsername(): string
-    {
-        return $this->username;
-    }
-
     public function getPassword(): ?string
     {
         return $this->password;
@@ -132,7 +120,7 @@ class User extends Model implements IUser
 
     public function getDisplayName(): string
     {
-        return $this->username;
+        return $this->email;
     }
 
     public function checkPassword(string $password): bool

src/Repository/UserRepository.php

@@ -22,23 +22,6 @@ class UserRepository implements IUserRepository
         return \Container::$persistentDataManager->selectFromDb($select, User::class);
     }
 
-    public function getByUsername(string $username): ?User
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('username', '=', $username);
-
-        return \Container::$persistentDataManager->selectFromDb($select, User::class);
-    }
-
-    public function getByEmailOrUsername(string $emailOrUsername): ?User
-    {
-        if (filter_var($emailOrUsername, FILTER_VALIDATE_EMAIL)) {
-            return $this->getByEmail($emailOrUsername);
-        }
-
-        return $this->getByUsername($emailOrUsername);
-    }
-
     public function getByGoogleSub(string $sub): ?User
     {
         $select = new Select(\Container::$dbConnection);

src/Util/UsernameGenerator.php

@@ -1,247 +0,0 @@
-<?php namespace MapGuesser\Util;
-
-class UsernameGenerator
-{
-    const ADJECTIVES = [
-        'abundant',
-        'agile',
-        'alluring',
-        'ample',
-        'adorable',
-        'angry',
-        'anxious',
-        'astonishing',
-        'beautiful',
-        'big',
-        'bitter',
-        'blissful',
-        'blue',
-        'brave',
-        'bright',
-        'brilliant',
-        'busy',
-        'calm',
-        'captivating',
-        'careful',
-        'charming',
-        'cheerful',
-        'clumsy',
-        'colorful',
-        'confused',
-        'cooperative',
-        'courageous',
-        'cozy',
-        'crispy',
-        'curious',
-        'dazzling',
-        'delightful',
-        'determined',
-        'eager',
-        'elegant',
-        'enchanting',
-        'enthusiastic',
-        'exciting',
-        'exquisite',
-        'faithful',
-        'fancy',
-        'fearless',
-        'fierce',
-        'fluffy',
-        'fresh',
-        'friendly',
-        'frigid',
-        'funny',
-        'gentle',
-        'glorious',
-        'graceful',
-        'grateful',
-        'happy',
-        'harmonious',
-        'healthy',
-        'helpful',
-        'honest',
-        'hopeful',
-        'hot',
-        'humble',
-        'hungry',
-        'impressive',
-        'infamous',
-        'innocent',
-        'intense',
-        'jolly',
-        'joyful',
-        'kind',
-        'lively',
-        'lonely',
-        'lovely',
-        'lucky',
-        'mysterious',
-        'naughty',
-        'nervous',
-        'nutritious',
-        'obedient',
-        'peaceful',
-        'playful',
-        'polite',
-        'powerful',
-        'precious',
-        'proud',
-        'radiant',
-        'reckless',
-        'reliable',
-        'rich',
-        'romantic',
-        'rough',
-        'sad',
-        'scary',
-        'sensitive',
-        'shiny',
-        'silky',
-        'sincere',
-        'sleepy',
-        'smart',
-        'sneaky',
-        'soft',
-        'sparkling',
-        'splendid',
-        'strong',
-        'stubborn',
-        'sweet',
-        'tender',
-        'thoughtful',
-        'thrilling',
-        'timid',
-        'tranquil',
-        'trustworthy',
-        'unique',
-        'vibrant',
-        'victorious',
-        'warm',
-        'wise',
-        'witty',
-        'wonderful',
-        'worried',
-        'zealous'
-    ];
-
-    const NOUNS = [
-        'airplane',
-        'ant',
-        'apple',
-        'aquarium',
-        'backpack',
-        'banana',
-        'bear',
-        'bee',
-        'camera',
-        'car',
-        'cat',
-        'chocolate',
-        'desk',
-        'diamond',
-        'dog',
-        'dolphin',
-        'duck',
-        'egg',
-        'eiffeltower',
-        'elephant',
-        'fire',
-        'flower',
-        'forest',
-        'fork',
-        'fox',
-        'galaxy',
-        'giraffe',
-        'globe',
-        'guitar',
-        'hammer',
-        'hamster',
-        'hat',
-        'house',
-        'icecream',
-        'iguana',
-        'island',
-        'jacket',
-        'jaguar',
-        'jellyfish',
-        'jigsaw',
-        'kangaroo',
-        'key',
-        'kite',
-        'koala',
-        'lamp',
-        'lighthouse',
-        'lightning',
-        'lion',
-        'llama',
-        'moon',
-        'mountain',
-        'mouse',
-        'necklace',
-        'nest',
-        'newt',
-        'notebook',
-        'ocean',
-        'octopus',
-        'orchid',
-        'owl',
-        'panda',
-        'pencil',
-        'penguin',
-        'piano',
-        'queen',
-        'quilt',
-        'quokka',
-        'rabbit',
-        'rainbow',
-        'robot',
-        'ship',
-        'snake',
-        'statue',
-        'sun',
-        'sunflower',
-        'table',
-        'telescope',
-        'tiger',
-        'tree',
-        'turtle',
-        'uakari',
-        'umbrella',
-        'unicorn',
-        'universe',
-        'vase',
-        'violin',
-        'volcano',
-        'vulture',
-        'wallaby',
-        'waterfall',
-        'whale',
-        'xray',
-        'xylophone',
-        'yacht',
-        'yak',
-        'yarn',
-        'yeti',
-        'zebra',
-        'zeppelin',
-        'zucchini',
-    ];
-
-    function generate(): string
-    {
-        $numberOfAdjectives = count(self::ADJECTIVES);
-        $numberOfNouns = count(self::NOUNS);
-
-        $firstAdjective = self::ADJECTIVES[mt_rand(0, $numberOfAdjectives - 1)];
-        do {
-            $secondAdjective = self::ADJECTIVES[mt_rand(0, $numberOfAdjectives - 1)];
-        } while ($firstAdjective === $secondAdjective);
-        $noun = self::NOUNS[mt_rand(0, $numberOfNouns - 1)];
-
-        $firstAdjective = ucfirst($firstAdjective);
-        $secondAdjective = ucfirst($secondAdjective);
-        $noun = ucfirst($noun);
-
-        return $firstAdjective . $secondAdjective . $noun;
-    }
-}

tests/Util/UsernameGeneratorTest.php

@@ -1,23 +0,0 @@
-<?php namespace MapGuesser\Tests\Util;
-
-use MapGuesser\Util\UsernameGenerator;
-use PHPUnit\Framework\TestCase;
-
-final class UsernameGeneratorTest extends TestCase
-{
-    public function testCanGenerateRandomUsernameFromComponents(): void
-    {
-        $generator = new UsernameGenerator();
-        $parts = $this->getUsernameParts($generator->generate());
-
-        $this->assertEquals(3, count($parts));
-        $this->assertContains($parts[0], UsernameGenerator::ADJECTIVES);
-        $this->assertContains($parts[1], UsernameGenerator::ADJECTIVES);
-        $this->assertContains($parts[2], UsernameGenerator::NOUNS);
-    }
-
-    private function getUsernameParts(string $username): array
-    {
-        return explode('-', strtolower(preg_replace('/([a-z])([A-Z])/', '$1-$2', $username)));
-    }
-}

views/account/account.php

@@ -5,11 +5,11 @@
 @section(main)
     <h2>Account</h2>
     <div class="box">
-        <form id="accountForm" action="/account" method="post" data-reload-on-success="true" data-observe-inputs="email,username,password_new,password_new_confirm">
+        <form id="accountForm" action="/account" method="post" data-observe-inputs="password_new,password_new_confirm">
             <?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" autocomplete="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): ?>
@@ -23,23 +23,16 @@
                 </div>
             <?php endif; ?>
             <hr>
-            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" value="<?= $user['email'] ?>">
+            <?php /* TODO: disabled for the time being, email modification should be implemented */ ?>
-            <input type="username" class="text big fullWidth marginTop" name="username" placeholder="Username" value="<?= $user['username'] ?>">
+            <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_button" disabled>Save</button>
+                <button type="submit" name="submit" disabled>Save</button>
             </div>
             <hr>
-            <div class="center" style="font-size: 0;">
+            <div class="center">
-                <?php if ($user['google_sub'] === null): ?>
-                    <a class="button yellow marginRight" href="<?= Container::$routeCollection->getRoute('account.googleConnect')->generateLink() ?>" title="Connect with Google">Connect with Google</a>
-                <?php else: ?>
-                    <?php if ($user['password'] !== null): ?>
-                        <a class="button yellow marginRight" href="<?= Container::$routeCollection->getRoute('account.googleDisconnect')->generateLink() ?>" title="Disconnect from Google">Disconnect from Google</a>
-                    <?php endif; ?>
-                <?php endif; ?>
                 <a class="button red" href="/account/delete" title="Delete account">Delete account</a>
             </div>
         </form>

views/account/delete.php

@@ -26,7 +26,7 @@
             <?php endif; ?>
             <p id="deleteAccountFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
-                <button class="red marginRight" type="submit" name="submit_button">Delete account</button><!--
+                <button class="red marginRight" type="submit" name="submit">Delete account</button><!--
              --><a class="button gray marginTop" href="/account" title="Back to account">Cancel</a>
             </div>
         </form>

views/account/google_connect.php

@@ -1,22 +0,0 @@
-@extends(templates/layout_normal)
-
-@section(main)
-    <h2>Connect with Google</h2>
-    <div class="box compactBox">
-        <?php if (!$success): ?>
-            <p class="error justify"><?= $error ?></p>
-        <?php else: ?>
-            <form id="connectGoogleForm" action="<?= Container::$routeCollection->getRoute('account.googleConnect-action')->generateLink() ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('account')->generateLink() ?>">
-                <p class="justify marginBottom">Your account will be connected with the following Google account: <b><?= $googleAccount ?></b></p>
-                <input type="email" style="display: none;" name="email" autocomplete="username" value="<?= $userEmail ?>">
-                <p class="formLabel marginTop">Password</p>
-                <input type="password" class="text big fullWidth" name="password" autocomplete="current-password" required minlength="6" autofocus>
-                <p class="formError justify marginTop"></p>
-                <div class="right marginTop">
-                    <button class="marginRight" type="submit" name="submit"><i class="fa-solid fa-link"></i> Connect</button><!--
-                 --><a class="button gray" href="<?= Container::$routeCollection->getRoute('account')->generateLink() ?>" title="Back to account">Cancel</a>
-                </div>
-            </form>
-        <?php endif; ?>
-    </div>
-@endsection

views/account/google_disconnect.php

@@ -1,18 +0,0 @@
-@extends(templates/layout_normal)
-
-@section(main)
-    <h2>Disconnect from Google</h2>
-    <div class="box compactBox">
-        <form id="connectGoogleForm" action="<?= Container::$routeCollection->getRoute('account.googleDisconnect-action')->generateLink() ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('account')->generateLink() ?>">
-            <p class="justify marginBottom">Your account will be disconnected from the currently set Google account.</p>
-            <input type="email" style="display: none;" name="email" autocomplete="username" value="<?= $userEmail ?>">
-            <p class="formLabel marginTop">Password</p>
-            <input type="password" class="text big fullWidth" name="password" autocomplete="current-password" required minlength="6" autofocus>
-            <p class="formError justify marginTop"></p>
-            <div class="right marginTop">
-                <button class="red marginRight" type="submit" name="submit"><i class="fa-solid fa-link-slash"></i> Disconnect</button><!--
-             --><a class="button gray" href="<?= Container::$routeCollection->getRoute('account')->generateLink() ?>" title="Back to account">Cancel</a>
-            </div>
-        </form>
-    </div>
-@endsection

views/login/google_signup.php

@@ -5,13 +5,21 @@
 @section(main)
     <h2>Sign up</h2>
     <div class="box">
-        <form id="googleSignupForm" action="/signup" method="post" data-redirect-on-success="/signup/success">
+        <form id="googleSignupForm" action="/signup/google" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
-            <p class="justify">Please confirm your sign up request. Your account will be linked to your Google account.</p>
+            <?php if ($found): ?>
+                <p class="justify">Please confirm that you link your account to your Google account.</p>
+            <?php else: ?>
+                <p class="justify">Please confirm your sign up request. Your account will be linked to your Google account.</p>
+            <?php endif; ?>
             <input type="email" class="text big fullWidth marginTop" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
-            <input type="username" class="text big fullWidth marginTop" name="username" placeholder="Username">
-            <p id="googleSignupFormError" class="formError justify marginTop"></p>
             <div class="right">
-                <button class="marginTop marginRight" type="submit">Sign up</button><!--
+                <button class="marginTop marginRight" type="submit">
+                    <?php if ($found): ?>
+                        Link
+                    <?php else: ?>
+                        Sign up
+                    <?php endif; ?>
+                </button><!--
              --><button id="cancelGoogleSignupButton" class="gray marginTop" type="button">Cancel</button>
             </div>
         </form>

views/login/login.php

@@ -4,7 +4,7 @@
     <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 / username" autocomplete="username" required autofocus>
+            <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">

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 / username" autocomplete="username" 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/signup.php

@@ -8,7 +8,7 @@
     <div class="box">
         <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 / username. Sign up with one click!</p>
+                <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" 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: ?>
@@ -16,7 +16,6 @@
                 <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; ?>
-            <input type="username" class="text big fullWidth marginTop" name="username" placeholder="Username">
             <?php if (!empty($_ENV['RECAPTCHA_SITEKEY'])): ?>
                 <div class="marginTop">
                     <div class="g-recaptcha" data-sitekey="<?= $_ENV['RECAPTCHA_SITEKEY'] ?>"></div>

web.php

@@ -38,6 +38,7 @@ Container::$routeCollection->group('signup', function (RouteCollection $routeCol
     $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']);
@@ -57,11 +58,6 @@ Container::$routeCollection->group('account', function (RouteCollection $routeCo
     $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.googleConnect', 'googleConnect', [UserController::class, 'getGoogleConnectRedirect']);
-    $routeCollection->get('account.googleConnect-confirm', 'googleConnect/code', [UserController::class, 'getGoogleConnectConfirm']);
-    $routeCollection->post('account.googleConnect-action', 'googleConnect', [UserController::class, 'connectGoogle']);
-    $routeCollection->get('account.googleDisconnect', 'googleDisconnect', [UserController::class, 'getGoogleDisconnectConfirm']);
-    $routeCollection->post('account.googleDisconnect-action', 'googleDisconnect', [UserController::class, 'disconnectGoogle']);
     $routeCollection->get('account.googleAuthenticate', 'googleAuthenticate', [UserController::class, 'getGoogleAuthenticateRedirect']);
     $routeCollection->get('account.googleAuthenticate-action', 'googleAuthenticate/code', [UserController::class, 'authenticateWithGoogle']);
 });