diff --git a/backend/loginJwtDriver.php b/backend/loginJwtDriver.php index 4169b32..fdd87e9 100644 --- a/backend/loginJwtDriver.php +++ b/backend/loginJwtDriver.php @@ -45,10 +45,9 @@ try { $pepper = getenv('SECRET_KEY_HMAC'); $stmt = $con->prepare(' - 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 + SELECT id, phone, national_number, email, password, birthdate + FROM driver + WHERE id = :id LIMIT 1 '); $stmt->execute([':id' => $id]); @@ -76,9 +75,6 @@ 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); @@ -93,9 +89,6 @@ 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); diff --git a/backend/test_hash.php b/backend/test_hash.php deleted file mode 100644 index 5004bc9..0000000 --- a/backend/test_hash.php +++ /dev/null @@ -1,54 +0,0 @@ -prepare(' - SELECT d.id, d.phone, d.national_number, d.email, d.password, c.year - FROM driver d - LEFT JOIN CarRegistration c ON c.driverID = d.id - WHERE d.id = :id - LIMIT 1 -'); -$stmt->execute([':id' => $id]); -$driver = $stmt->fetch(); -$pepper = getenv('SECRET_KEY_HMAC'); - -$res = ['driver' => $driver]; - -$oldParts = [ - $driver['id'], - $driver['phone'], -]; -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); - -$res['oldString'] = $oldString; -$res['password_verify_old'] = password_verify($oldSecret, $driver['password']); - -$decPhone = !empty($driver['phone']) ? $encryptionHelper->decryptData($driver['phone']) : null; -$decNat = !empty($driver['national_number']) ? $encryptionHelper->decryptData($driver['national_number']) : null; - -$newParts = [ - $driver['id'], - trim($decPhone), -]; -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); - -$res['newString'] = $newString; -$res['password_verify_new'] = password_verify($newSecret, $driver['password']); -$res['decPhone'] = $decPhone; - -echo json_encode($res);