From 1e3ba5cb13d6c84940c612b6d632069d8bdb7fed Mon Sep 17 00:00:00 2001 From: Lisa Kim Date: Mon, 12 Feb 2024 17:06:08 -0800 Subject: [PATCH] Unblock SSO user with auto discover on setup access screen --- .../Discover/Shared/SetupAccess/SetupAccessWrapper.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.tsx b/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.tsx index 1fc7e12fa197a..4ed96ea1bab04 100644 --- a/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.tsx +++ b/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.tsx @@ -130,6 +130,7 @@ export function SetupAccessWrapper({ break; } + const ssoUserWithAutoDiscover = wantAutoDiscover && isSsoUser; return (
Set Up Access
@@ -143,7 +144,14 @@ export function SetupAccessWrapper({ disableProceed={ attempt.status === 'failed' || attempt.status === 'processing' || - !hasTraits + // Only block on no traits, if the user is not a SSO user + // and did not enable auto discover. + // SSO user's cannot currently add traits and the SSO user + // may already have set upped traits in their roles, but we + // currently don't have a way to retrieve all the traits from + // users roles - in which the user can end up blocked on this step + // with "no traits". + (!ssoUserWithAutoDiscover && !hasTraits) } />