[stable29] fix(auth): Keep redirect URL during 2FA setup and challenge #44977
Conversation
This file contains 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
![backportbot[bot]](https://avatars.githubusercontent.com/in/60201?s=60&v=4){kind=small}
Signed-off-by: Christoph Wurst <[email protected]>
backportbot
bot
requested review from
ChristophWurst,
miaulalala,
nickvergessen and
st3iny
as code owners
backportbot
bot
added
bug
3. to review
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| $params = [ | ||
| 'redirect_url' => $this->request->getParam('redirect_url'), | ||
| ]; | ||
| if (!isset($params['redirect_url']) && isset($this->request->server['REQUEST_URI'])) { |
Check notice
Code scanning / Psalm
NoInterfaceProperties Note
| @@ -230,7 +231,7 @@ | |||
| * @NoCSRFRequired | |||
| */ | |||
| #[FrontpageRoute(verb: 'GET', url: 'login/setupchallenge/{providerId}')] | |||
| public function setupProvider(string $providerId) { | |||
| public function setupProvider(string $providerId, ?string $redirect_url = null) { | |||
Check notice
Code scanning / Psalm
MissingReturnType Note
| @@ -264,11 +266,12 @@ | |||
| * @todo handle the extreme edge case of an invalid provider ID and redirect to the provider selection page | |||
| */ | |||
| #[FrontpageRoute(verb: 'POST', url: 'login/setupchallenge/{providerId}')] | |||
| public function confirmProviderSetup(string $providerId) { | |||
| public function confirmProviderSetup(string $providerId, ?string $redirect_url = null) { | |||
Check notice
Code scanning / Psalm
MissingReturnType Note
blizzz
approved these changes
Jun 12, 2024
ChristophWurst
approved these changes
Jun 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport of PR #44745