fix(quickbooks): route credential OAuth through drafts

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx

@@ -46,6 +46,7 @@ import { useSession } from '@/lib/auth/auth-client'
 import type { OAuthConnectEventDetail } from '@/lib/copilot/tools/client/base-tool'
 import { consumeOAuthReturnContext, writeOAuthReturnContext } from '@/lib/credentials/client-state'
 import type { OAuthProvider } from '@/lib/oauth'
+import { usesCredentialConfiguredOAuthClient } from '@/lib/oauth/utils'
 import { OPERATION_SUBBLOCK_ID } from '@/lib/permission-groups/operation-access'
 import {
   DEFAULT_HORIZONTAL_SPACING,
@@ -343,6 +344,9 @@ const WorkflowContent = React.memo(
       requiredScopes: string[]
       newScopes?: string[]
     } | null>(null)
+    const oauthModalRequiresDraft = oauthModal
+      ? usesCredentialConfiguredOAuthClient(oauthModal.provider)
+      : false
 
     const params = useParams()
     const router = useRouter()
@@ -589,16 +593,18 @@ const WorkflowContent = React.memo(
         const detail = (event as CustomEvent<OAuthConnectEventDetail>).detail
         if (!detail) return
 
-        writeOAuthReturnContext({
-          origin: 'workflow',
-          workflowId: workflowIdParam,
-          displayName: detail.providerName,
-          providerId: detail.providerId,
-          preCount: 0,
-          workspaceId,
-          reconnect: true,
-          requestedAt: Date.now(),
-        })
+        if (!usesCredentialConfiguredOAuthClient(detail.providerId)) {
+          writeOAuthReturnContext({
+            origin: 'workflow',
+            workflowId: workflowIdParam,
+            displayName: detail.providerName,
+            providerId: detail.providerId,
+            preCount: 0,
+            workspaceId,
+            reconnect: true,
+            requestedAt: Date.now(),
+          })
+        }
 
         setOauthModal({
           provider: detail.providerId as OAuthProvider,
@@ -5342,7 +5348,27 @@ const WorkflowContent = React.memo(
 
         {!embedded && <Panel />}
 
-        {!embedded && oauthModal && (
+        {!embedded && oauthModal && oauthModalRequiresDraft && (
+          <ConnectOAuthModal
+            mode='connect'
+            origin='workflow'
+            open={true}
+            onOpenChange={(open) => {
+              if (!open) {
+                consumeOAuthReturnContext()
+                setOauthModal(null)
+              }
+            }}
+            provider={oauthModal.provider}
+            providerId={oauthModal.provider}
+            serviceId={oauthModal.serviceId}
+            requiredScopes={oauthModal.requiredScopes}
+            workspaceId={workspaceId}
+            workflowId={workflowIdParam}
+          />
+        )}
+
+        {!embedded && oauthModal && !oauthModalRequiresDraft && (
           <ConnectOAuthModal
             mode='reauthorize'
             open={true}

apps/sim/lib/oauth/utils.test.ts

@@ -15,6 +15,7 @@ import {
   getServiceConfigByServiceId,
   parseProvider,
   providerIdsForService,
+  usesCredentialConfiguredOAuthClient,
 } from './utils'
 
 describe('getAllOAuthServices', () => {
@@ -180,6 +181,14 @@ describe('getServiceByProviderAndId', () => {
   })
 })
 
+describe('usesCredentialConfiguredOAuthClient', () => {
+  it.concurrent('distinguishes user-supplied OAuth apps from deployment OAuth clients', () => {
+    expect(usesCredentialConfiguredOAuthClient('quickbooks')).toBe(true)
+    expect(usesCredentialConfiguredOAuthClient('slack')).toBe(false)
+    expect(usesCredentialConfiguredOAuthClient('unknown-provider')).toBe(false)
+  })
+})
+
 describe('getProviderIdFromServiceId', () => {
   it.concurrent('should return correct providerId for Gmail', () => {
     const providerId = getProviderIdFromServiceId('gmail')

apps/sim/lib/oauth/utils.ts

@@ -626,6 +626,10 @@ export function getServiceConfigByProviderId(providerId: string): OAuthServiceCo
   return null
 }
 
+export function usesCredentialConfiguredOAuthClient(providerId: string): boolean {
+  return Boolean(getServiceConfigByProviderId(providerId)?.clientConfiguration)
+}
+
 export function getServiceAccountProviderForProviderId(providerId: string): string | undefined {
   const serviceConfig = getServiceConfigByProviderId(providerId)
   return serviceConfig?.serviceAccountProviderId