Refactor helper drift in lib: centralize theme/translation and remove app() hotspots
This commit is contained in:
@@ -20,10 +20,12 @@ class AccessControl
|
||||
];
|
||||
|
||||
private array $configuredPublicPaths;
|
||||
private IntendedUrlService $intendedUrlService;
|
||||
|
||||
public function __construct(?array $publicPaths = null)
|
||||
public function __construct(?array $publicPaths = null, ?IntendedUrlService $intendedUrlService = null)
|
||||
{
|
||||
$this->configuredPublicPaths = $publicPaths ?? (defined('APP_PUBLIC_PATHS') ? APP_PUBLIC_PATHS : []);
|
||||
$this->intendedUrlService = $intendedUrlService ?? new IntendedUrlService();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -74,8 +76,7 @@ class AccessControl
|
||||
$loginPath = Request::withLocale('login', $locale);
|
||||
|
||||
$requestUri = $_SERVER['REQUEST_URI'] ?? '';
|
||||
$intendedUrlService = app(IntendedUrlService::class);
|
||||
$loginTarget = $intendedUrlService->buildLoginRedirect($loginPath, $requestUri);
|
||||
$loginTarget = $this->intendedUrlService->buildLoginRedirect($loginPath, $requestUri);
|
||||
|
||||
Router::redirect($loginTarget);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user