From 931818b82203ecf2a510a82769e897f6d7c47b5a Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 20 Jul 2022 12:53:32 +0000
Subject: [PATCH] Access control: Fix org user removal for OSS users (#52473)
 (#52514)

* allow setting team managed permissions for service accounts

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

This reverts commit 75986263976e33399c0ea94682905e0a274bc7e4.

* fix org user removal for OSS

* remove comment

(cherry picked from commit ba76be174f4840dfa246d06eb9226e3b573e0d16)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
---
 public/app/features/admin/UserOrgs.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/features/admin/UserOrgs.tsx b/public/app/features/admin/UserOrgs.tsx
index b85247e1248..16d2a62d684 100644
--- a/public/app/features/admin/UserOrgs.tsx
+++ b/public/app/features/admin/UserOrgs.tsx
@@ -163,8 +163,12 @@ class UnThemedOrgRow extends PureComponent<OrgRowProps> {
 
   onOrgRemove = async () => {
     const { org, user } = this.props;
-    user && (await updateUserRoles([], user.id, org.orgId));
     this.props.onOrgRemove(org.orgId);
+    if (contextSrv.licensedAccessControlEnabled()) {
+      if (contextSrv.hasPermission(AccessControlAction.OrgUsersRemove)) {
+        user && (await updateUserRoles([], user.id, org.orgId));
+      }
+    }
   };
 
   onChangeRoleClick = () => {