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

Access control: Fix org user removal for OSS users #52473

Merged
merged 4 commits into from
Jul 20, 2022

Conversation

IevaVasiljeva
Copy link
Contributor

What this PR does / why we need it:
Fix org user removal for OSS - only call the enterprise access control endpoint for licensed users.

Which issue(s) this PR fixes:

Fixes #52434

@IevaVasiljeva IevaVasiljeva added this to the 9.0.4 milestone Jul 19, 2022
@IevaVasiljeva IevaVasiljeva changed the title Access Control: fix org user removal for OSS users Access control: Fix org user removal for OSS users Jul 19, 2022
@grafanabot
Copy link
Contributor

@IevaVasiljeva IevaVasiljeva merged commit ba76be1 into main Jul 20, 2022
@IevaVasiljeva IevaVasiljeva deleted the 52434/fix-oss-org-user-removal branch July 20, 2022 09:18
grafanabot pushed a commit that referenced this pull request Jul 20, 2022
* allow setting team managed permissions for service accounts

* Revert "allow setting team managed permissions for service accounts"

This reverts commit 7598626.

* fix org user removal for OSS

* remove comment

(cherry picked from commit ba76be1)
IevaVasiljeva added a commit that referenced this pull request Jul 20, 2022
* allow setting team managed permissions for service accounts

* Revert "allow setting team managed permissions for service accounts"

This reverts commit 7598626.

* fix org user removal for OSS

* remove comment

(cherry picked from commit ba76be1)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
alyssabull pushed a commit that referenced this pull request Jul 20, 2022
* allow setting team managed permissions for service accounts

* Revert "allow setting team managed permissions for service accounts"

This reverts commit 7598626.

* fix org user removal for OSS

* remove comment
alyssabull pushed a commit that referenced this pull request Jul 20, 2022
* allow setting team managed permissions for service accounts

* Revert "allow setting team managed permissions for service accounts"

This reverts commit 7598626.

* fix org user removal for OSS

* remove comment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Grafana 9.0.3 Admin can not remove User's organizations
3 participants