842ccd65 by Jeff Balicki

Revert "ed"

This reverts commit ddb9ff90.
1 parent 4e8456a4
......@@ -15,7 +15,6 @@ class Kernel extends HttpKernel
*/
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
];
/**
......@@ -29,7 +28,11 @@ class Kernel extends HttpKernel
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
<<<<<<< HEAD
'App\Http\Middleware\ForceHttpProtocol',
=======
// \App\Http\Middleware\VerifyCsrfToken::class,
>>>>>>> Revert "ed"
],
......@@ -54,8 +57,6 @@ class Kernel extends HttpKernel
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'cors' => \App\Http\Middleware\Cors::class,
'jwt.auth' => \Tymon\JWTAuth\Middleware\GetUserFromToken::class,
'jwt.refresh' => \Tymon\JWTAuth\Middleware\RefreshToken::class,
'forceSsl' => App\Http\Middleware\ForceHttpProtocol::class,
'jwt.refresh' => \Tymon\JWTAuth\Middleware\RefreshToken::class
];
}
......
<?php
namespace App\Http\Middleware;
use Closure;
class ForceHttpProtocol {
public function handle($request, Closure $next) {
if (!$request->secure() && env('APP_ENV') === 'pro') {
return redirect()->secure($request->getRequestUri());
}
return $next($request);
}
}
\ No newline at end of file
......@@ -18,7 +18,7 @@ Route::get('/', function () {
});
Route::get('pdf/{id}', ['middleware' => 'forceSsl', 'uses' => 'PdfController@pdf']);
Route::get('pdf/{id}', 'PdfController@pdf');
Route::group(array('prefix' => 'api/v1'), function($json)
......@@ -26,7 +26,7 @@ Route::group(array('prefix' => 'api/v1'), function($json)
Route::resource('add', 'ApiController@insert');
Route::resource('get-list', ['middleware' => 'forceSsl', 'uses' => 'ApiController@getList']);
Route::resource('get-list', 'ApiController@getList');
Route::resource('get-pdf', 'ApiController@getpdf');
Route::resource('api', 'FileEntryController@getApi');
Route::resource('get-pdf-google', 'ApiController@getpdfgoogle');
......