FEATURE #1509: remove admin menu from vistors area

Moved middleware providing registration of menu into admin area

app/Http/Kernel.php

@@ -16,7 +16,6 @@ class Kernel extends HttpKernel
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
     ];
-
     /**
      * The application's route middleware groups.
      *
@@ -29,14 +28,11 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
-            \App\Http\Middleware\ModuleRegistrator::class
         ],
-
         'api' => [
             'throttle:60,1',
         ],
     ];
-
     /**
      * The application's route middleware.
      *
@@ -45,10 +41,10 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
+        'auth'                 => \App\Http\Middleware\Authenticate::class,
-        'onlyAdmin' => \App\Http\Middleware\RequireAdminRole::class,
+        'onlyAdmin'            => \App\Http\Middleware\RequireAdminRole::class,
-//        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'adminMenu' => \App\Http\Middleware\AdminMenuRegistrator::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'guest'                => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'throttle'             => \Illuminate\Routing\Middleware\ThrottleRequests::class,
     ];
 }

app/Http/Middleware/AdminMenuRegistrator.php

@@ -4,7 +4,7 @@ namespace App\Http\Middleware;
 
 use Closure;
 
-class ModuleRegistrator
+class AdminMenuRegistrator
 {
     /**
      * Handle an incoming request.
@@ -23,9 +23,7 @@ class ModuleRegistrator
             $handler = config($module->getName() . '.handler');
 
             // try to register menus
-            if (method_exists($handler, 'registerAdminMenu') && \Auth::check()) {
+            call_user_func([$handler, 'registerAdminMenu'], \Auth::user());
-                call_user_func([$handler, 'registerAdminMenu'], \Auth::user());
-            }
         }
 
         return $next($request);

app/Http/routes.php

@@ -13,7 +13,7 @@ Route::pattern('url', '[0-9\-a-z]+');
  * This route group serves to handle request in admin
  */
 Route::group([
-                 'middleware' => ['web', 'auth'],
+                 'middleware' => ['web', 'auth', 'adminMenu'],
                  'namespace'  => 'Admin',
                  'prefix'     => 'admin'
              ], function () {