Skip to content

Commit 9b14c98

Browse files
committed
remove web override from middleware
1 parent 4815773 commit 9b14c98

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

src/BackpackServiceProvider.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,6 @@ public function registerMiddlewareGroup(Router $router)
8383
$middleware_key = config('backpack.base.middleware_key');
8484
$middleware_class = config('backpack.base.middleware_class');
8585

86-
//we get the web middleware defined in config, could be a single key: web for example,
87-
//or it can be an array of middlewares that replaces the default `web` middleware from Laravel.
88-
$web_middleware = config('backpack.base.web_middleware', 'web');
89-
90-
//if it is an array it means developer would like to replace the default web middleware list with his own MW array.
91-
if (is_array($web_middleware)) {
92-
$router->middlewareGroup('web', $web_middleware);
93-
94-
//after replacing the web middleware with the ones we want
95-
//we setup the correct middleware key in config so we can get it on runtime.
96-
config(['backpack.base.web_middleware' => 'web']);
97-
}
98-
9986
if (! is_array($middleware_class)) {
10087
$router->pushMiddlewareToGroup($middleware_key, $middleware_class);
10188

src/routes/backpack/custom.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
Route::group([
1010
'prefix' => config('backpack.base.route_prefix', 'admin'),
11-
'middleware' => [
12-
config('backpack.base.web_middleware', 'web'),
13-
config('backpack.base.middleware_key', 'admin'),
14-
],
11+
'middleware' => array_merge(
12+
(array)config('backpack.base.web_middleware', 'web'),
13+
(array)config('backpack.base.middleware_key', 'admin')
14+
),
1515
'namespace' => 'App\Http\Controllers\Admin',
1616
], function () { // custom admin routes
1717
}); // this should be the absolute last line of this file

0 commit comments

Comments
 (0)