Skip to content

Conversation

@rullzer
Copy link
Member

@rullzer rullzer commented Oct 15, 2019

If direct is set we should forward it again.
This to make SAML direct login work again.

Signed-off-by: Roeland Jago Douma [email protected]

@rullzer
Copy link
Member Author

rullzer commented Oct 15, 2019

/backport to stable17

Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

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

looks good

@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 15, 2019
:value="OC.requestToken">
<input type="hidden"
name="direct"
:value="direct">
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
:value="direct">
:value="directLogin">

WHy not use directLogin directly?

Copy link
Member

Choose a reason for hiding this comment

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

because the "direct" parameter is what we use in various places at the moment, including SAML and GS

Copy link
Member

Choose a reason for hiding this comment

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

yeah, but it's coming as a prop, so we don't care about the name of the variable :)

Copy link
Member Author

Choose a reason for hiding this comment

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

@skjnldsv you are right

Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

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

See comment

@schiessle
Copy link
Member

tested it successfully!

@schiessle
Copy link
Member

would be great to have this in 17.0.1. I know some users waiting for it.

@rullzer
Copy link
Member Author

rullzer commented Oct 16, 2019

It will be backported yes

@rullzer
Copy link
Member Author

rullzer commented Oct 16, 2019

Ok so i changed the code a bit.
Not direct is only set (and send) if you set direct=1 in the query. Which mimicks more the original behavior.

If direct is set we should forward it again.
This to make SAML direct login work again.

Signed-off-by: Roeland Jago Douma <[email protected]>
@rullzer rullzer force-pushed the fix/saml/pass_on_direct branch from a373b07 to 38730b4 Compare October 16, 2019 21:25
@rullzer rullzer merged commit a122fe6 into master Oct 16, 2019
@rullzer rullzer deleted the fix/saml/pass_on_direct branch October 16, 2019 22:24
@backportbot-nextcloud
Copy link

The backport to stable17 failed. Please do this backport manually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants