Skip to content

Commit 4616c63

Browse files
Display message if logout route loader not as default flex config
1 parent ed876ea commit 4616c63

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
@@ -255,20 +255,6 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
255255
} catch (YamlManipulationFailedException) {
256256
}
257257

258-
if ($this->supportsLogoutRouteLoader()) {
259-
$yamlData = [];
260-
if (file_exists($path = 'config/routes/security.yaml')) {
261-
$yamlData = Yaml::parse($this->fileManager->getFileContents($path)) ?? [];
262-
}
263-
if (!(\array_key_exists('_symfony_logout', $yamlData) && 'security.route_loader.logout' !== $yamlData['_symfony_logout']['ressource'] ?? null)) {
264-
$yamlData['_symfony_logout'] = [
265-
'resource' => 'security.route_loader.logout',
266-
'type' => 'service',
267-
];
268-
}
269-
$generator->dumpFile($path, Yaml::dump($yamlData));
270-
}
271-
272258
if (self::AUTH_TYPE_FORM_LOGIN === $input->getArgument('authenticator-type')) {
273259
$this->generateFormLoginFiles(
274260
$input->getArgument('controller-class'),
@@ -291,7 +277,8 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
291277
$input->hasArgument('user-class') ? $input->getArgument('user-class') : null,
292278
$input->hasArgument('logout-setup') ? $input->getArgument('logout-setup') : false,
293279
$supportRememberMe,
294-
$alwaysRememberMe
280+
$alwaysRememberMe,
281+
$this->supportsLogoutRouteLoader() && !file_exists('config/routes/security.yaml'),
295282
)
296283
);
297284
}
@@ -417,7 +404,7 @@ private function generateFormLoginFiles(string $controllerClass, string $userNam
417404
);
418405
}
419406

420-
private function generateNextMessage(bool $securityYamlUpdated, string $authenticatorType, string $authenticatorClass, $userClass, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe): array
407+
private function generateNextMessage(bool $securityYamlUpdated, string $authenticatorType, string $authenticatorClass, $userClass, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe, bool $defaultSecurityRoute): array
421408
{
422409
$nextTexts = ['Next:'];
423410
$nextTexts[] = '- Customize your new authenticator.';
@@ -445,6 +432,9 @@ private function generateNextMessage(bool $securityYamlUpdated, string $authenti
445432
$nextTexts[] = '- Review & adapt the login template: <info>'.$this->fileManager->getPathForTemplate('security/login.html.twig').'</info>.';
446433
}
447434

435+
// If the security.logout_route_loader is not loaded from the default flex recipe
436+
$nextTexts[] = '- Be sure to add the "logout" route to <info>config/routes/security.yaml</info> or upgrade the <info>symfony/security-bundle</info> recipe.';
437+
448438
return $nextTexts;
449439
}
450440

0 commit comments

Comments
 (0)