handle empty api_token on getFromApiToken, getFromBearerToken and authenticateApi
This commit is contained in:
parent
e1d1dac29b
commit
f1bb225127
1 changed files with 3 additions and 3 deletions
|
|
@ -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));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue