Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 05:17:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2017-11-14 13:16:39 +02:00
commit 5fb8429c86
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/AccountApiController.php
View File

@ -247,4 +247,11 @@ class AccountApiController extends BaseAPIController
return $this->errorResponse(['message' => 'Invalid credentials'], 401); return $this->errorResponse(['message' => 'Invalid credentials'], 401);
} }
public function iosSubscriptionStatus() {
//stubbed for iOS callbacks
}
} }

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

@ -28,7 +28,8 @@ 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/oauth_login'); || $request->is('api/v1/oauth_login')
|| $request->is('api/v1/ios_subscription_status');
$headers = Utils::getApiHeaders(); $headers = Utils::getApiHeaders();
$hasApiSecret = false; $hasApiSecret = false;

1
app/Http/routes.php
View File

@ -360,6 +360,7 @@ Route::group(['middleware' => ['lookup:api', 'api'], 'prefix' => 'api/v1'], func
Route::resource('documents', 'DocumentAPIController'); Route::resource('documents', 'DocumentAPIController');
Route::resource('vendors', 'VendorApiController'); Route::resource('vendors', 'VendorApiController');
Route::resource('expense_categories', 'ExpenseCategoryApiController'); Route::resource('expense_categories', 'ExpenseCategoryApiController');
Route::post('ios_subscription_status', 'AccountApiController@iosSubscriptionStatus');
}); });
// Redirects for legacy links // Redirects for legacy links