improvement(oauth): remove unused scope hints (#2551)

waleedlatif1 · waleedlatif1 · commit 4f5d57ba20c1 · 2025-12-23T14:09:14.000-08:00
* improvement(oauth): remove unused scope hints

* improvement(oauth): remove scopeHints and extraneous oauth provider data

* cleanup
diff --git a/apps/sim/app/api/auth/oauth/connections/route.test.ts b/apps/sim/app/api/auth/oauth/connections/route.test.ts
@@ -70,7 +70,7 @@ describe('OAuth Connections API Route', () => {
       })
     )
 
-    vi.doMock('@/lib/oauth/oauth', () => ({
+    vi.doMock('@/lib/oauth/utils', () => ({
       parseProvider: mockParseProvider,
       evaluateScopeCoverage: mockEvaluateScopeCoverage,
     }))
diff --git a/apps/sim/app/api/auth/oauth/connections/route.ts b/apps/sim/app/api/auth/oauth/connections/route.ts
@@ -5,8 +5,8 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import type { OAuthProvider } from '@/lib/oauth/oauth'
-import { evaluateScopeCoverage, parseProvider } from '@/lib/oauth/oauth'
+import type { OAuthProvider } from '@/lib/oauth'
+import { evaluateScopeCoverage, parseProvider } from '@/lib/oauth'
 
 const logger = createLogger('OAuthConnectionsAPI')
 
diff --git a/apps/sim/app/api/auth/oauth/credentials/route.test.ts b/apps/sim/app/api/auth/oauth/credentials/route.test.ts
@@ -42,7 +42,7 @@ describe('OAuth Credentials API Route', () => {
       getSession: mockGetSession,
     }))
 
-    vi.doMock('@/lib/oauth/oauth', () => ({
+    vi.doMock('@/lib/oauth/utils', () => ({
       parseProvider: mockParseProvider,
       evaluateScopeCoverage: mockEvaluateScopeCoverage,
     }))
diff --git a/apps/sim/app/api/auth/oauth/credentials/route.ts b/apps/sim/app/api/auth/oauth/credentials/route.ts
@@ -7,7 +7,7 @@ import { z } from 'zod'
 import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { evaluateScopeCoverage, parseProvider } from '@/lib/oauth/oauth'
+import { evaluateScopeCoverage, type OAuthProvider, parseProvider } from '@/lib/oauth'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
 export const dynamic = 'force-dynamic'
@@ -132,7 +132,7 @@ export async function GET(request: NextRequest) {
     }
 
     // Parse the provider to get base provider and feature type (if provider is present)
-    const { baseProvider } = parseProvider(providerParam || 'google-default')
+    const { baseProvider } = parseProvider((providerParam || 'google') as OAuthProvider)
 
     let accountsData
 
diff --git a/apps/sim/app/api/auth/oauth/utils.test.ts b/apps/sim/app/api/auth/oauth/utils.test.ts
@@ -26,6 +26,7 @@ vi.mock('@sim/db', () => ({
 
 vi.mock('@/lib/oauth/oauth', () => ({
   refreshOAuthToken: vi.fn(),
+  OAUTH_PROVIDERS: {},
 }))
 
 vi.mock('@/lib/logs/console/logger', () => ({
@@ -38,7 +39,7 @@ vi.mock('@/lib/logs/console/logger', () => ({
 }))
 
 import { db } from '@sim/db'
-import { refreshOAuthToken } from '@/lib/oauth/oauth'
+import { refreshOAuthToken } from '@/lib/oauth'
 import {
   getCredential,
   getUserId,
diff --git a/apps/sim/app/api/auth/oauth/utils.ts b/apps/sim/app/api/auth/oauth/utils.ts
@@ -3,7 +3,7 @@ import { account, workflow } from '@sim/db/schema'
 import { and, desc, eq } from 'drizzle-orm'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
-import { refreshOAuthToken } from '@/lib/oauth/oauth'
+import { refreshOAuthToken } from '@/lib/oauth'
 
 const logger = createLogger('OAuthUtilsAPI')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
@@ -7,7 +7,6 @@ import { client } from '@/lib/auth/auth-client'
 import { createLogger } from '@/lib/logs/console/logger'
 import {
   getProviderIdFromServiceId,
-  getServiceIdFromScopes,
   OAUTH_PROVIDERS,
   type OAuthProvider,
   parseProvider,
@@ -21,7 +20,7 @@ export interface OAuthRequiredModalProps {
   provider: OAuthProvider
   toolName: string
   requiredScopes?: string[]
-  serviceId?: string
+  serviceId: string
   newScopes?: string[]
 }
 
@@ -301,16 +300,15 @@ export function OAuthRequiredModal({
   serviceId,
   newScopes = [],
 }: OAuthRequiredModalProps) {
-  const effectiveServiceId = serviceId || getServiceIdFromScopes(provider, requiredScopes)
   const { baseProvider } = parseProvider(provider)
   const baseProviderConfig = OAUTH_PROVIDERS[baseProvider]
 
   let providerName = baseProviderConfig?.name || provider
   let ProviderIcon = baseProviderConfig?.icon || (() => null)
 
   if (baseProviderConfig) {
-    for (const service of Object.values(baseProviderConfig.services)) {
-      if (service.id === effectiveServiceId || service.providerId === provider) {
+    for (const [key, service] of Object.entries(baseProviderConfig.services)) {
+      if (key === serviceId || service.providerId === provider) {
         providerName = service.name
         ProviderIcon = service.icon
         break
@@ -343,7 +341,7 @@ export function OAuthRequiredModal({
 
   const handleConnectDirectly = async () => {
     try {
-      const providerId = getProviderIdFromServiceId(effectiveServiceId)
+      const providerId = getProviderIdFromServiceId(serviceId)
 
       onClose()
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/slack-selector/slack-selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/slack-selector/slack-selector-input.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useParams } from 'next/navigation'
 import { Tooltip } from '@/components/emcn'
-import { getProviderIdFromServiceId } from '@/lib/oauth/oauth'
+import { getProviderIdFromServiceId } from '@/lib/oauth'
 import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tool-credential-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tool-credential-selector.tsx
@@ -4,7 +4,6 @@ import { Button, Combobox } from '@/components/emcn/components'
 import {
   getCanonicalScopesForProvider,
   getProviderIdFromServiceId,
-  getServiceIdFromScopes,
   OAUTH_PROVIDERS,
   type OAuthProvider,
   type OAuthService,
@@ -45,7 +44,7 @@ interface ToolCredentialSelectorProps {
   provider: OAuthProvider
   requiredScopes?: string[]
   label?: string
-  serviceId?: OAuthService
+  serviceId: OAuthService
   disabled?: boolean
 }
 
@@ -65,15 +64,7 @@ export function ToolCredentialSelector({
 
   const selectedId = value || ''
 
-  const effectiveServiceId = useMemo(
-    () => serviceId || getServiceIdFromScopes(provider, requiredScopes),
-    [provider, requiredScopes, serviceId]
-  )
-
-  const effectiveProviderId = useMemo(
-    () => getProviderIdFromServiceId(effectiveServiceId),
-    [effectiveServiceId]
-  )
+  const effectiveProviderId = useMemo(() => getProviderIdFromServiceId(serviceId), [serviceId])
 
   const {
     data: credentials = [],
@@ -240,7 +231,7 @@ export function ToolCredentialSelector({
           toolName={getProviderName(provider)}
           requiredScopes={getCanonicalScopesForProvider(effectiveProviderId)}
           newScopes={missingRequiredScopes}
-          serviceId={effectiveServiceId}
+          serviceId={serviceId}
         />
       )}
     </>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
@@ -24,7 +24,7 @@ import {
   getProviderIdFromServiceId,
   type OAuthProvider,
   type OAuthService,
-} from '@/lib/oauth/oauth'
+} from '@/lib/oauth'
 import {
   CheckboxList,
   Code,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/integrations/integrations.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/integrations/integrations.tsx
@@ -15,7 +15,7 @@ import {
 import { Input, Skeleton } from '@/components/ui'
 import { cn } from '@/lib/core/utils/cn'
 import { createLogger } from '@/lib/logs/console/logger'
-import { OAUTH_PROVIDERS } from '@/lib/oauth/oauth'
+import { OAUTH_PROVIDERS } from '@/lib/oauth'
 import {
   type ServiceInfo,
   useConnectOAuthService,
diff --git a/apps/sim/hooks/queries/oauth-connections.ts b/apps/sim/hooks/queries/oauth-connections.ts
@@ -1,7 +1,7 @@
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { client } from '@/lib/auth/auth-client'
 import { createLogger } from '@/lib/logs/console/logger'
-import { OAUTH_PROVIDERS, type OAuthServiceConfig } from '@/lib/oauth/oauth'
+import { OAUTH_PROVIDERS, type OAuthServiceConfig } from '@/lib/oauth'
 
 const logger = createLogger('OAuthConnectionsQuery')
 
@@ -14,9 +14,11 @@ export const oauthConnectionsKeys = {
 }
 
 /**
- * Service info type
+ * Service info type - extends OAuthServiceConfig with connection status and the service key
  */
 export interface ServiceInfo extends OAuthServiceConfig {
+  /** The service key from OAUTH_PROVIDERS (e.g., 'gmail', 'google-drive') */
+  id: string
   isConnected: boolean
   lastConnected?: string
   accounts?: { id: string; name: string }[]
@@ -29,9 +31,10 @@ function defineServices(): ServiceInfo[] {
   const servicesList: ServiceInfo[] = []
 
   Object.entries(OAUTH_PROVIDERS).forEach(([_providerKey, provider]) => {
-    Object.values(provider.services).forEach((service) => {
+    Object.entries(provider.services).forEach(([serviceKey, service]) => {
       servicesList.push({
         ...service,
+        id: serviceKey,
         isConnected: false,
         scopes: service.scopes || [],
       })
diff --git a/apps/sim/hooks/use-oauth-scope-status.ts b/apps/sim/hooks/use-oauth-scope-status.ts
@@ -1,6 +1,6 @@
 'use client'
 
-import type { Credential } from '@/lib/oauth/oauth'
+import type { Credential } from '@/lib/oauth'
 
 export interface OAuthScopeStatus {
   requiresReauthorization: boolean
diff --git a/apps/sim/lib/copilot/tools/client/other/oauth-request-access.ts b/apps/sim/lib/copilot/tools/client/other/oauth-request-access.ts
@@ -5,7 +5,7 @@ import {
   ClientToolCallState,
 } from '@/lib/copilot/tools/client/base-tool'
 import { createLogger } from '@/lib/logs/console/logger'
-import { OAUTH_PROVIDERS, type OAuthServiceConfig } from '@/lib/oauth/oauth'
+import { OAUTH_PROVIDERS, type OAuthServiceConfig } from '@/lib/oauth'
 
 const logger = createLogger('OAuthRequestAccessClientTool')
 
diff --git a/apps/sim/lib/copilot/tools/server/user/get-credentials.ts b/apps/sim/lib/copilot/tools/server/user/get-credentials.ts
@@ -7,7 +7,7 @@ import type { BaseServerTool } from '@/lib/copilot/tools/server/base-tool'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getPersonalAndWorkspaceEnv } from '@/lib/environment/utils'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getAllOAuthServices } from '@/lib/oauth/oauth'
+import { getAllOAuthServices } from '@/lib/oauth'
 import { refreshTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 
 interface GetCredentialsParams {
diff --git a/apps/sim/lib/oauth/index.ts b/apps/sim/lib/oauth/index.ts
@@ -1 +1,3 @@
-export * from '@/lib/oauth/oauth'
+export * from './oauth'
+export * from './types'
+export * from './utils'
diff --git a/apps/sim/lib/oauth/oauth.test.ts b/apps/sim/lib/oauth/oauth.test.ts
diff --git a/apps/sim/lib/oauth/oauth.ts b/apps/sim/lib/oauth/oauth.ts
diff --git a/apps/sim/lib/oauth/types.ts b/apps/sim/lib/oauth/types.ts
diff --git a/apps/sim/lib/oauth/utils.test.ts b/apps/sim/lib/oauth/utils.test.ts
diff --git a/apps/sim/lib/oauth/utils.ts b/apps/sim/lib/oauth/utils.ts
diff --git a/apps/sim/lib/workflows/credentials/credential-resolver.ts b/apps/sim/lib/workflows/credentials/credential-resolver.ts
diff --git a/apps/sim/tools/types.ts b/apps/sim/tools/types.ts

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ describe('OAuth Connections API Route', () => {`
`70`	`70`	`})`
`71`	`71`	`)`
`72`	`72`
`73`		`- vi.doMock('@/lib/oauth/oauth', () => ({`
	`73`	`+ vi.doMock('@/lib/oauth/utils', () => ({`
`74`	`74`	`parseProvider: mockParseProvider,`
`75`	`75`	`evaluateScopeCoverage: mockEvaluateScopeCoverage,`
`76`	`76`	`}))`