Skip to content

[v14] Unblock SSO user with auto discover on setup access screen #38284

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.

Sign up for GitHub

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

Merged
kimlisa merged 1 commit into from
Feb 15, 2024
Merged

[v14] Unblock SSO user with auto discover on setup access screen #38284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ export function SetupAccessWrapper({
break;
}

const ssoUserWithAutoDiscover = wantAutoDiscover && isSsoUser;
return (
<Box maxWidth="700px">
<Header>Set Up Access</Header>
Expand All @@ -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)
}
/>
</Box>
Expand Down