From 80e457d6e362a5b2300f167ee772f45f136ac7f5 Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <hamzaayedflutter@gmail.com>
Date: Sat, 1 Aug 2026 16:14:16 +0300
Subject: [PATCH] Fix loginJwtDriver.php: include CarRegistration year in hash
 to match register.php

---
 backend/loginJwtDriver.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/backend/loginJwtDriver.php b/backend/loginJwtDriver.php
index fdd87e9..4169b32 100644
--- a/backend/loginJwtDriver.php
+++ b/backend/loginJwtDriver.php
@@ -45,9 +45,10 @@ try {
     $pepper = getenv('SECRET_KEY_HMAC');
 
     $stmt = $con->prepare('
-        SELECT id, phone, national_number, email, password, birthdate
-        FROM driver
-        WHERE id = :id
+        SELECT d.id, d.phone, d.national_number, d.email, d.password, d.birthdate, c.year
+        FROM driver d
+        LEFT JOIN CarRegistration c ON c.driverID = d.id
+        WHERE d.id = :id
         LIMIT 1
     ');
     $stmt->execute([':id' => $id]);
@@ -75,6 +76,9 @@ try {
     if (!empty($decNat)) {
         $newParts[] = trim($decNat);
     }
+    if (!empty($driver['year']) && preg_match('/^\d{4}$/', $driver['year'])) {
+        $newParts[] = $driver['year'];
+    }
     $newString = implode('|', $newParts);
     $newSecret = hash_hmac('sha256', $newString, $pepper, true);
 
@@ -89,6 +93,9 @@ try {
         if (!empty($driver['national_number'])) {
             $oldParts[] = $driver['national_number'];
         }
+        if (!empty($driver['year']) && preg_match('/^\d{4}$/', $driver['year'])) {
+            $oldParts[] = $driver['year'];
+        }
         $oldString = implode('|', $oldParts);
         $oldSecret = hash_hmac('sha256', $oldString, $pepper, true);