842ccd65 by Jeff Balicki

Revert "ed"

This reverts commit ddb9ff90.
1 parent 4e8456a4
...@@ -15,7 +15,6 @@ class Kernel extends HttpKernel ...@@ -15,7 +15,6 @@ class Kernel extends HttpKernel
15 */ 15 */
16 protected $middleware = [ 16 protected $middleware = [
17 \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class, 17 \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
18
19 ]; 18 ];
20 19
21 /** 20 /**
...@@ -29,7 +28,11 @@ class Kernel extends HttpKernel ...@@ -29,7 +28,11 @@ class Kernel extends HttpKernel
29 \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, 28 \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
30 \Illuminate\Session\Middleware\StartSession::class, 29 \Illuminate\Session\Middleware\StartSession::class,
31 \Illuminate\View\Middleware\ShareErrorsFromSession::class, 30 \Illuminate\View\Middleware\ShareErrorsFromSession::class,
31 <<<<<<< HEAD
32 'App\Http\Middleware\ForceHttpProtocol', 32 'App\Http\Middleware\ForceHttpProtocol',
33 =======
34 // \App\Http\Middleware\VerifyCsrfToken::class,
35 >>>>>>> Revert "ed"
33 36
34 ], 37 ],
35 38
...@@ -54,8 +57,6 @@ class Kernel extends HttpKernel ...@@ -54,8 +57,6 @@ class Kernel extends HttpKernel
54 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 57 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
55 'cors' => \App\Http\Middleware\Cors::class, 58 'cors' => \App\Http\Middleware\Cors::class,
56 'jwt.auth' => \Tymon\JWTAuth\Middleware\GetUserFromToken::class, 59 'jwt.auth' => \Tymon\JWTAuth\Middleware\GetUserFromToken::class,
57 'jwt.refresh' => \Tymon\JWTAuth\Middleware\RefreshToken::class, 60 'jwt.refresh' => \Tymon\JWTAuth\Middleware\RefreshToken::class
58 'forceSsl' => App\Http\Middleware\ForceHttpProtocol::class,
59
60 ]; 61 ];
61 } 62 }
......
1 <?php
2
3 namespace App\Http\Middleware;
4
5 use Closure;
6
7 class ForceHttpProtocol {
8
9 public function handle($request, Closure $next) {
10
11 if (!$request->secure() && env('APP_ENV') === 'pro') {
12 return redirect()->secure($request->getRequestUri());
13 }
14
15 return $next($request);
16 }
17
18 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -18,7 +18,7 @@ Route::get('/', function () { ...@@ -18,7 +18,7 @@ Route::get('/', function () {
18 }); 18 });
19 19
20 20
21 Route::get('pdf/{id}', ['middleware' => 'forceSsl', 'uses' => 'PdfController@pdf']); 21 Route::get('pdf/{id}', 'PdfController@pdf');
22 22
23 23
24 Route::group(array('prefix' => 'api/v1'), function($json) 24 Route::group(array('prefix' => 'api/v1'), function($json)
...@@ -26,7 +26,7 @@ Route::group(array('prefix' => 'api/v1'), function($json) ...@@ -26,7 +26,7 @@ Route::group(array('prefix' => 'api/v1'), function($json)
26 26
27 Route::resource('add', 'ApiController@insert'); 27 Route::resource('add', 'ApiController@insert');
28 28
29 Route::resource('get-list', ['middleware' => 'forceSsl', 'uses' => 'ApiController@getList']); 29 Route::resource('get-list', 'ApiController@getList');
30 Route::resource('get-pdf', 'ApiController@getpdf'); 30 Route::resource('get-pdf', 'ApiController@getpdf');
31 Route::resource('api', 'FileEntryController@getApi'); 31 Route::resource('api', 'FileEntryController@getApi');
32 Route::resource('get-pdf-google', 'ApiController@getpdfgoogle'); 32 Route::resource('get-pdf-google', 'ApiController@getpdfgoogle');
......