Skip to content

fix(notifications): credentials connection notifs showing up in right resource #3599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icecrasher321 merged 4 commits into from
Mar 15, 2026
Merged

fix(notifications): credentials connection notifs showing up in right resource #3599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62e5b8a
fix(notifications): credentials connection notifs showing up in right…
icecrasher321 Mar 15, 2026
76d984d
fix new label
icecrasher321 Mar 15, 2026
befc1ca
address comments
icecrasher321 Mar 15, 2026
5193687
reset ref correctly:
icecrasher321 Mar 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
address comments
  • Loading branch information
@icecrasher321
icecrasher321 committed Mar 15, 2026
commit befc1ca01f6f6047df8e588f2bb4d67551175053
7 changes: 5 additions & 2 deletions ...space/[workspaceId]/knowledge/[id]/components/add-connector-modal/add-connector-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
Tooltip,
} from '@/components/emcn'
import { useSession } from '@/lib/auth/auth-client'
import { writeOAuthReturnContext } from '@/lib/credentials/client-state'
import { consumeOAuthReturnContext, writeOAuthReturnContext } from '@/lib/credentials/client-state'
import {
getCanonicalScopesForProvider,
getProviderIdFromServiceId,
Expand Down Expand Up @@ -593,7 +593,10 @@ export function AddConnectorModal({ open, onOpenChange, knowledgeBaseId }: AddCo
{connectorConfig && connectorConfig.auth.mode === 'oauth' && connectorProviderId && (
<OAuthRequiredModal
isOpen={showOAuthModal}
onClose={() => setShowOAuthModal(false)}
onClose={() => {
consumeOAuthReturnContext()
setShowOAuthModal(false)
}}
provider={connectorProviderId}
toolName={connectorConfig.name}
requiredScopes={getCanonicalScopesForProvider(connectorProviderId)}
Expand Down
7 changes: 5 additions & 2 deletions ...rkspace/[workspaceId]/knowledge/[id]/components/connectors-section/connectors-section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
Tooltip,
} from '@/components/emcn'
import { cn } from '@/lib/core/utils/cn'
import { writeOAuthReturnContext } from '@/lib/credentials/client-state'
import { consumeOAuthReturnContext, writeOAuthReturnContext } from '@/lib/credentials/client-state'
import {
getCanonicalScopesForProvider,
getProviderIdFromServiceId,
Expand Down Expand Up @@ -475,7 +475,10 @@ function ConnectorCard({
{showOAuthModal && serviceId && providerId && (
<OAuthRequiredModal
isOpen={showOAuthModal}
onClose={() => setShowOAuthModal(false)}
onClose={() => {
consumeOAuthReturnContext()
setShowOAuthModal(false)
}}
provider={providerId as OAuthProvider}
toolName={connectorDef?.name ?? connector.connectorType}
requiredScopes={getCanonicalScopesForProvider(providerId)}
Expand Down
8 changes: 6 additions & 2 deletions ...sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-manager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,9 @@ export function IntegrationsManager() {
}),
})

const oauthPreCount = credentials.filter((c) => c.type === 'oauth').length
const oauthPreCount = credentials.filter(
(c) => c.type === 'oauth' && c.providerId === selectedOAuthService.providerId
).length
const returnOrigin = pendingReturnOriginRef.current
pendingReturnOriginRef.current = undefined

Expand Down Expand Up @@ -548,7 +550,9 @@ export function IntegrationsManager() {
}),
})

const oauthPreCount = credentials.filter((c) => c.type === 'oauth').length
const oauthPreCount = credentials.filter(
(c) => c.type === 'oauth' && c.providerId === selectedCredential.providerId
).length
writeOAuthReturnContext({
origin: 'integrations',
displayName: selectedCredential.displayName,
Expand Down
16 changes: 12 additions & 4 deletions apps/sim/hooks/use-oauth-return.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useEffect } from 'react'
import { useEffect, useRef } from 'react'
import { useParams, useRouter } from 'next/navigation'
import { toast } from '@/components/emcn'
import {
Expand All @@ -12,6 +12,7 @@ import { useNotificationStore } from '@/stores/notifications/store'

const OAUTH_CREDENTIAL_UPDATED_EVENT = 'oauth-credentials-updated'
const SETTINGS_RETURN_URL_KEY = 'settings-return-url'
const CONTEXT_MAX_AGE_MS = 15 * 60 * 1000

async function resolveOAuthMessage(ctx: OAuthReturnContext): Promise<string> {
if (ctx.reconnect) {
Expand All @@ -28,11 +29,12 @@ async function resolveOAuthMessage(ctx: OAuthReturnContext): Promise<string> {
providerId: string | null
}>

if (oauthCredentials.length > ctx.preCount) {
const forProvider = oauthCredentials.filter((c) => c.providerId === ctx.providerId)
if (forProvider.length > ctx.preCount) {
return `"${ctx.displayName}" credential connected successfully.`
}

const existing = oauthCredentials.find((c) => c.providerId === ctx.providerId)
const existing = forProvider[0]
return `This account is already connected as "${existing?.displayName || ctx.displayName}".`
} catch {
return `"${ctx.displayName}" credential connected successfully.`
Expand Down Expand Up @@ -61,15 +63,19 @@ export function useOAuthReturnRouter() {
const router = useRouter()
const params = useParams()
const workspaceId = params.workspaceId as string
const handledRef = useRef(false)

useEffect(() => {
if (handledRef.current) return
const ctx = readOAuthReturnContext()
if (!ctx) return
if (Date.now() - ctx.requestedAt > 15 * 60 * 1000) {
if (Date.now() - ctx.requestedAt > CONTEXT_MAX_AGE_MS) {
consumeOAuthReturnContext()
return
}

handledRef.current = true

if (ctx.origin === 'integrations') {
consumeOAuthReturnContext()
void (async () => {
Expand Down Expand Up @@ -110,6 +116,7 @@ export function useOAuthReturnForWorkflow(workflowId: string) {
if (!ctx || ctx.origin !== 'workflow') return
if (ctx.workflowId !== workflowId) return
consumeOAuthReturnContext()
if (Date.now() - ctx.requestedAt > CONTEXT_MAX_AGE_MS) return

void (async () => {
const message = await resolveOAuthMessage(ctx)
Expand All @@ -129,6 +136,7 @@ export function useOAuthReturnForKBConnectors(knowledgeBaseId: string) {
if (!ctx || ctx.origin !== 'kb-connectors') return
if (ctx.knowledgeBaseId !== knowledgeBaseId) return
consumeOAuthReturnContext()
if (Date.now() - ctx.requestedAt > CONTEXT_MAX_AGE_MS) return

void (async () => {
const message = await resolveOAuthMessage(ctx)
Expand Down
Loading