fix HTML syntax error in account.php

database/migrations/structure/20230409_0101_username.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `users`
+ADD `username` varchar(100) DEFAULT NULL,
+ADD UNIQUE `username` (`username`);

public/static/js/rvr.js

@@ -158,12 +158,17 @@ var RVR = {
         document.getElementById('cover').style.visibility = 'hidden';
     },
 
-    observeInput: function (input, buttonToToggle) {
+    observeInput: function (form, observedInputs) {
+        var anyChanged = false;
+
+        for (var i = 0; i < observedInputs.length; i++) {
+            var input = form.elements[observedInputs[i]];
             if (input.defaultValue !== input.value) {
-            buttonToToggle.disabled = false;
+                anyChanged = true;
-        } else {
-            buttonToToggle.disabled = true;
             }
+        }
+
+        form.elements.submit.disabled = !anyChanged;
     },
 
     observeInputsInForm: function (form, observedInputs) {
@@ -174,12 +179,12 @@ var RVR = {
                 case 'INPUT':
                 case 'TEXTAREA':
                     input.oninput = function () {
-                        RVR.observeInput(this, form.elements.submit);
+                        RVR.observeInput(form, observedInputs);
                     };
                     break;
                 case 'SELECT':
                     input.onchange = function () {
-                        RVR.observeInput(this, form.elements.submit);
+                        RVR.observeInput(form, observedInputs);
                     };
                     break;
             }

src/Cli/AddUserCommand.php

@@ -21,6 +21,11 @@ class AddUserCommand extends Command
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
+        if (!filter_var($input->getArgument('email'), FILTER_VALIDATE_EMAIL)) {
+            $output->writeln('<error>Please provide a valid email address.</error>');
+            return 1;
+        }
+
         $user = new User();
         $user->setEmail($input->getArgument('email'));
         $user->setPlainPassword($input->getArgument('password'));

src/Controller/LoginController.php

@@ -109,11 +109,11 @@ class LoginController
             return new JsonContent(['success' => true]);
         }
 
-        $user = $this->userRepository->getByEmail($this->request->post('email'));
+        $user = $this->userRepository->getByEmailOrUsername($this->request->post('email'));
         if ($user === null || !$user->checkPassword($this->request->post('password'))) {
             return new JsonContent([
                 'error' => [
-                    'errorText' => 'No user found with the given email address or the given password is wrong. You can <a href="/password/requestReset?email=' .
+                    'errorText' => 'No user found with the given email address / username or the given password is wrong. You can <a href="/password/requestReset?email=' .
                         urlencode($this->request->post('email')) . '" title="Request password reset">request password reset</a>!'
                 ]
             ]);
@@ -200,11 +200,11 @@ class LoginController
             }
         }
 
-        $user = $this->userRepository->getByEmail($this->request->post('email'));
+        $user = $this->userRepository->getByEmailOrUsername($this->request->post('email'));
         if ($user === null) {
             return new JsonContent([
                 'error' => [
-                    'errorText' => 'No user found with the given email address.'
+                    'errorText' => 'No user found with the given email address / username.'
                 ]
             ]);
         }

src/Controller/UserController.php

@@ -13,6 +13,7 @@ use SokoWeb\Response\HtmlContent;
 use SokoWeb\Response\JsonContent;
 use SokoWeb\Response\Redirect;
 use SokoWeb\Util\JwtParser;
+use RVR\Repository\UserRepository;
 
 class UserController implements ISecured
 {
@@ -20,10 +21,13 @@ class UserController implements ISecured
 
     private PersistentDataManager $pdm;
 
+    private UserRepository $userRepository;
+
     public function __construct(IRequest $request)
     {
         $this->request = $request;
         $this->pdm = new PersistentDataManager();
+        $this->userRepository = new UserRepository();
     }
 
     public function authorize(): bool
@@ -126,8 +130,39 @@ class UserController implements ISecured
             return new JsonContent(['error' => ['errorText' => $error]]);
         }
 
-        if (strlen($this->request->post('password_new')) > 0) {
+        $newEmail = $this->request->post('email');
-            if (strlen($this->request->post('password_new')) < 6) {
+        if ($newEmail !== $user->getEmail()) {
+            if (!filter_var($newEmail, FILTER_VALIDATE_EMAIL)) {
+                return new JsonContent(['error' => ['errorText' => 'Please provide a valid email address.']]);
+            }
+
+            if ($this->userRepository->getByEmail($newEmail) !== null) {
+                return new JsonContent(['error' => ['errorText' => 'The given email address belongs to another account.']]);
+            }
+
+            $user->setEmail($newEmail);
+        }
+
+        $newUsername = $this->request->post('username');
+        if ($newUsername !== $user->getUsername()) {
+            if (strlen($newUsername) > 0) {
+                if (filter_var($newUsername, FILTER_VALIDATE_EMAIL)) {
+                    return new JsonContent(['error' => ['errorText' => 'Please select a username that is not a valid email address.']]);
+                }
+
+                if ($this->userRepository->getByUsername($newUsername) !== null) {
+                    return new JsonContent(['error' => ['errorText' => 'The given username is already taken.']]);
+                }
+
+                $user->setUsername($newUsername);
+            } else {
+                $user->setUsername(null);
+            }
+        }
+
+        $newPassword = $this->request->post('password_new');
+        if (strlen($newPassword) > 0) {
+            if (strlen($newPassword) < 6) {
                 return new JsonContent([
                     'error' => [
                         'errorText' => 'The given new password is too short. Please choose a password that is at least 6 characters long!'
@@ -135,7 +170,7 @@ class UserController implements ISecured
                 ]);
             }
 
-            if ($this->request->post('password_new') !== $this->request->post('password_new_confirm')) {
+            if ($newPassword !== $this->request->post('password_new_confirm')) {
                 return new JsonContent([
                     'error' => [
                         'errorText' => 'The given new passwords do not match.'
@@ -143,7 +178,7 @@ class UserController implements ISecured
                 ]);
             }
 
-            $user->setPlainPassword($this->request->post('password_new'));
+            $user->setPlainPassword($newPassword);
         }
 
         $this->pdm->saveToDb($user);

src/PersistentData/Model/User.php

@@ -8,12 +8,14 @@ class User extends Model implements IUser
 {
     protected static string $table = 'users';
 
-    protected static array $fields = ['email', 'password', 'type', 'google_sub', 'created'];
+    protected static array $fields = ['email', 'username', 'password', 'type', 'google_sub', 'created'];
 
     private static array $types = ['user', 'admin'];
 
     private string $email = '';
 
+    private ?string $username = null;
+
     private ?string $password = null;
 
     private string $type = 'user';
@@ -27,6 +29,11 @@ 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;
@@ -64,6 +71,11 @@ class User extends Model implements IUser
         return $this->email;
     }
 
+    public function getUsername(): ?string
+    {
+        return $this->username;
+    }
+
     public function getPassword(): ?string
     {
         return $this->password;

src/Repository/UserRepository.php

@@ -27,6 +27,23 @@ class UserRepository implements IUserRepository
         return $this->pdm->selectFromDb($select, User::class);
     }
 
+    public function getByUsername(string $username): ?User
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('username', '=', $username);
+
+        return $this->pdm->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);

views/account/account.php

@@ -5,11 +5,11 @@
 @section(main)
     <h2>Account</h2>
     <div class="box">
-        <form id="accountForm" action="/account" method="post" data-observe-inputs="password_new,password_new_confirm">
+        <form id="accountForm" action="/account" method="post" data-observe-inputs="email,username,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" required minlength="6" autofocus><!--
+                    <input type="password" class="text" name="password" placeholder="Current password" required minlength="6" autofocus><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php elseif ($user['password'] !== null): ?>
@@ -23,8 +23,8 @@
                 </div>
             <?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'] ?>">
-            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled>
+            <input type="text" class="text big fullWidth marginTop" name="username" placeholder="Username" value="<?= $user['username'] ?>">
             <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">
             <p id="accountFormError" class="formError justify marginTop"></p>

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" required autofocus>
+            <input type="text" class="text big fullWidth" name="email" placeholder="Email address / Username" 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>
             <div class="right marginTop">