From 2dd34afaf06b9cd57dcb17995d90effcbee6db9e Mon Sep 17 00:00:00 2001
From: elbacalau <oriolreverte36@gmail.com>
Date: Tue, 17 Dec 2024 21:07:10 +0100
Subject: [PATCH] feat: consolidate user update functionality by merging update
 and updatePassword methods in AccountController

---
 .../Controllers/Admin/AccountController.php   | 56 ++++--------------
 .../Admin/AccountConfig/AccountConfig.php     | 59 +++++++------------
 app/src/public/assets/js/app.js               | 41 -------------
 app/src/routes/admin.php                      |  6 +-
 4 files changed, 32 insertions(+), 130 deletions(-)

diff --git a/app/src/app/Controllers/Admin/AccountController.php b/app/src/app/Controllers/Admin/AccountController.php
index 6af631f..985dd19 100644
--- a/app/src/app/Controllers/Admin/AccountController.php
+++ b/app/src/app/Controllers/Admin/AccountController.php
@@ -25,7 +25,6 @@ public function index($queryParams)
 
     public function update($id, $postData)
     {
-
         $user = User::find(id: $id);
 
         if (!$user) {
@@ -34,61 +33,28 @@ public function update($id, $postData)
             exit;
         }
 
+        
         $user->name = $postData['name'];
         $user->surname = $postData['surname'];
+
+        // detect password changes
+        if (!empty($postData['password'])) {
+            $user->password = password_hash($postData['password'], PASSWORD_DEFAULT);
+        }
+
+    
         $user->save();
 
-        // **warning: recharge the user session with the new data
+            
         Session::set('user', [
             'id' => $user->getId(),
             'name' => $user->name,
-            'surname' => $user->surname[0],
+            'surname' => $user->surname,
             'email' => $user->email,
             'role' => $user->role,
-
         ]);
 
-        Session::set('success', 'Usuario actualizado correctamente');
-
-
-
-        header('Location: /admin/configuration');
-    }
-
-    // method to update the password
-    public function updatePassword($id, $postData)
-    {
-
-        $user = User::find(id: $id);
-
-
-        if (!$user) {
-            Session::set('error', 'Usuario no encontrado');
-            header('Location: /admin/configuration');
-            exit;
-        }
-
-        if (!password_verify($postData['current_password'], $user->password)) {
-            Session::set('error', 'La contraseña actual es incorrecta');
-            header('Location: /admin/configuration');
-            exit;
-        }
-
-
-        if ($postData['password'] !== $postData['password_confirmation']) {
-            Session::set('error', 'Las contraseñas no coinciden');
-            header('Location: /admin/configuration');
-            exit;
-        }
-
-
-        $user->password = password_hash($postData['password'], PASSWORD_DEFAULT);
-        $user->save();
-
-        session_unset();
-        session_destroy(); 
-
-        Session::set('success', 'Contraseña actualizada correctamente');
+        Session::set('success', 'Usuario y/o contraseña actualizados correctamente');
         header('Location: /admin/configuration');
     }
 }
diff --git a/app/src/app/Views/Admin/AccountConfig/AccountConfig.php b/app/src/app/Views/Admin/AccountConfig/AccountConfig.php
index 909c809..baa5589 100644
--- a/app/src/app/Views/Admin/AccountConfig/AccountConfig.php
+++ b/app/src/app/Views/Admin/AccountConfig/AccountConfig.php
@@ -1,8 +1,8 @@
 <div class="mt-8">
     <h1 class="text-5xl font-semibold">Configuración</h1>
     <p class="text-md text-gray-600 mt-3">Aquí podrás configurar tu cuenta.</p>
-    <article>
-        <h2 class="text-3xl font-semibold col-span-4 mb-5">Informacíon personal</h2>
+    <article class="mb-10">
+        <h2 class="text-3xl font-semibold col-span-4 mb-5 mt-8">Informacíon personal</h2>
 
         <form action="/admin/configuration/<?= $user->getId() ?>/update" method="POST" class="grid grid-cols-4 gap-4">
             <!-- user info -->
@@ -73,27 +73,9 @@ class="mt-1 px-3 py-2 border rounded-md text-gray-600 bg-gray-100 cursor-not-all
                 </div>
             </div>
 
-            <!-- save button -->
-            <div class="col-span-4 flex justify-end">
-                <button
-                    id="button-save"
-                    type="submit"
-                    class="bg-gray-400 text-gray-500 py-2 px-4 rounded-lg cursor-not-allowed disabled:bg-gray-400 disabled:text-white"
-                    disabled>
-                    Guardar cambios
-                </button>
-            </div>
-        </form>
-    </article>
-
-
-
-    <hr class="mt-8">
-    <article>
-        <h1 class="text-3xl font-semibold col-span-4 mt-12">Cambiar contraseña</h1>
-
-        <form action="/admin/configuration/<?= $user->getId() ?>/update-password" method="POST" class="flex flex-col justify-between h-full">
-            <div class="mt-4 mb-10 grid grid-cols-4 gap-4">
+            <!-- password change info -->
+            <h3 class="text-3xl font-semibold col-span-4 mt-12">Cambiar contraseña</h3>
+            <div class="mt-4 mb-10 grid grid-cols-2 gap-4">
                 <div class="flex flex-col">
                     <label for="current-password" class="text-sm font-semibold text-gray-700">Contraseña actual</label>
                     <input
@@ -101,7 +83,7 @@ class="bg-gray-400 text-gray-500 py-2 px-4 rounded-lg cursor-not-allowed disable
                         id="current-password"
                         name="current_password"
                         class="mt-1 px-3 py-2 border rounded-md text-gray-600 bg-gray-100"
-                        oninput="checkPasswordFields()">
+                        oninput="checkChanges()">
                 </div>
                 <div class="flex flex-col">
                     <label for="new-password" class="text-sm font-semibold text-gray-700">Nueva contraseña</label>
@@ -110,7 +92,7 @@ class="mt-1 px-3 py-2 border rounded-md text-gray-600 bg-gray-100"
                         id="new-password"
                         name="password"
                         class="mt-1 px-3 py-2 border rounded-md text-gray-600 bg-gray-100"
-                        oninput="checkPasswordFields()">
+                        oninput="checkChanges()">
                 </div>
                 <div class="flex flex-col">
                     <label for="confirm-password" class="text-sm font-semibold text-gray-700">Confirmar contraseña</label>
@@ -119,23 +101,22 @@ class="mt-1 px-3 py-2 border rounded-md text-gray-600 bg-gray-100"
                         id="confirm-password"
                         name="password_confirmation"
                         class="mt-1 px-3 py-2 border rounded-md text-gray-600 bg-gray-100"
-                        oninput="checkPasswordFields()">
-                </div>
-
-                <!-- Botón Guardar -->
-                <div class="col-span-4 flex justify-end">
-                    <button
-                        id="button-save-password"
-                        type="submit"
-                        class="bg-gray-400 text-gray-500 py-2 px-4 rounded-lg cursor-not-allowed disabled:bg-gray-400 disabled:text-white"
-                        disabled>
-                        Guardar cambios
-                    </button>
+                        oninput="checkChanges()">
                 </div>
             </div>
-        </form>
 
-    </article>
 
 
+            <!-- save button -->
+            <div class="col-span-4 flex justify-end">
+                <button
+                    id="button-save"
+                    type="submit"
+                    class="bg-gray-400 text-gray-500 py-2 px-4 rounded-lg cursor-not-allowed disabled:bg-gray-400 disabled:text-white"
+                    disabled>
+                    Guardar cambios
+                </button>
+            </div>
+        </form>
+    </article>
 </div>
\ No newline at end of file
diff --git a/app/src/public/assets/js/app.js b/app/src/public/assets/js/app.js
index eeb0124..800fd42 100644
--- a/app/src/public/assets/js/app.js
+++ b/app/src/public/assets/js/app.js
@@ -420,44 +420,3 @@ function checkChanges() {
         );
     }
 }
-
-function checkPasswordFields() {
-    const currentPassword = document
-        .getElementById("current-password")
-        .value.trim();
-    const newPassword = document.getElementById("new-password").value.trim();
-    const confirmPassword = document
-        .getElementById("confirm-password")
-        .value.trim();
-    const button = document.getElementById("button-save-password");
-
-    if (
-        currentPassword !== "" &&
-        newPassword !== "" &&
-        confirmPassword !== ""
-    ) {
-        button.disabled = false;
-        button.classList.remove(
-            "bg-gray-300",
-            "cursor-not-allowed",
-            "text-gray-500"
-        );
-        button.classList.add(
-            "bg-green-500",
-            "hover:bg-green-600",
-            "text-white"
-        );
-    } else {
-        button.disabled = true;
-        button.classList.add(
-            "bg-gray-300",
-            "cursor-not-allowed",
-            "text-gray-500"
-        );
-        button.classList.remove(
-            "bg-green-500",
-            "hover:bg-green-600",
-            "text-white"
-        );
-    }
-}
diff --git a/app/src/routes/admin.php b/app/src/routes/admin.php
index 6770922..4384543 100644
--- a/app/src/routes/admin.php
+++ b/app/src/routes/admin.php
@@ -304,15 +304,11 @@
         ],
 
         // === Config POST Routes
+
         '/admin/configuration/:id/update' => [
             'controller' => AccountController::class,
             'method' => 'update',
             'middlewares' => [AdminMiddleware::class],
         ],
-        '/admin/configuration/:id/update-password' => [
-            'controller' => AccountController::class,
-            'method' => 'updatePassword',
-            'middlewares' => [AdminMiddleware::class],
-        ],
     ],
 ];