Security: Fix HMAC handshake, generate API keys in Google Login, and relax JWT issuer
This commit is contained in:
@@ -701,6 +701,14 @@ class AuthController extends Controller
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Generate API keys if missing
|
||||||
|
$passenger = Passenger::find($row->id);
|
||||||
|
if ($passenger && empty($passenger->api_key)) {
|
||||||
|
$this->generateApiKeys($passenger);
|
||||||
|
$row->api_key = $passenger->api_key;
|
||||||
|
$row->api_secret = $passenger->api_secret;
|
||||||
|
}
|
||||||
|
|
||||||
// Decrypt sensitive fields (matching V1 behavior)
|
// Decrypt sensitive fields (matching V1 behavior)
|
||||||
$decryptedFields = [
|
$decryptedFields = [
|
||||||
'phone', 'email', 'gender', 'birthdate', 'site',
|
'phone', 'email', 'gender', 'birthdate', 'site',
|
||||||
@@ -735,21 +743,29 @@ class AuthController extends Controller
|
|||||||
|
|
||||||
$encryptedEmail = $this->encryption->encrypt($request->input('email'));
|
$encryptedEmail = $this->encryption->encrypt($request->input('email'));
|
||||||
|
|
||||||
$driver = DB::connection('primary')
|
$driverRow = DB::connection('primary')
|
||||||
->table('captain')
|
->table('captain')
|
||||||
->where('email', $encryptedEmail)
|
->where('email', $encryptedEmail)
|
||||||
->where('id', $request->input('id'))
|
->where('id', $request->input('id'))
|
||||||
->select('captain.*', 'captain.api_key', 'captain.api_secret')
|
->select('captain.*', 'captain.api_key', 'captain.api_secret')
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
if (!$driver) {
|
if (!$driverRow) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status' => 'Failure',
|
'status' => 'Failure',
|
||||||
'data' => 'User does not exist.',
|
'data' => 'User does not exist.',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = (array) $driver;
|
// Generate API keys if missing
|
||||||
|
$driver = Driver::find($driverRow->id);
|
||||||
|
if ($driver && empty($driver->api_key)) {
|
||||||
|
$this->generateApiKeys($driver);
|
||||||
|
$driverRow->api_key = $driver->api_key;
|
||||||
|
$driverRow->api_secret = $driver->api_secret;
|
||||||
|
}
|
||||||
|
|
||||||
|
$data = (array) $driverRow;
|
||||||
$decryptedFields = [
|
$decryptedFields = [
|
||||||
'phone', 'email', 'gender', 'birthdate',
|
'phone', 'email', 'gender', 'birthdate',
|
||||||
'first_name', 'last_name', 'national_number',
|
'first_name', 'last_name', 'national_number',
|
||||||
|
|||||||
Reference in New Issue
Block a user