Skip to content
This repository was archived by the owner on Aug 21, 2024. It is now read-only.

fix: do not remove last identity provider #7739

Merged
HexaField merged 4 commits into from
Mar 17, 2023
Merged

fix: do not remove last identity provider #7739

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b924a46
fix: do not remove last identity provider
aditya-mitra Mar 12, 2023
2554699
feat(server-core): should not be able to remove last identity provider
aditya-mitra Mar 12, 2023
139d435
feat: get identity providers in checkOnlyIdentityProvider from contex…
aditya-mitra Mar 17, 2023
03c7f88
fix: allow remove social logins if there is at least 1 connected
aditya-mitra Mar 17, 2023
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
98 changes: 47 additions & 51 deletions packages/client-core/src/user/components/UserMenu/menus/ProfileMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,7 @@ const ProfileMenu = ({ hideLogin, allowAvatarChange, isPopover, changeActiveMenu
(authState.linkedin && !oauthConnectedState.linkedin) ||
(authState.twitter && !oauthConnectedState.twitter)

const removeSocial =
(authState?.discord && oauthConnectedState.discord) ||
(authState.facebook && oauthConnectedState.facebook) ||
(authState.github && oauthConnectedState.github) ||
(authState.google && oauthConnectedState.google) ||
(authState.linkedin && oauthConnectedState.linkedin) ||
(authState.twitter && oauthConnectedState.twitter)
const removeSocial = Object.values(oauthConnectedState).filter((value) => value).length > 1

// const loadCredentialHandler = async () => {
// try {
Expand Down Expand Up @@ -557,51 +551,53 @@ const ProfileMenu = ({ hideLogin, allowAvatarChange, isPopover, changeActiveMenu
</div>

{!selfUser?.isGuest.value && removeSocial && (
<Text align="center" variant="body2" mb={1} mt={2}>
{t('user:usermenu.profile.removeSocial')}
</Text>
)}
<>
<Text align="center" variant="body2" mb={1} mt={2}>
{t('user:usermenu.profile.removeSocial')}
</Text>

<div className={styles.socialContainer}>
{authState?.discord && oauthConnectedState.discord && (
<IconButton
id="discord"
icon={<DiscordIcon viewBox="0 0 40 40" />}
onClick={handleRemoveOAuthServiceClick}
/>
)}
{authState?.google && oauthConnectedState.google && (
<IconButton
id="google"
icon={<GoogleIcon viewBox="0 0 40 40" />}
onClick={handleRemoveOAuthServiceClick}
/>
)}
{authState?.facebook && oauthConnectedState.facebook && (
<IconButton
id="facebook"
icon={<Icon type="Facebook" viewBox="0 0 40 40" />}
onClick={handleRemoveOAuthServiceClick}
/>
)}
{authState?.linkedin && oauthConnectedState.linkedin && (
<IconButton
id="linkedin"
icon={<LinkedInIcon viewBox="0 0 40 40" />}
onClick={handleRemoveOAuthServiceClick}
/>
)}
{authState?.twitter && oauthConnectedState.twitter && (
<IconButton
id="twitter"
icon={<Icon type="Twitter" viewBox="0 0 40 40" />}
onClick={handleRemoveOAuthServiceClick}
/>
)}
{authState?.github && oauthConnectedState.github && (
<IconButton id="github" icon={<Icon type="GitHub" />} onClick={handleRemoveOAuthServiceClick} />
)}
</div>
<div className={styles.socialContainer}>
{authState?.discord && oauthConnectedState.discord && (
<IconButton
id="discord"
icon={<DiscordIcon viewBox="0 0 40 40" />}
onClick={handleRemoveOAuthServiceClick}
/>
)}
{authState?.google && oauthConnectedState.google && (
<IconButton
id="google"
icon={<GoogleIcon viewBox="0 0 40 40" />}
onClick={handleRemoveOAuthServiceClick}
/>
)}
{authState?.facebook && oauthConnectedState.facebook && (
<IconButton
id="facebook"
icon={<Icon type="Facebook" viewBox="0 0 40 40" />}
onClick={handleRemoveOAuthServiceClick}
/>
)}
{authState?.linkedin && oauthConnectedState.linkedin && (
<IconButton
id="linkedin"
icon={<LinkedInIcon viewBox="0 0 40 40" />}
onClick={handleRemoveOAuthServiceClick}
/>
)}
{authState?.twitter && oauthConnectedState.twitter && (
<IconButton
id="twitter"
icon={<Icon type="Twitter" viewBox="0 0 40 40" />}
onClick={handleRemoveOAuthServiceClick}
/>
)}
{authState?.github && oauthConnectedState.github && (
<IconButton id="github" icon={<Icon type="GitHub" />} onClick={handleRemoveOAuthServiceClick} />
)}
</div>
</>
)}
</>
)}

Expand Down