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 mergeSettings() in case the DB contains empty URLs #84290
Conversation
❌ Failed to run Playwright plugin e2e tests. |
❌ Failed to run Playwright plugin e2e tests. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Hello @dmihai!
Please, if the current pull request addresses a bug fix, label it with the |
This PR must be merged before a backport PR will be created. |
* fix mergeSettings() in case the db contains empty strings * use correct github urls in test * overwrite only urls * update comment for mergeSettings() (cherry picked from commit 2acd48d)
…#84344) SSO: fix mergeSettings() in case the DB contains empty URLs (#84290) * fix mergeSettings() in case the db contains empty strings * use correct github urls in test * overwrite only urls * update comment for mergeSettings() (cherry picked from commit 2acd48d) Co-authored-by: Mihai Doarna <mihai.doarna@grafana.com>
What is this feature?
Previously, the empty URLs from the DB settings were not replaced by the URLs defined in the system settings. This was an issue for providers that require clients to send empty values for auth_url, token_url and api_url. The expectation in that case was that the auth_url, token_url and api_url would get their values from the system settings but that didn't happen if clients sent empty values for those settings. It worked only if clients didn't send them at all.
Why do we need this feature?
This is a fix for the escalation https://github.com/grafana/support-escalations/issues/9668.
Who is this feature for?
For everybody using SSO Settings API.
Which issue(s) does this PR fix?:
Fixes #
Special notes for your reviewer:
Please check that: