Skip to content

[stable24] fix(client-login-flow): Handle missing stateToken gracefully - #36586

Merged
juliusknorr merged 1 commit into
stable24from
backport/36552/stable24
Mar 6, 2023
Merged

[stable24] fix(client-login-flow): Handle missing stateToken gracefully#36586
juliusknorr merged 1 commit into
stable24from
backport/36552/stable24

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Feb 7, 2023

Copy link
Copy Markdown
  • ⚠️ This backport had conflicts and is incomplete

backport of #36552 and #36634

@blizzz

Copy link
Copy Markdown
Member

@ChristophWurst conflicts

@blizzzblizzz added the 2. developing Work in progress label Feb 7, 2023
@ChristophWurstChristophWurst added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 7, 2023

@blizzzblizzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1 question(s)

public function apptokenRedirect(string $stateToken, string $user, string $password) {
public function apptokenRedirect(?string $stateToken, string $user, string $password) {
if ($stateToken === null) {
return $this->loginTokenForbiddenResponse();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forbidden or Missing?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potato potato

@blizzz

Copy link
Copy Markdown
Member

moving to 24.0.11

@Antreesy
Antreesy removed their request for review February 10, 2023 08:33
@MichaIngMichaIng added 2. developing Work in progress 3. to review Waiting for reviews and removed 3. to review Waiting for reviews 2. developing Work in progress labels Feb 27, 2023
@MichaIng

Copy link
Copy Markdown
Member

/rebase

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@MichaIng
MichaIng enabled auto-merge March 3, 2023 13:44
@juliusknorr
juliusknorr disabled auto-merge March 6, 2023 11:53
@juliusknorr
juliusknorr merged commit 6452b9d into stable24Mar 6, 2023
@juliusknorr
juliusknorr deleted the backport/36552/stable24 branch March 6, 2023 11:53
@blizzzblizzz mentioned this pull request Mar 13, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbugintegration

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@blizzz@MichaIng@vitormattos@ChristophWurst@juliusknorr