Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 22:44:30 -04: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 2016-12-12 00:38:10 +02:00
commit d5134daa01
3 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Middleware/VerifyCsrfToken.php
View File

@ -16,18 +16,6 @@ class VerifyCsrfToken extends BaseVerifier
'complete/*', 'complete/*',
'signup/register', 'signup/register',
'api/v1/*', 'api/v1/*',
'api/v1/login',
'api/v1/clients/*',
'api/v1/clients',
'api/v1/invoices/*',
'api/v1/invoices',
'api/v1/quotes',
'api/v1/payments',
'api/v1/tasks',
'api/v1/email_invoice',
'api/v1/hooks',
'api/v1/users',
'api/v1/users/*',
'hook/email_opened', 'hook/email_opened',
'hook/email_bounced', 'hook/email_bounced',
'reseller_stats', 'reseller_stats',

30
app/Http/Requests/CreatePaymentAPIRequest.php
View File

@ -1,6 +1,10 @@
<?php namespace App\Http\Requests; <?php namespace App\Http\Requests;
use App\Libraries\Utils;
use App\Models\Invoice; use App\Models\Invoice;
use Illuminate\Http\Request as InputRequest;
use Response;
class CreatePaymentAPIRequest extends PaymentRequest class CreatePaymentAPIRequest extends PaymentRequest
{ {
@ -9,6 +13,12 @@ class CreatePaymentAPIRequest extends PaymentRequest
* *
* @return bool * @return bool
*/ */
public function __construct(InputRequest $req)
{
$this->req = $req;
}
public function authorize() public function authorize()
{ {
return $this->user()->can('create', ENTITY_PAYMENT); return $this->user()->can('create', ENTITY_PAYMENT);
@ -48,4 +58,24 @@ class CreatePaymentAPIRequest extends PaymentRequest
return $rules; return $rules;
} }
public function response(array $errors)
{
/* If the user is not validating from a mobile app - pass through parent::response */
if(!isset($this->req->api_secret))
return parent::response($errors);
/* If the user is validating from a mobile app - pass through first error string and return error */
foreach($errors as $error) {
foreach ($error as $key => $value) {
$message['error'] = ['message'=>$value];
$message = json_encode($message, JSON_PRETTY_PRINT);
$headers = Utils::getApiHeaders();
return Response::make($message, 400, $headers);
}
}
}
} }

1
app/Http/routes.php
View File

@ -306,7 +306,6 @@ Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function()
Route::get('invoices', 'InvoiceApiController@index'); Route::get('invoices', 'InvoiceApiController@index');
Route::get('download/{invoice_id}', 'InvoiceApiController@download'); Route::get('download/{invoice_id}', 'InvoiceApiController@download');
Route::resource('invoices', 'InvoiceApiController'); Route::resource('invoices', 'InvoiceApiController');
Route::get('payments', 'PaymentApiController@index');
Route::resource('payments', 'PaymentApiController'); Route::resource('payments', 'PaymentApiController');
Route::get('tasks', 'TaskApiController@index'); Route::get('tasks', 'TaskApiController@index');
Route::resource('tasks', 'TaskApiController'); Route::resource('tasks', 'TaskApiController');