simplify code

Author: icecrasher321

apps/sim/app/api/auth/oauth/disconnect/route.ts

@@ -82,7 +82,6 @@ export async function POST(request: NextRequest) {
         id: credentialSetMember.id,
         credentialSetId: credentialSetMember.credentialSetId,
         providerId: credentialSet.providerId,
-        type: credentialSet.type,
       })
       .from(credentialSetMember)
       .innerJoin(credentialSet, eq(credentialSetMember.credentialSetId, credentialSet.id))
@@ -94,12 +93,12 @@ export async function POST(request: NextRequest) {
       )
 
     for (const membership of userMemberships) {
-      // Only sync if the credential set matches this provider or is 'all' type
+      // Only sync if the credential set matches this provider
+      // Credential sets store OAuth provider IDs like 'google-email' or 'outlook'
       const matchesProvider =
-        membership.type === 'all' ||
         membership.providerId === provider ||
         membership.providerId === providerId ||
-        (membership.providerId && provider.startsWith(membership.providerId))
+        membership.providerId?.startsWith(`${provider}-`)
 
       if (matchesProvider) {
         try {

apps/sim/app/api/credential-sets/[id]/invite/route.ts

@@ -121,7 +121,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
           .where(eq(organization.id, result.set.organizationId))
           .limit(1)
 
-        const provider = (result.set.providerId as 'gmail' | 'outlook') || 'gmail'
+        const provider = (result.set.providerId as 'google-email' | 'outlook') || 'google-email'
         const emailHtml = await renderPollingGroupInvitationEmail({
           inviterName: inviter?.name || 'A team member',
           organizationName: org?.name || 'your organization',

apps/sim/app/api/credential-sets/[id]/members/route.ts

@@ -13,7 +13,6 @@ async function getCredentialSetWithAccess(credentialSetId: string, userId: strin
     .select({
       id: credentialSet.id,
       organizationId: credentialSet.organizationId,
-      type: credentialSet.type,
       providerId: credentialSet.providerId,
     })
     .from(credentialSet)
@@ -62,34 +61,22 @@ export async function GET(req: NextRequest, { params }: { params: Promise<{ id:
     .leftJoin(user, eq(credentialSetMember.userId, user.id))
     .where(eq(credentialSetMember.credentialSetId, id))
 
-  // Get credentials for all active members
+  // Get credentials for all active members filtered by the polling group's provider
   const activeMembers = members.filter((m) => m.status === 'active')
   const memberUserIds = activeMembers.map((m) => m.userId)
 
   let credentials: { userId: string; providerId: string; accountId: string }[] = []
-  if (memberUserIds.length > 0) {
-    // If credential set is for a specific provider, filter by that provider
-    if (result.set.type === 'specific' && result.set.providerId) {
-      credentials = await db
-        .select({
-          userId: account.userId,
-          providerId: account.providerId,
-          accountId: account.accountId,
-        })
-        .from(account)
-        .where(
-          and(inArray(account.userId, memberUserIds), eq(account.providerId, result.set.providerId))
-        )
-    } else {
-      credentials = await db
-        .select({
-          userId: account.userId,
-          providerId: account.providerId,
-          accountId: account.accountId,
-        })
-        .from(account)
-        .where(inArray(account.userId, memberUserIds))
-    }
+  if (memberUserIds.length > 0 && result.set.providerId) {
+    credentials = await db
+      .select({
+        userId: account.userId,
+        providerId: account.providerId,
+        accountId: account.accountId,
+      })
+      .from(account)
+      .where(
+        and(inArray(account.userId, memberUserIds), eq(account.providerId, result.set.providerId))
+      )
   }
 
   // Group credentials by userId

apps/sim/app/api/credential-sets/[id]/route.ts

@@ -20,7 +20,6 @@ async function getCredentialSetWithAccess(credentialSetId: string, userId: strin
       organizationId: credentialSet.organizationId,
       name: credentialSet.name,
       description: credentialSet.description,
-      type: credentialSet.type,
       providerId: credentialSet.providerId,
       createdBy: credentialSet.createdBy,
       createdAt: credentialSet.createdAt,

apps/sim/app/api/credential-sets/route.ts

@@ -8,18 +8,12 @@ import { getSession } from '@/lib/auth'
 
 const logger = createLogger('CredentialSets')
 
-const createCredentialSetSchema = z
-  .object({
-    organizationId: z.string().min(1),
-    name: z.string().trim().min(1).max(100),
-    description: z.string().max(500).optional(),
-    type: z.enum(['all', 'specific']).default('all'),
-    providerId: z.string().min(1).optional(),
-  })
-  .refine((data) => data.type !== 'specific' || data.providerId, {
-    message: 'providerId is required when type is specific',
-    path: ['providerId'],
-  })
+const createCredentialSetSchema = z.object({
+  organizationId: z.string().min(1),
+  name: z.string().trim().min(1).max(100),
+  description: z.string().max(500).optional(),
+  providerId: z.enum(['google-email', 'outlook']),
+})
 
 export async function GET(req: Request) {
   const session = await getSession()
@@ -50,7 +44,6 @@ export async function GET(req: Request) {
       id: credentialSet.id,
       name: credentialSet.name,
       description: credentialSet.description,
-      type: credentialSet.type,
       providerId: credentialSet.providerId,
       createdBy: credentialSet.createdBy,
       createdAt: credentialSet.createdAt,
@@ -94,8 +87,7 @@ export async function POST(req: Request) {
 
   try {
     const body = await req.json()
-    const { organizationId, name, description, type, providerId } =
-      createCredentialSetSchema.parse(body)
+    const { organizationId, name, description, providerId } = createCredentialSetSchema.parse(body)
 
     const membership = await db
       .select({ id: member.id, role: member.role })
@@ -139,8 +131,7 @@ export async function POST(req: Request) {
       organizationId,
       name,
       description: description || null,
-      type,
-      providerId: type === 'specific' ? providerId : null,
+      providerId,
       createdBy: session.user.id,
       createdAt: now,
       updatedAt: now,

apps/sim/app/credential-account/[token]/page.tsx

@@ -6,6 +6,7 @@ import { useParams, useRouter } from 'next/navigation'
 import { Button } from '@/components/emcn'
 import { GmailIcon, OutlookIcon } from '@/components/icons'
 import { client, useSession } from '@/lib/auth/auth-client'
+import { getProviderDisplayName, isPollingProvider } from '@/lib/credential-sets/providers'
 
 interface InvitationInfo {
   credentialSetName: string
@@ -16,18 +17,6 @@ interface InvitationInfo {
 
 type AcceptedState = 'connecting' | 'already-connected'
 
-/**
- * Maps credential set provider IDs to OAuth provider IDs
- * The credential set stores 'gmail' but the OAuth provider is 'google-email'
- */
-function getOAuthProviderId(credentialSetProviderId: string): string {
-  if (credentialSetProviderId === 'gmail') {
-    return 'google-email'
-  }
-  // outlook is the same in both
-  return credentialSetProviderId
-}
-
 export default function CredentialAccountInvitePage() {
   const params = useParams()
   const router = useRouter()
@@ -87,16 +76,17 @@ export default function CredentialAccountInvitePage() {
 
       // Check if user already has this provider connected
       let isAlreadyConnected = false
-      if (credentialSetProviderId) {
-        const oauthProviderId = getOAuthProviderId(credentialSetProviderId)
+      if (credentialSetProviderId && isPollingProvider(credentialSetProviderId)) {
         try {
           const connectionsRes = await fetch('/api/auth/oauth/connections')
           if (connectionsRes.ok) {
             const connectionsData = await connectionsRes.json()
             const connections = connectionsData.connections || []
             isAlreadyConnected = connections.some(
               (conn: { provider: string; accounts?: { id: string }[] }) =>
-                conn.provider === oauthProviderId && conn.accounts && conn.accounts.length > 0
+                conn.provider === credentialSetProviderId &&
+                conn.accounts &&
+                conn.accounts.length > 0
             )
           }
         } catch {
@@ -110,16 +100,15 @@ export default function CredentialAccountInvitePage() {
         setTimeout(() => {
           router.push('/workspace')
         }, 2000)
-      } else if (credentialSetProviderId === 'gmail' || credentialSetProviderId === 'outlook') {
+      } else if (credentialSetProviderId && isPollingProvider(credentialSetProviderId)) {
         // Not connected - start OAuth flow
         setAcceptedState('connecting')
 
         // Small delay to show success message before redirect
         setTimeout(async () => {
           try {
-            const oauthProviderId = getOAuthProviderId(credentialSetProviderId)
             await client.oauth2.link({
-              providerId: oauthProviderId,
+              providerId: credentialSetProviderId,
               callbackURL: `${window.location.origin}/workspace`,
             })
           } catch (oauthError) {
@@ -165,15 +154,12 @@ export default function CredentialAccountInvitePage() {
   const ProviderIcon =
     invitation?.providerId === 'outlook'
       ? OutlookIcon
-      : invitation?.providerId === 'gmail'
+      : invitation?.providerId === 'google-email'
         ? GmailIcon
         : Mail
-  const providerName =
-    invitation?.providerId === 'outlook'
-      ? 'Outlook'
-      : invitation?.providerId === 'gmail'
-        ? 'Gmail'
-        : 'email'
+  const providerName = invitation?.providerId
+    ? getProviderDisplayName(invitation.providerId)
+    : 'email'
 
   if (acceptedState === 'already-connected') {
     return (

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/credential-selector.tsx

@@ -5,6 +5,7 @@ import { createLogger } from '@sim/logger'
 import { ExternalLink, Users } from 'lucide-react'
 import { Button, Combobox } from '@/components/emcn/components'
 import { getSubscriptionStatus } from '@/lib/billing/client'
+import { getPollingProviderFromOAuth } from '@/lib/credential-sets/providers'
 import {
   getCanonicalScopesForProvider,
   getProviderIdFromServiceId,
@@ -215,9 +216,10 @@ export function CredentialSelector({
   }, [])
 
   const { comboboxOptions, comboboxGroups } = useMemo(() => {
-    const filteredCredentialSets = credentialSets.filter(
-      (cs) => cs.type === 'all' || cs.providerId === effectiveProviderId
-    )
+    const pollingProviderId = getPollingProviderFromOAuth(effectiveProviderId)
+    const filteredCredentialSets = pollingProviderId
+      ? credentialSets.filter((cs) => cs.providerId === pollingProviderId)
+      : []
 
     if (canUseCredentialSets && filteredCredentialSets.length > 0) {
       const groups = []

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/credential-sets/credential-sets.tsx

@@ -21,10 +21,10 @@ import { GmailIcon, OutlookIcon } from '@/components/icons'
 import { Skeleton } from '@/components/ui'
 import { useSession } from '@/lib/auth/auth-client'
 import { getSubscriptionStatus } from '@/lib/billing/client'
+import { getProviderDisplayName, type PollingProvider } from '@/lib/credential-sets/providers'
 import { getUserRole } from '@/lib/workspaces/organization'
 import {
   type CredentialSet,
-  type CredentialSetType,
   useAcceptCredentialSetInvitation,
   useCreateCredentialSet,
   useCreateCredentialSetInvitation,
@@ -79,7 +79,7 @@ export function CredentialSets() {
   const [viewingSet, setViewingSet] = useState<CredentialSet | null>(null)
   const [newSetName, setNewSetName] = useState('')
   const [newSetDescription, setNewSetDescription] = useState('')
-  const [newSetProvider, setNewSetProvider] = useState<'gmail' | 'outlook'>('gmail')
+  const [newSetProvider, setNewSetProvider] = useState<PollingProvider>('google-email')
   const [createError, setCreateError] = useState<string | null>(null)
   const [inviteEmails, setInviteEmails] = useState('')
   const [isDragging, setIsDragging] = useState(false)
@@ -92,12 +92,6 @@ export function CredentialSets() {
   const removeMember = useRemoveCredentialSetMember()
   const leaveCredentialSet = useLeaveCredentialSet()
 
-  const getProviderName = useCallback((providerId: string) => {
-    if (providerId === 'gmail') return 'Gmail'
-    if (providerId === 'outlook') return 'Outlook'
-    return providerId
-  }, [])
-
   const extractEmailsFromText = useCallback((text: string): string[] => {
     // Match email patterns in text
     const emailRegex = /[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/g
@@ -211,13 +205,12 @@ export function CredentialSets() {
         organizationId: activeOrganization.id,
         name: newSetName.trim(),
         description: newSetDescription.trim() || undefined,
-        type: 'specific' as CredentialSetType,
         providerId: newSetProvider,
       })
       setShowCreateModal(false)
       setNewSetName('')
       setNewSetDescription('')
-      setNewSetProvider('gmail')
+      setNewSetProvider('google-email')
     } catch (error) {
       logger.error('Failed to create polling group', error)
       if (error instanceof Error) {
@@ -258,7 +251,7 @@ export function CredentialSets() {
     setShowCreateModal(false)
     setNewSetName('')
     setNewSetDescription('')
-    setNewSetProvider('gmail')
+    setNewSetProvider('google-email')
     setCreateError(null)
   }, [])
 
@@ -292,7 +285,7 @@ export function CredentialSets() {
               {viewingSet.name}
             </span>
             <span className='text-[12px] text-[var(--text-secondary)]'>
-              {getProviderName(viewingSet.providerId || '')}
+              {getProviderDisplayName(viewingSet.providerId || '')}
             </span>
           </div>
         </div>
@@ -569,7 +562,7 @@ export function CredentialSets() {
                   </span>
                   <span className='text-[12px] text-[var(--text-secondary)]'>
                     {set.memberCount} member{set.memberCount !== 1 ? 's' : ''}
-                    {set.providerId && <> · {getProviderName(set.providerId)}</>}
+                    {set.providerId && <> · {getProviderDisplayName(set.providerId)}</>}
                   </span>
                 </div>
                 <Button
@@ -616,8 +609,8 @@ export function CredentialSets() {
                 <Label>Email Provider</Label>
                 <div className='flex gap-[8px]'>
                   <Button
-                    variant={newSetProvider === 'gmail' ? 'active' : 'default'}
-                    onClick={() => setNewSetProvider('gmail')}
+                    variant={newSetProvider === 'google-email' ? 'active' : 'default'}
+                    onClick={() => setNewSetProvider('google-email')}
                     className='flex-1'
                   >
                     <GmailIcon className='mr-[6px] h-[16px] w-[16px]' />
@@ -633,8 +626,8 @@ export function CredentialSets() {
                   </Button>
                 </div>
                 <p className='mt-[4px] text-[11px] text-[var(--text-tertiary)]'>
-                  Members will connect their {newSetProvider === 'gmail' ? 'Gmail' : 'Outlook'}{' '}
-                  account for email polling
+                  Members will connect their {getProviderDisplayName(newSetProvider)} account for
+                  email polling
                 </p>
               </div>
               {createError && <p className='text-[12px] text-[var(--text-error)]'>{createError}</p>}

apps/sim/components/emails/invitations/polling-group-invitation-email.tsx

@@ -1,5 +1,4 @@
 import { Link, Text } from '@react-email/components'
-import { createLogger } from '@sim/logger'
 import { baseStyles } from '@/components/emails/_styles'
 import { EmailLayout } from '@/components/emails/components'
 import { getBrandConfig } from '@/lib/branding/branding'
@@ -8,21 +7,19 @@ interface PollingGroupInvitationEmailProps {
   inviterName?: string
   organizationName?: string
   pollingGroupName?: string
-  provider?: 'gmail' | 'outlook'
+  provider?: 'google-email' | 'outlook'
   inviteLink?: string
 }
 
-const logger = createLogger('PollingGroupInvitationEmail')
-
 export function PollingGroupInvitationEmail({
   inviterName = 'A team member',
   organizationName = 'an organization',
   pollingGroupName = 'a polling group',
-  provider = 'gmail',
+  provider = 'google-email',
   inviteLink = '',
 }: PollingGroupInvitationEmailProps) {
   const brand = getBrandConfig()
-  const providerName = provider === 'gmail' ? 'Gmail' : 'Outlook'
+  const providerName = provider === 'google-email' ? 'Gmail' : 'Outlook'
 
   return (
     <EmailLayout preview={`You've been invited to join ${pollingGroupName} on ${brand.name}`}>

apps/sim/components/emails/render.ts

@@ -189,7 +189,7 @@ export async function renderPollingGroupInvitationEmail(params: {
   inviterName: string
   organizationName: string
   pollingGroupName: string
-  provider: 'gmail' | 'outlook'
+  provider: 'google-email' | 'outlook'
   inviteLink: string
 }): Promise<string> {
   return await render(