fix(oauth): preserve workflow return context

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/components/connect-oauth-modal/connect-oauth-modal.test.tsx

@@ -336,6 +336,7 @@ describe('ConnectOAuthModal reauthorization', () => {
   })
 
   it('collects QuickBooks app credentials inside the standard OAuth connection flow', async () => {
+    const onOpenChange = vi.fn()
     mocks.getServiceConfigByProviderId.mockReturnValue({
       clientConfiguration: {
         redirectPath: '/api/auth/oauth2/callback/quickbooks',
@@ -371,7 +372,7 @@ describe('ConnectOAuthModal reauthorization', () => {
         <ConnectOAuthModal
           mode='connect'
           open={true}
-          onOpenChange={vi.fn()}
+          onOpenChange={onOpenChange}
           providerId='quickbooks'
           workspaceId='workspace-1'
           requiredScopes={[]}
@@ -423,5 +424,11 @@ describe('ConnectOAuthModal reauthorization', () => {
         },
       })
     )
+    expect(mocks.writeOAuthReturnContext).toHaveBeenCalledOnce()
+    expect(mocks.clearOAuthReturnContext).not.toHaveBeenCalled()
+    expect(onOpenChange).toHaveBeenCalledWith(false)
+    expect(mocks.writeOAuthReturnContext.mock.invocationCallOrder[0]).toBeLessThan(
+      onOpenChange.mock.invocationCallOrder[0]
+    )
   })
 })

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

@@ -5355,7 +5355,6 @@ const WorkflowContent = React.memo(
             open={true}
             onOpenChange={(open) => {
               if (!open) {
-                consumeOAuthReturnContext()
                 setOauthModal(null)
               }
             }}