mirror of
https://github.com/archtechx/tenancy.git
synced 2026-02-05 03:14:04 +00:00
Fix bugs
This commit is contained in:
parent
70b869c43f
commit
04d0e79555
1 changed files with 3 additions and 3 deletions
|
|
@ -23,7 +23,7 @@ class PreventAccessFromTenantDomains
|
||||||
public function handle($request, Closure $next)
|
public function handle($request, Closure $next)
|
||||||
{
|
{
|
||||||
// If the route is universal, always let the request pass.
|
// If the route is universal, always let the request pass.
|
||||||
if ($this->routeHasMiddleware($request()->route(), 'universal')) {
|
if ($this->routeHasMiddleware($request->route(), 'universal')) {
|
||||||
return $next($request);
|
return $next($request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -54,8 +54,8 @@ class PreventAccessFromTenantDomains
|
||||||
// Loop one level deep and check if the route's middleware
|
// Loop one level deep and check if the route's middleware
|
||||||
// groups have a `tenancy` middleware group inside them
|
// groups have a `tenancy` middleware group inside them
|
||||||
$middlewareGroups = Router::getMiddlewareGroups();
|
$middlewareGroups = Router::getMiddlewareGroups();
|
||||||
foreach ($route->gatherMiddleware() as $middleware) {
|
foreach ($route->gatherMiddleware() as $inner) {
|
||||||
if (isset($middlewareGroups[$middleware]) && in_array($middleware, $middlewareGroups[$middleware], true)) {
|
if (isset($middlewareGroups[$inner]) && in_array($middleware, $middlewareGroups[$inner], true)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue