Skip to content

Commit 4f1ee9f

Browse files
Bill LeoutsakosBill Leoutsakos
authored andcommitted
fix(oauth): wait for reconnect credential lookup
1 parent 7899a71 commit 4f1ee9f

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,11 @@ export function CredentialSelector({
210210
!credentialsLoading
211211

212212
useEffect(() => {
213-
if (showOAuthModal && selectedId && !selectedCredential) {
213+
if (showOAuthModal && selectedId && !selectedCredential && !credentialsLoading) {
214214
consumeOAuthReturnContext()
215215
setShowOAuthModal(false)
216216
}
217-
}, [showOAuthModal, selectedId, selectedCredential])
217+
}, [showOAuthModal, selectedId, selectedCredential, credentialsLoading])
218218

219219
const handleSelect = useCallback(
220220
(credentialId: string) => {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ export function ToolCredentialSelector({
148148
hasSelection && missingRequiredScopes.length > 0 && !disabled && !credentialsLoading
149149

150150
useEffect(() => {
151-
if (showOAuthModal && selectedId && !selectedCredential) {
151+
if (showOAuthModal && selectedId && !selectedCredential && !credentialsLoading) {
152152
consumeOAuthReturnContext()
153153
setShowOAuthModal(false)
154154
}
155-
}, [showOAuthModal, selectedId, selectedCredential])
155+
}, [showOAuthModal, selectedId, selectedCredential, credentialsLoading])
156156

157157
const handleSelect = useCallback(
158158
(credentialId: string) => {

0 commit comments

Comments
 (0)