1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-04 23:14:05 +00:00
This commit is contained in:
Samuel Štancl 2019-10-30 13:58:32 +01:00 committed by GitHub
parent 70b869c43f
commit 04d0e79555
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -23,7 +23,7 @@ class PreventAccessFromTenantDomains
public function handle($request, Closure $next)
{
// 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);
}
@ -54,8 +54,8 @@ class PreventAccessFromTenantDomains
// Loop one level deep and check if the route's middleware
// groups have a `tenancy` middleware group inside them
$middlewareGroups = Router::getMiddlewareGroups();
foreach ($route->gatherMiddleware() as $middleware) {
if (isset($middlewareGroups[$middleware]) && in_array($middleware, $middlewareGroups[$middleware], true)) {
foreach ($route->gatherMiddleware() as $inner) {
if (isset($middlewareGroups[$inner]) && in_array($middleware, $middlewareGroups[$inner], true)) {
return true;
}
}