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.

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

SSO: Fix SSO settings update with custom fields #1652

Merged
merged 4 commits into from
Jun 25, 2024

Conversation

dmihai
Copy link
Contributor

@dmihai dmihai commented Jun 19, 2024

This is a fix for the escalation https://github.com/grafana/support-escalations/issues/11072. It was introduced with support for SAML.

With the previous behaviour we always returned the first item from settings because the expression settings["private_key"] != "" was true for settings that didn't contain the private_key.

Also added more unit tests (the new unit tests for custom fields were failing before this change).

@dmihai dmihai requested a review from mgyongyosi June 19, 2024 15:05
@dmihai dmihai requested a review from a team as a code owner June 19, 2024 15:05
Copy link

In order to lower resource usage and have a faster runtime, PRs will not run Cloud tests automatically.
To do so, a Grafana Labs employee must trigger the cloud acceptance tests workflow manually.

@julienduchesne julienduchesne merged commit 49d117c into main Jun 25, 2024
27 checks passed
@julienduchesne julienduchesne deleted the dmihai/sso-fix-update branch June 25, 2024 02:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants