Skip to content

Commit

Permalink
Unblock SSO user with auto discover on setup access screen (#38283)
Browse files Browse the repository at this point in the history
  • Loading branch information
kimlisa committed Feb 15, 2024
1 parent 7498d73 commit dc92791
Showing 1 changed file with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ export function SetupAccessWrapper({
break;
}

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

0 comments on commit dc92791

Please sign in to comment.