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

Jump to bottom

Reply with json when not accepting html on LoginException #26846

Merged
merged 2 commits into from
May 17, 2021
Merged

Reply with json when not accepting html on LoginException #26846

merged 2 commits into from
May 17, 2021

Conversation

nickvergessen
Copy link
Member

Follow up to #26572

@nickvergessen nickvergessen added this to the Nextcloud 22 milestone Apr 30, 2021
@nickvergessen nickvergessen mentioned this pull request Apr 30, 2021
Closed
@nickvergessen nickvergessen force-pushed the followup/26572/reply-with-json-when-not-accepting-html branch from 7b7a0bf to cafe001 Compare April 30, 2021 21:18
@nickvergessen nickvergessen mentioned this pull request Apr 30, 2021
Merged
korelstar
korelstar approved these changes Apr 30, 2021
View reviewed changes
Copy link
Member

@korelstar korelstar left a comment

Choose a reason for hiding this comment

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

This fixes the problem. Thanks for the quick response!

MorrisJobke
MorrisJobke approved these changes May 3, 2021
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Makes sense 👍

MorrisJobke
MorrisJobke reviewed May 3, 2021
View reviewed changes
index.php Show resolved Hide resolved
MorrisJobke
MorrisJobke requested changes May 3, 2021
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

See inline

@korelstar
Copy link
Member

Ping @MorrisJobke
I'm looking forward for getting this merged :-)

@nickvergessen
Reply with UNAUTHORIZED like on APIs when login exception was thrown
a2d5d2d 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Reply with JSON when html is not accepted like in SecurityMiddleware
236f1b6 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the followup/26572/reply-with-json-when-not-accepting-html branch from e779eb6 to 236f1b6 Compare May 12, 2021 06:03
MorrisJobke
MorrisJobke approved these changes May 17, 2021
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Fine with me 👍

@MorrisJobke MorrisJobke merged commit 77a4368 into master May 17, 2021
@MorrisJobke MorrisJobke deleted the followup/26572/reply-with-json-when-not-accepting-html branch May 17, 2021 07:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@korelstar korelstar korelstar approved these changes

@LukasReschke LukasReschke LukasReschke approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@rullzer rullzer Awaiting requested review from rullzer

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug feature: authentication
Projects
None yet
Milestone
Nextcloud 22
Development

Successfully merging this pull request may close these issues.
4 participants
@nickvergessen @korelstar @MorrisJobke @LukasReschke