Skip to content

Commit b4de865

Browse files
Display message if logout route loader not as default flex config
1 parent 3265c08 commit b4de865

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

src/Maker/MakeAuthenticator.php

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -261,20 +261,6 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
261261
} catch (YamlManipulationFailedException) {
262262
}
263263

264-
if ($this->supportsLogoutRouteLoader()) {
265-
$yamlData = [];
266-
if (file_exists($path = 'config/routes/security.yaml')) {
267-
$yamlData = Yaml::parse($this->fileManager->getFileContents($path)) ?? [];
268-
}
269-
if (!(\array_key_exists('_symfony_logout', $yamlData) && 'security.route_loader.logout' !== $yamlData['_symfony_logout']['ressource'] ?? null)) {
270-
$yamlData['_symfony_logout'] = [
271-
'resource' => 'security.route_loader.logout',
272-
'type' => 'service',
273-
];
274-
}
275-
$generator->dumpFile($path, Yaml::dump($yamlData));
276-
}
277-
278264
if (self::AUTH_TYPE_FORM_LOGIN === $input->getArgument('authenticator-type')) {
279265
$this->generateFormLoginFiles(
280266
$input->getArgument('controller-class'),
@@ -297,7 +283,8 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
297283
$input->hasArgument('user-class') ? $input->getArgument('user-class') : null,
298284
$input->hasArgument('logout-setup') ? $input->getArgument('logout-setup') : false,
299285
$supportRememberMe,
300-
$alwaysRememberMe
286+
$alwaysRememberMe,
287+
$this->supportsLogoutRouteLoader() && !file_exists('config/routes/security.yaml'),
301288
)
302289
);
303290
}
@@ -425,7 +412,7 @@ private function generateFormLoginFiles(string $controllerClass, string $userNam
425412
}
426413

427414
/** @return string[] */
428-
private function generateNextMessage(bool $securityYamlUpdated, string $authenticatorType, string $authenticatorClass, ?string $userClass, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe): array
415+
private function generateNextMessage(bool $securityYamlUpdated, string $authenticatorType, string $authenticatorClass, ?string $userClass, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe, bool $defaultSecurityRoute): array
429416
{
430417
$nextTexts = ['Next:'];
431418
$nextTexts[] = '- Customize your new authenticator.';
@@ -453,6 +440,9 @@ private function generateNextMessage(bool $securityYamlUpdated, string $authenti
453440
$nextTexts[] = '- Review & adapt the login template: <info>'.$this->fileManager->getPathForTemplate('security/login.html.twig').'</info>.';
454441
}
455442

443+
// If the security.logout_route_loader is not loaded from the default flex recipe
444+
$nextTexts[] = '- Be sure to add the "logout" route to <info>config/routes/security.yaml</info> or upgrade the <info>symfony/security-bundle</info> recipe.';
445+
456446
return $nextTexts;
457447
}
458448

0 commit comments

Comments
 (0)