shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #700 Fixed: Signed url not working

Browse Source
This commit is contained in:
cuneytsenturk 2018-12-26 16:46:52 +03:00
parent 1ec85c8374
commit c914c73837
9 changed files with 66 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Customers/Invoices.php
View File

@ -222,12 +222,12 @@ class Invoices extends Controller
$codes = explode('.', $payment_method_key);
if (!isset($payment_actions[$codes[0]])) {
$payment_actions[$codes[0]] = SignedUrl::sign(url('links/invoices/' . $invoice->id . '/' . $codes[0]), 1);
$payment_actions[$codes[0]] = SignedUrl::sign(url('signed/invoices/' . $invoice->id . '/' . $codes[0]), 1);
}
}
$print_action = SignedUrl::sign(url('links/invoices/' . $invoice->id . '/print'), 1);
$pdf_action = SignedUrl::sign(url('links/invoices/' . $invoice->id . '/pdf'), 1);
$print_action = SignedUrl::sign(route('signed.invoices.print', $invoice->id), 1);
$pdf_action = SignedUrl::sign(route('signed.invoices.pdf', $invoice->id), 1);
return view('customers.invoices.link', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'payment_actions', 'print_action', 'pdf_action'));
}

2
app/Http/Controllers/Incomes/Invoices.php
View File

@ -85,7 +85,7 @@ class Invoices extends Controller
$payment_methods = Modules::getPaymentMethods();
$customer_share = SignedUrl::sign(url('links/invoices/' . $invoice->id));
$customer_share = SignedUrl::sign(route('signed.invoices', $invoice->id));
return view('incomes.invoices.show', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'customer_share'));
}

10
app/Http/Kernel.php
View File

@ -75,8 +75,18 @@ class Kernel extends HttpKernel
],
'signed' => [
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
'signed-url',
'signed-url.company',
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\App\Http\Middleware\RedirectIfNotInstalled::class,
\App\Http\Middleware\AddXHeader::class,
'company.settings',
'company.currencies',
]
];

27
app/Providers/RouteServiceProvider.php
View File

@ -39,6 +39,8 @@ class RouteServiceProvider extends ServiceProvider
$this->mapWebRoutes();
$this->mapSignedRoutes();
//
}
@ -52,8 +54,23 @@ class RouteServiceProvider extends ServiceProvider
protected function mapWebRoutes()
{
Route::middleware('web')
->namespace($this->namespace)
->group(base_path('routes/web.php'));
->namespace($this->namespace)
->group(base_path('routes/web.php'));
}
/**
* Define the "signed" routes for the application.
*
* These routes all receive session state, CSRF protection, etc.
*
* @return void
*/
protected function mapSignedRoutes()
{
Route::prefix('signed')
->middleware('signed')
->namespace($this->namespace)
->group(base_path('routes/signed.php'));
}
/**
@ -66,8 +83,8 @@ class RouteServiceProvider extends ServiceProvider
protected function mapApiRoutes()
{
Route::prefix('api')
->middleware('api')
->namespace($this->namespace)
->group(base_path('routes/api.php'));
->middleware('api')
->namespace($this->namespace)
->group(base_path('routes/api.php'));
}
}

2
modules/OfflinePayment/Http/Controllers/OfflinePayment.php
View File

@ -67,7 +67,7 @@ class OfflinePayment extends Controller
}
}
$confirm_action = SignedUrl::sign(url('links/invoices/' . $invoice->id . '/offlinepayment/confirm'), 1);
$confirm_action = SignedUrl::sign(url('signed/invoices/' . $invoice->id . '/offlinepayment/confirm'), 1);
$html = view('offlinepayment::link', compact('gateway', 'invoice', 'confirm_action'))->render();

12
modules/OfflinePayment/Http/routes.php
View File

@ -12,7 +12,7 @@ Route::group([
});
Route::group([
'middleware' => ['web', 'auth', 'language', 'customermenu', 'permission:read-customer-panel'],
'middleware' => 'customer',
'prefix' => 'customers',
'namespace' => 'Modules\OfflinePayment\Http\Controllers'
], function () {
@ -21,12 +21,10 @@ Route::group([
});
Route::group([
'middleware' => ['web', 'language'],
'prefix' => 'links',
'middleware' => ['signed', 'language'],
'prefix' => 'signed',
'namespace' => 'Modules\OfflinePayment\Http\Controllers'
], function () {
Route::group(['middleware' => 'signed-url'], function () {
Route::post('invoices/{invoice}/offlinepayment', 'OfflinePayment@link');
Route::post('invoices/{invoice}/offlinepayment/confirm', 'OfflinePayment@confirm');
});
Route::post('invoices/{invoice}/offlinepayment', 'OfflinePayment@link');
Route::post('invoices/{invoice}/offlinepayment/confirm', 'OfflinePayment@confirm');
});

21
modules/PaypalStandard/Http/routes.php
View File

@ -1,16 +1,25 @@
<?php
Route::group(['middleware' => ['web', 'auth', 'language', 'customermenu', 'permission:read-customer-panel'], 'prefix' => 'customers', 'namespace' => 'Modules\PaypalStandard\Http\Controllers'], function () {
Route::group([
'middleware' => 'customer',
'prefix' => 'customers',
'namespace' => 'Modules\PaypalStandard\Http\Controllers'
], function () {
Route::get('invoices/{invoice}/paypalstandard', 'PaypalStandard@show');
});
Route::group(['prefix' => 'customers', 'namespace' => 'Modules\PaypalStandard\Http\Controllers'], function () {
Route::group([
'prefix' => 'customers',
'namespace' => 'Modules\PaypalStandard\Http\Controllers'
], function () {
Route::post('invoices/{invoice}/paypalstandard/result', 'PaypalStandard@result');
Route::post('invoices/{invoice}/paypalstandard/callback', 'PaypalStandard@callback');
});
Route::group(['middleware' => ['web', 'language'], 'prefix' => 'links', 'namespace' => 'Modules\PaypalStandard\Http\Controllers'], function () {
Route::group(['middleware' => 'signed-url'], function () {
Route::post('invoices/{invoice}/paypalstandard', 'PaypalStandard@show');
});
Route::group([
'middleware' => ['signed', 'language'],
'prefix' => 'signed',
'namespace' => 'Modules\PaypalStandard\Http\Controllers'
], function () {
Route::post('invoices/{invoice}/paypalstandard', 'PaypalStandard@show');
});

9
routes/signed.php Normal file
View File

@ -0,0 +1,9 @@
<?php
Route::group(['middleware' => 'language'], function () {
Route::get('invoices/{invoice}', 'Customers\Invoices@link')->name('signed.invoices');
Route::get('invoices/{invoice}/print', 'Customers\Invoices@printInvoice')->name('signed.invoices.print');
Route::get('invoices/{invoice}/pdf', 'Customers\Invoices@pdfInvoice')->name('signed.invoices.pdf');
Route::post('invoices/{invoice}/payment', 'Customers\Invoices@payment')->name('signed.invoices.payment');
Route::post('invoices/{invoice}/confirm', 'Customers\Invoices@confirm')->name('signed.invoices.confirm');
});

10
routes/web.php
View File

@ -237,16 +237,6 @@ Route::group(['middleware' => 'language'], function () {
});
});
Route::group(['middleware' => 'signed'], function () {
Route::group(['prefix' => 'links'], function () {
Route::get('invoices/{invoice}', 'Customers\Invoices@link');
Route::get('invoices/{invoice}/print', 'Customers\Invoices@printInvoice');
Route::get('invoices/{invoice}/pdf', 'Customers\Invoices@pdfInvoice');
Route::post('invoices/{invoice}/payment', 'Customers\Invoices@payment');
Route::post('invoices/{invoice}/confirm', 'Customers\Invoices@confirm');
});
});
Route::group(['middleware' => 'guest'], function () {
Route::group(['prefix' => 'auth'], function () {
Route::get('login', 'Auth\Login@create')->name('login');