From f1bb2251273418e36cfabc9e27e65147be77c180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Mon, 16 Aug 2021 13:20:03 +0200 Subject: [PATCH] handle empty api_token on getFromApiToken, getFromBearerToken and authenticateApi --- app/Models/Service.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Models/Service.php b/app/Models/Service.php index c11afb0..7d25c4a 100644 --- a/app/Models/Service.php +++ b/app/Models/Service.php @@ -95,7 +95,7 @@ class Service extends Model { $services = static::all(); foreach ($services as $service) { - if (Hash::check($apiToken, $service->api_token)) { + if ($service->api_token and Hash::check($apiToken, $service->api_token)) { return $service; } } @@ -113,7 +113,7 @@ class Service extends Model { $services = static::all(); foreach ($services as $service) { - if (Hash::check($bearerToken, $service->bearer_token)) { + if ($service->bearer_token and Hash::check($bearerToken, $service->bearer_token)) { return $service; } } @@ -129,7 +129,7 @@ class Service extends Model */ public function authenticateApi(string $apiToken): bool { - return Hash::check($apiToken, $this->api_token) and + return $this->api_token and Hash::check($apiToken, $this->api_token) and ((abs(strtotime($this->api_token_date) - time()) * 60) < (config('api.tokenTimeout') * 60)); }