Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix processing for prompt select_account with consent #788

Merged
merged 1 commit into from
Nov 2, 2020
Merged

Fix processing for prompt select_account with consent #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions changelog/unreleased/konnectd-switchacc-consent.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Bugfix: Allow consent-prompt with switch-account

Multiple prompt values are allowed and this change fixes the check for
select_account if it was used together with other prompt values. Where
select_account previously was ignored, it is now processed as required,
fixing the use case when a RP wants to trigger select_account first
while at the same time wants also to request interactive consent.

https://github.com/owncloud/ocis/pull/788
2 changes: 1 addition & 1 deletion konnectd/ui/src/containers/Login/Login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Login extends React.PureComponent {
componentDidMount() {
const { hello, query, dispatch, history } = this.props;
if (hello && hello.state && history.action !== 'PUSH') {
if (query.prompt !== 'select_account') {
if (!query.prompt || query.prompt.indexOf('select_account') == -1) {
dispatch(advanceLogonFlow(true, history));
return;
}
Expand Down