Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

Allow ping with api_secret or account token

Browse Source
This commit is contained in:
Hillel Coren 2017-03-05 12:29:28 +02:00
parent ab52dcdc15
commit 2ca410d92e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Middleware/ApiCheck.php
View File

@ -28,7 +28,6 @@ class ApiCheck
{ {
$loggingIn = $request->is('api/v1/login') $loggingIn = $request->is('api/v1/login')
|| $request->is('api/v1/register') || $request->is('api/v1/register')
|| $request->is('api/v1/ping')
|| $request->is('api/v1/oauth_login'); || $request->is('api/v1/oauth_login');
$headers = Utils::getApiHeaders(); $headers = Utils::getApiHeaders();
@ -55,6 +54,8 @@ class ApiCheck
if ($token && $token->user) { if ($token && $token->user) {
Auth::onceUsingId($token->user_id); Auth::onceUsingId($token->user_id);
Session::set('token_id', $token->id); Session::set('token_id', $token->id);
} elseif ($hasApiSecret && $request->is('api/v1/ping')) {
// do nothing: allow ping with api_secret or account token
} else { } else {
sleep(ERROR_DELAY); sleep(ERROR_DELAY);
$error['error'] = ['message' => 'Invalid token']; $error['error'] = ['message' => 'Invalid token'];