fix(organizations): hide Leave when the caller's role is unknown

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/settings/components/team-management/team-management.tsx

@@ -11,7 +11,7 @@ import { getSubscriptionAccessState } from '@/lib/billing/client/utils'
 import { useDeploymentShape } from '@/lib/core/config/deployment-shape'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { APP_ENTRY_PATH } from '@/lib/navigation/paths'
-import { generateSlug, getUserRole, type Member } from '@/lib/workspaces/organization'
+import { generateSlug, type Member } from '@/lib/workspaces/organization'
 import { InviteModal } from '@/app/workspace/[workspaceId]/components/invite-modal'
 import {
   SettingsEmptyState,
@@ -94,15 +94,12 @@ export function TeamManagement({
   } = useOrganizationRoster(organizationId)
 
   // Prefer the roster row: Better Auth's full-organization read caps its member list and can omit
-  // the caller; the roster is withheld only when the directory is hidden, where the fallback is accurate.
+  // the caller. An unknown role hides Leave rather than offering an owner a request that always fails.
   const currentUserRole =
     roster?.members.find((member) => member.userId === session?.user?.id)?.role ??
-    getUserRole(organization, session?.user?.email)
-  const adminOrOwner = isOrgAdminRole(currentUserRole)
-  const canLeave =
-    Boolean(organization) &&
-    (roster !== undefined || rosterError !== null) &&
-    currentUserRole !== 'owner'
+    organization?.members.find((member) => member.user.email === session?.user?.email)?.role
+  const adminOrOwner = isOrgAdminRole(currentUserRole ?? 'member')
+  const canLeave = currentUserRole !== undefined && currentUserRole !== 'owner'
 
   const {
     data: organizationBillingData,

apps/sim/lib/workspaces/organization/index.ts

@@ -1,7 +1,4 @@
 // Export types
 export type { Member } from '@/lib/workspaces/organization/types'
 // Export utility functions
-export {
-  generateSlug,
-  getUserRole,
-} from '@/lib/workspaces/organization/utils'
+export { generateSlug } from '@/lib/workspaces/organization/utils'

apps/sim/lib/workspaces/organization/types.ts

@@ -10,13 +10,3 @@ export interface Member {
   role: string
   user?: User
 }
-
-export interface Organization {
-  id: string
-  name: string
-  slug: string
-  logo?: string | null
-  members?: Member[]
-  createdAt: string | Date
-  [key: string]: unknown
-}

apps/sim/lib/workspaces/organization/utils.ts

@@ -3,22 +3,6 @@
  * These are pure functions that compute values from organization data
  */
 
-import type { Organization } from '@/lib/workspaces/organization/types'
-
-/**
- * Get the role of a user in an organization
- */
-export function getUserRole(
-  organization: Organization | null | undefined,
-  userEmail?: string
-): string {
-  if (!userEmail || !organization?.members) {
-    return 'member'
-  }
-  const currentMember = organization.members.find((m) => m.user?.email === userEmail)
-  return currentMember?.role ?? 'member'
-}
-
 /**
  * Generate a URL-friendly slug from a name
  */