archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 14:34:04 +00:00
Code Activity

Ignore routes that are already considered tenant routes from cloning, update test accordingly

Browse source
This commit is contained in:
lukinovec 2025-06-04 11:39:33 +02:00
parent 410165e7ba
commit efc0e11e73
2 changed files with 66 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/Actions/CloneRoutesAsTenant.php
View file

@ -111,6 +111,11 @@ class CloneRoutesAsTenant
protected function shouldBeCloned(Route $route): bool
{
// Don't clone routes that already have tenant parameter or prefix
if ($this->routeIsTenant($route)) {
return false;
}
if ($this->shouldClone) {
return ($this->shouldClone)($route);
}
@ -166,40 +171,12 @@ class CloneRoutesAsTenant
->setDefaults($originalRoute->defaults);
}
/**
* Process middleware for cloning, handling middleware groups properly.
* This extracts middleware from groups (up to 3 levels deep), filters out
* cloneRoutesWithMiddleware, and adds the 'tenant' middleware.
*
* Uses approach similar to getRouteMiddleware() in DealsWithRouteContexts for consistency.
*/
/** Removes top-level cloneRoutesWithMiddleware and adds 'tenant' middleware. */
protected function processMiddlewareForCloning(array $middlewares): array
{
$middlewareGroups = $this->router->getMiddlewareGroups();
$unpackGroupMiddleware = function (array $middleware) use ($middlewareGroups) {
$innerMiddleware = [];
foreach ($middleware as $inner) {
if (isset($middlewareGroups[$inner])) {
$innerMiddleware = array_merge($innerMiddleware, $middlewareGroups[$inner]);
} else {
// Actual middleware, not a group
$innerMiddleware[] = $inner;
}
}
return $innerMiddleware;
};
// Extract all middleware from groups (up to 3 levels deep)
$firstLevelUnpacked = $unpackGroupMiddleware($middlewares);
$secondLevelUnpacked = $unpackGroupMiddleware($firstLevelUnpacked);
$thirdLevelUnpacked = $unpackGroupMiddleware($secondLevelUnpacked);
// Filter out MW in cloneRoutesWithMiddleware and add the 'tenant' flag
// Filter out top-level cloneRoutesWithMiddleware and add the 'tenant' flag
$processedMiddleware = array_filter(
$thirdLevelUnpacked,
$middlewares,
fn ($mw) => ! in_array($mw, $this->cloneRoutesWithMiddleware)
);
@ -207,4 +184,13 @@ class CloneRoutesAsTenant
return array_unique($processedMiddleware);
}
/** Check if route already has tenant parameter or name prefix. */
protected function routeIsTenant(Route $route): bool
{
$routeHasTenantParameter = in_array(PathTenantResolver::tenantParameterName(), $route->parameterNames());
$routeHasTenantPrefix = $route->getName() && str_starts_with($route->getName(), PathTenantResolver::tenantRouteNamePrefix());
return $routeHasTenantParameter || $routeHasTenantPrefix;
}
}