[make:registration] drop guard authentication support #1243
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,8 @@ | |
|
|
||
| namespace Symfony\Bundle\MakerBundle\Security; | ||
|
|
||
| use Symfony\Bundle\MakerBundle\Security\Model\Authenticator; | ||
| use Symfony\Bundle\MakerBundle\Security\Model\AuthenticatorType; | ||
| use Symfony\Bundle\MakerBundle\Str; | ||
| use Symfony\Bundle\MakerBundle\Validator; | ||
| use Symfony\Component\Console\Style\SymfonyStyle; | ||
|
|
@@ -140,24 +142,6 @@ public function guessPasswordField(SymfonyStyle $io, string $userClass): string | |
| ); | ||
| } | ||
|
|
||
| public function guessPasswordSetter(SymfonyStyle $io, string $userClass): string | ||
| { | ||
| if (null === ($methodChoices = $this->methodNameGuesser($userClass, 'setPassword'))) { | ||
|
|
@@ -196,6 +180,96 @@ public function guessIdGetter(SymfonyStyle $io, string $userClass): string | |
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @param array<string, array<string, mixed>> $firewalls Config data from security.firewalls | ||
| * | ||
| * @return Authenticator[] | ||
| */ | ||
| public function getAuthenticatorsFromConfig(array $firewalls): array | ||
| { | ||
| $authenticators = []; | ||
|
|
||
| /* Iterate over each firewall that exists e.g. security.firewalls.main | ||
| * $firewallName could be "main" or "dev", etc... | ||
| * $firewallConfig should be an array of the firewalls params | ||
| */ | ||
| foreach ($firewalls as $firewallName => $firewallConfig) { | ||
| if (!\is_array($firewallConfig)) { | ||
| continue; | ||
| } | ||
|
|
||
| $authenticators = [ | ||
| ...$authenticators, | ||
| ...$this->getAuthenticatorsFromConfigData($firewallConfig, $firewallName), | ||
| ]; | ||
| } | ||
|
|
||
| return $authenticators; | ||
| } | ||
|
|
||
| /** | ||
| * Pass in a firewalls config e.g. security.firewalls.main like: | ||
| * pattern: ^/path | ||
| * form_login: | ||
| * login_path: app_login | ||
| * custom_authenticator: | ||
| * - App\Security\MyAuthenticator | ||
| * | ||
| * @param array<string, mixed> $firewallConfig | ||
| * | ||
| * @return Authenticator[] | ||
| */ | ||
| private function getAuthenticatorsFromConfigData(array $firewallConfig, string $firewallName): array | ||
| { | ||
| $authenticators = []; | ||
|
|
||
| foreach ($firewallConfig as $potentialAuthenticator => $configData) { | ||
|
Collaborator
Author
There was a problem hiding this comment. ahh... lost the review comment on push... @weaverryan: firewalls:
main:
form_login:
path: /loginWon't $configData at this point be ['path' => '/login']? Or am I totally misreading the method?
Collaborator
Author
There was a problem hiding this comment. no I think you're thinking 1 level too deep.. i refactored this to split up iterating over We pass in main:
path: '/some-path'
form_login:
- option
....
custom_authenticators:
- some authenticator
anotherFirewall:
dev:
test:
Now If its Atleast this is what im trying todo, but i could be missing something myself 🤕 |
||
| // Check if $potentialAuthenticator is a supported authenticator or if its some other key. | ||
| if (null === ($authenticator = AuthenticatorType::tryFrom($potentialAuthenticator))) { | ||
| // $potentialAuthenticator is probably something like "pattern" or "lazy", not an authenticator | ||
| continue; | ||
| } | ||
|
|
||
| // $potentialAuthenticator is a supported authenticator. Check if it's a custom_authenticator. | ||
| if (AuthenticatorType::CUSTOM !== $authenticator) { | ||
| // We found a "built in" authenticator - "form_login", "json_login", etc... | ||
| $authenticators[] = new Authenticator($authenticator, $firewallName); | ||
|
|
||
| continue; | ||
| } | ||
|
|
||
| /* | ||
| * $potentialAuthenticator = custom_authenticator. | ||
| * $configData is either [App\MyAuthenticator] or (string) App\MyAuthenticator | ||
| */ | ||
| $customAuthenticators = $this->getCustomAuthenticators($configData, $firewallName); | ||
|
|
||
| $authenticators = [...$authenticators, ...$customAuthenticators]; | ||
| } | ||
|
|
||
| return $authenticators; | ||
| } | ||
|
|
||
| /** | ||
| * @param string|array<string> $customAuthenticators A single entry from custom_authenticators or an array of authenticators | ||
| * | ||
| * @return Authenticator[] | ||
| */ | ||
| private function getCustomAuthenticators(string|array $customAuthenticators, string $firewallName): array | ||
| { | ||
| if (\is_string($customAuthenticators)) { | ||
| $customAuthenticators = [$customAuthenticators]; | ||
| } | ||
|
|
||
| $authenticators = []; | ||
|
|
||
| foreach ($customAuthenticators as $customAuthenticatorClass) { | ||
| $authenticators[] = new Authenticator(AuthenticatorType::CUSTOM, $firewallName, $customAuthenticatorClass); | ||
| } | ||
|
|
||
| return $authenticators; | ||
| } | ||
|
|
||
| private function methodNameGuesser(string $className, string $suspectedMethodName): ?array | ||
| { | ||
| $reflectionClass = new \ReflectionClass($className); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony MakerBundle package. | ||
| * | ||
| * (c) Fabien Potencier <[email protected]> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Bundle\MakerBundle\Security\Model; | ||
|
|
||
| /** | ||
| * @author Jesse Rushlow<[email protected]> | ||
| * | ||
| * @internal | ||
| */ | ||
| final class Authenticator | ||
| { | ||
| public function __construct( | ||
| public AuthenticatorType $type, | ||
| public string $firewallName, | ||
| public ?string $authenticatorClass = null, | ||
| ) { | ||
| } | ||
|
|
||
| /** | ||
| * Useful for asking questions like "Which authenticator do you want to use?". | ||
| */ | ||
| public function __toString(): string | ||
| { | ||
| return sprintf( | ||
| '"%s" in the "%s" firewall', | ||
| $this->authenticatorClass ?? $this->type->value, | ||
| $this->firewallName, | ||
| ); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony MakerBundle package. | ||
| * | ||
| * (c) Fabien Potencier <[email protected]> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Bundle\MakerBundle\Security\Model; | ||
|
|
||
| /** | ||
| * @author Jesse Rushlow <[email protected]> | ||
| * | ||
| * @internal | ||
| */ | ||
| enum AuthenticatorType: string | ||
| { | ||
| case FORM_LOGIN = 'form_login'; | ||
| case JSON_LOGIN = 'json_login'; | ||
| case HTTP_BASIC = 'http_basic'; | ||
| case LOGIN_LINK = 'login_link'; | ||
| case ACCESS_TOKEN = 'access_token'; | ||
| case X509 = 'x509'; | ||
| case REMOTE_USER = 'remote_user'; | ||
|
|
||
| case CUSTOM = 'custom_authenticator'; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getAuthenticatorsInFirewallsConfig?