From 6e5880c432214b50ac478d9ab9bd467be37ead0d Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 30 Nov 2022 13:49:21 +0200 Subject: [PATCH] [v9.2.x] Fix: Unlocking the UI for AuthProxy users (#59529) Fix: Unlocking the UI for AuthProxy users (#59507) Unlocking the UI for AuthProxy users Co-authored-by: Eric Leijonmarck Co-authored-by: Eric Leijonmarck (cherry picked from commit 5bb99775bb995436e9fcf723ed1e622b685a9f1f) Co-authored-by: Gabriel MABILLE --- public/app/features/admin/UserAdminPage.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/app/features/admin/UserAdminPage.tsx b/public/app/features/admin/UserAdminPage.tsx index 8a7f0599b5c..25fb7f584ea 100644 --- a/public/app/features/admin/UserAdminPage.tsx +++ b/public/app/features/admin/UserAdminPage.tsx @@ -112,9 +112,11 @@ export class UserAdminPage extends PureComponent { user?.isExternal && user?.authLabels?.some((r) => SyncedOAuthLabels.includes(r)); const isSAMLUser = user?.isExternal && user?.authLabels?.includes('SAML'); const isGoogleUser = user?.isExternal && user?.authLabels?.includes('Google'); + const isAuthProxyUser = user?.isExternal && user?.authLabels?.includes('Auth Proxy'); const isUserSynced = !config.auth.DisableSyncLock && - ((user?.isExternal && !(isGoogleUser || isOAuthUserWithSkippableSync || isSAMLUser || isLDAPUser)) || + ((user?.isExternal && + !(isAuthProxyUser || isGoogleUser || isOAuthUserWithSkippableSync || isSAMLUser || isLDAPUser)) || (!config.auth.OAuthSkipOrgRoleUpdateSync && isOAuthUserWithSkippableSync) || (!config.auth.SAMLSkipOrgRoleSync && isSAMLUser) || (!config.auth.LDAPSkipOrgRoleSync && isLDAPUser));