mirror of
https://github.com/supabase/supabase.git
synced 2026-10-15 06:09:08 +03:00
It is possible to have multiple emails from different providers, a common example being SSO users. The user flow being: 1) Sign up with email using name@company.local 2) Upgrade to teams or enterprise 3) Enable SSO for the Org using domain company.local 4) Sign in with name@company.local 5) The SSO provider now handles the login, assigning new gotrue_id but uses the same primary_email 6) View the teams members and one will be omitted This change fixes the case above so that both users are displayed. It also uses the gotrue_id to ensure that the "You" badge displays the correct user. Co-authored-by: Chris Stockton <chris.stockton@supabase.io>
159 lines
6.0 KiB
TypeScript
159 lines
6.0 KiB
TypeScript
import { AlertCircle, HelpCircle } from 'lucide-react'
|
|
|
|
import { useParams } from 'common'
|
|
import Table from 'components/to-be-cleaned/Table'
|
|
import AlertError from 'components/ui/AlertError'
|
|
import { GenericSkeletonLoader } from 'components/ui/ShimmeringLoader'
|
|
import { useOrganizationRolesV2Query } from 'data/organization-members/organization-roles-query'
|
|
import { useOrganizationMembersQuery } from 'data/organizations/organization-members-query'
|
|
import { useProfile } from 'lib/profile'
|
|
import { partition } from 'lodash'
|
|
import { useMemo } from 'react'
|
|
import { Button, Loading, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
|
|
import { Admonition } from 'ui-patterns'
|
|
import { MemberRow } from './MemberRow'
|
|
|
|
export interface MembersViewProps {
|
|
searchString: string
|
|
}
|
|
|
|
const MembersView = ({ searchString }: MembersViewProps) => {
|
|
const { slug } = useParams()
|
|
const { profile } = useProfile()
|
|
|
|
const {
|
|
data: members = [],
|
|
error: membersError,
|
|
isLoading: isLoadingMembers,
|
|
isError: isErrorMembers,
|
|
isSuccess: isSuccessMembers,
|
|
} = useOrganizationMembersQuery({ slug })
|
|
const {
|
|
data: roles,
|
|
error: rolesError,
|
|
isSuccess: isSuccessRoles,
|
|
isError: isErrorRoles,
|
|
} = useOrganizationRolesV2Query({
|
|
slug,
|
|
})
|
|
|
|
const filteredMembers = useMemo(() => {
|
|
return !searchString
|
|
? members
|
|
: members.filter((member) => {
|
|
if (member.invited_at) {
|
|
return member.primary_email?.includes(searchString)
|
|
}
|
|
if (member.gotrue_id) {
|
|
return (
|
|
member.username.includes(searchString) || member.primary_email?.includes(searchString)
|
|
)
|
|
}
|
|
})
|
|
}, [members, searchString])
|
|
|
|
const [[user], otherMembers] = partition(
|
|
filteredMembers,
|
|
(m) => m.gotrue_id === profile?.gotrue_id
|
|
)
|
|
const sortedMembers = otherMembers.sort((a, b) =>
|
|
(a.primary_email ?? '').localeCompare(b.primary_email ?? '')
|
|
)
|
|
|
|
const userMember = members.find((m) => m.gotrue_id === profile?.gotrue_id)
|
|
const orgScopedRoleIds = (roles?.org_scoped_roles ?? []).map((r) => r.id)
|
|
const isOrgScopedRole = orgScopedRoleIds.includes(userMember?.role_ids?.[0] ?? -1)
|
|
|
|
return (
|
|
<>
|
|
{isLoadingMembers && <GenericSkeletonLoader />}
|
|
|
|
{isErrorMembers && (
|
|
<AlertError error={membersError} subject="Failed to retrieve organization members" />
|
|
)}
|
|
|
|
{isErrorRoles && (
|
|
<AlertError error={rolesError} subject="Failed to retrieve organization roles" />
|
|
)}
|
|
|
|
{isSuccessMembers && (
|
|
<div className="rounded w-full overflow-hidden overflow-x-scroll">
|
|
<Loading active={!filteredMembers}>
|
|
<Table
|
|
head={[
|
|
<Table.th key="header-user">User</Table.th>,
|
|
<Table.th key="header-status" className="w-24" />,
|
|
<Table.th key="header-mfa" className="text-center w-32">
|
|
Enabled MFA
|
|
</Table.th>,
|
|
<Table.th key="header-role" className="flex items-center space-x-1">
|
|
<span>Role</span>
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<Button asChild type="text" className="px-1">
|
|
<a
|
|
target="_blank"
|
|
rel="noreferrer"
|
|
href="https://supabase.com/docs/guides/platform/access-control"
|
|
>
|
|
<HelpCircle size={14} className="text-foreground-light" />
|
|
</a>
|
|
</Button>
|
|
</TooltipTrigger>
|
|
<TooltipContent side="bottom">How to configure access control?</TooltipContent>
|
|
</Tooltip>
|
|
</Table.th>,
|
|
<Table.th key="header-action" />,
|
|
]}
|
|
body={[
|
|
...(isSuccessRoles && isSuccessMembers && !isOrgScopedRole
|
|
? [
|
|
<Table.tr key="project-scope-notice">
|
|
<Table.td colSpan={12} className="!p-0">
|
|
<Admonition
|
|
type="note"
|
|
title="You are currently assigned with project scoped roles in this organization"
|
|
description="All the members within the organization will not be visible to you"
|
|
className="m-0 bg-alternative border-0 rounded-none"
|
|
/>
|
|
</Table.td>
|
|
</Table.tr>,
|
|
]
|
|
: []),
|
|
...(!!user ? [<MemberRow key={user.gotrue_id} member={user} />] : []),
|
|
...sortedMembers.map((member) => (
|
|
<MemberRow key={member.gotrue_id} member={member} />
|
|
)),
|
|
...(searchString.length > 0 && filteredMembers.length === 0
|
|
? [
|
|
<Table.tr key="no-results" className="bg-panel-secondary-light">
|
|
<Table.td colSpan={12}>
|
|
<div className="flex items-center space-x-3 opacity-75">
|
|
<AlertCircle size={16} strokeWidth={2} />
|
|
<p className="text-foreground-light">
|
|
No users matched the search query "{searchString}"
|
|
</p>
|
|
</div>
|
|
</Table.td>
|
|
</Table.tr>,
|
|
]
|
|
: []),
|
|
<Table.tr key="footer" className="bg-panel-secondary-light">
|
|
<Table.td colSpan={12}>
|
|
<p className="text-foreground-light">
|
|
{searchString ? `${filteredMembers.length} of ` : ''}
|
|
{members.length || '0'} {members.length == 1 ? 'user' : 'users'}
|
|
</p>
|
|
</Table.td>
|
|
</Table.tr>,
|
|
]}
|
|
/>
|
|
</Loading>
|
|
</div>
|
|
)}
|
|
</>
|
|
)
|
|
}
|
|
|
|
export default MembersView
|