Merge pull request #25 from langleyfoxall/fix-logs-issue

Ensure logs endpoint relies on config rather than the environment

app/Providers/LogViewerRouteProvider.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Rap2hpoutre\LaravelLogViewer\LogViewerController;
+use Route;
+
+class LogViewerRouteProvider extends ServiceProvider
+{
+    /**
+     * Register the log viewer route, if the appropriate access credentials have been set in the app configuration.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        ['username' => $username, 'password' => $password] = config('laravel-route-restrictor.logs');
+
+        if (empty($username) || empty($password)) {
+            return;
+        }
+
+        Route::get('/logs', [LogViewerController::class, 'index'])
+             ->middleware("routeRestrictor:$username,$password");
+    }
+}

config/app.php

@@ -160,6 +160,7 @@
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
+        App\Providers\LogViewerRouteProvider::class,
 
     ],
 

config/laravel-route-restrictor.php

@@ -9,6 +9,11 @@
     'global' => [
         'username' => env('ROUTE_RESTRICTOR_GLOBAL_USERNAME', null),
         'password' => env('ROUTE_RESTRICTOR_GLOBAL_PASSWORD', null)
-    ]
+    ],
+
+    'logs' => [
+        'username' => env('LOGS_USERNAME'),
+        'password' => env('LOGS_PASSWORD')
+    ],
 
 ];

routes/web.php

@@ -11,15 +11,10 @@
 |
 */
 
-
 Route::get('/', function () {
     return view('welcome');
 });
 
-Route::group(['middleware' => 'routeRestrictor:'.env('LOGS_USERNAME').','.env('LOGS_PASSWORD')], function () {
-    Route::get('/logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index');
-});
-
 Auth::routes();
 
 Route::get('/home', 'HomeController@index')->name('home');