Fix loginJwtDriver.php: include CarRegistration year in hash to match register.php
This commit is contained in:
@@ -45,9 +45,10 @@ try {
|
|||||||
$pepper = getenv('SECRET_KEY_HMAC');
|
$pepper = getenv('SECRET_KEY_HMAC');
|
||||||
|
|
||||||
$stmt = $con->prepare('
|
$stmt = $con->prepare('
|
||||||
SELECT id, phone, national_number, email, password, birthdate
|
SELECT d.id, d.phone, d.national_number, d.email, d.password, d.birthdate, c.year
|
||||||
FROM driver
|
FROM driver d
|
||||||
WHERE id = :id
|
LEFT JOIN CarRegistration c ON c.driverID = d.id
|
||||||
|
WHERE d.id = :id
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
');
|
');
|
||||||
$stmt->execute([':id' => $id]);
|
$stmt->execute([':id' => $id]);
|
||||||
@@ -75,6 +76,9 @@ try {
|
|||||||
if (!empty($decNat)) {
|
if (!empty($decNat)) {
|
||||||
$newParts[] = trim($decNat);
|
$newParts[] = trim($decNat);
|
||||||
}
|
}
|
||||||
|
if (!empty($driver['year']) && preg_match('/^\d{4}$/', $driver['year'])) {
|
||||||
|
$newParts[] = $driver['year'];
|
||||||
|
}
|
||||||
$newString = implode('|', $newParts);
|
$newString = implode('|', $newParts);
|
||||||
$newSecret = hash_hmac('sha256', $newString, $pepper, true);
|
$newSecret = hash_hmac('sha256', $newString, $pepper, true);
|
||||||
|
|
||||||
@@ -89,6 +93,9 @@ try {
|
|||||||
if (!empty($driver['national_number'])) {
|
if (!empty($driver['national_number'])) {
|
||||||
$oldParts[] = $driver['national_number'];
|
$oldParts[] = $driver['national_number'];
|
||||||
}
|
}
|
||||||
|
if (!empty($driver['year']) && preg_match('/^\d{4}$/', $driver['year'])) {
|
||||||
|
$oldParts[] = $driver['year'];
|
||||||
|
}
|
||||||
$oldString = implode('|', $oldParts);
|
$oldString = implode('|', $oldParts);
|
||||||
$oldSecret = hash_hmac('sha256', $oldString, $pepper, true);
|
$oldSecret = hash_hmac('sha256', $oldString, $pepper, true);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user