chore: import upstream snapshot with attribution
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,147 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect, useRef } from 'react'
|
||||
import { toast } from '@sim/emcn'
|
||||
import { useParams, useRouter } from 'next/navigation'
|
||||
import { requestJson } from '@/lib/api/client/request'
|
||||
import { listWorkspaceCredentialsContract } from '@/lib/api/contracts'
|
||||
import {
|
||||
ADD_CONNECTOR_SEARCH_PARAM,
|
||||
consumeOAuthReturnContext,
|
||||
type OAuthReturnContext,
|
||||
readOAuthReturnContext,
|
||||
} from '@/lib/credentials/client-state'
|
||||
|
||||
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) {
|
||||
return `"${ctx.displayName}" reconnected successfully.`
|
||||
}
|
||||
|
||||
try {
|
||||
const data = await requestJson(listWorkspaceCredentialsContract, {
|
||||
query: { workspaceId: ctx.workspaceId, type: 'oauth' },
|
||||
})
|
||||
const oauthCredentials = data.credentials ?? []
|
||||
|
||||
const forProvider = oauthCredentials.filter((c) => c.providerId === ctx.providerId)
|
||||
if (forProvider.length > ctx.preCount) {
|
||||
return `"${ctx.displayName}" credential connected successfully.`
|
||||
}
|
||||
|
||||
const existing = forProvider[0]
|
||||
return `This account is already connected as "${existing?.displayName || ctx.displayName}".`
|
||||
} catch {
|
||||
return `"${ctx.displayName}" credential connected successfully.`
|
||||
}
|
||||
}
|
||||
|
||||
function dispatchCredentialUpdate(ctx: OAuthReturnContext) {
|
||||
window.dispatchEvent(
|
||||
new CustomEvent(OAUTH_CREDENTIAL_UPDATED_EVENT, {
|
||||
detail: { providerId: ctx.providerId, workspaceId: ctx.workspaceId },
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* Post-OAuth router for the integrations page.
|
||||
*
|
||||
* After OAuth, Better Auth redirects back to `callbackURL` which is the integrations page.
|
||||
* This hook reads the stored return context to determine the original initiator:
|
||||
*
|
||||
* - `integrations`: Stay on this page, show a toast notification.
|
||||
* - `workflow`: Redirect to the specific workflow. The workflow page picks up the context.
|
||||
* - `kb-connectors`: Redirect to the KB page. The KB page picks up the context.
|
||||
*/
|
||||
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 > CONTEXT_MAX_AGE_MS) {
|
||||
consumeOAuthReturnContext()
|
||||
return
|
||||
}
|
||||
|
||||
handledRef.current = true
|
||||
|
||||
if (ctx.origin === 'integrations') {
|
||||
consumeOAuthReturnContext()
|
||||
void (async () => {
|
||||
const message = await resolveOAuthMessage(ctx)
|
||||
toast.success(message)
|
||||
dispatchCredentialUpdate(ctx)
|
||||
})()
|
||||
return
|
||||
}
|
||||
|
||||
if (ctx.origin === 'workflow') {
|
||||
try {
|
||||
sessionStorage.removeItem(SETTINGS_RETURN_URL_KEY)
|
||||
} catch {}
|
||||
router.replace(`/workspace/${workspaceId}/w/${ctx.workflowId}`)
|
||||
return
|
||||
}
|
||||
|
||||
if (ctx.origin === 'kb-connectors') {
|
||||
try {
|
||||
sessionStorage.removeItem(SETTINGS_RETURN_URL_KEY)
|
||||
} catch {}
|
||||
const kbUrl = `/workspace/${workspaceId}/knowledge/${ctx.knowledgeBaseId}`
|
||||
const connectorParam = ctx.connectorType
|
||||
? `?${ADD_CONNECTOR_SEARCH_PARAM}=${encodeURIComponent(ctx.connectorType)}`
|
||||
: ''
|
||||
router.replace(`${kbUrl}${connectorParam}`)
|
||||
return
|
||||
}
|
||||
}, [router, workspaceId])
|
||||
}
|
||||
|
||||
/**
|
||||
* Post-OAuth handler for workflow pages.
|
||||
* Consumes the return context and shows a workflow-scoped notification.
|
||||
*/
|
||||
export function useOAuthReturnForWorkflow(workflowId: string) {
|
||||
useEffect(() => {
|
||||
const ctx = readOAuthReturnContext()
|
||||
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)
|
||||
toast.success(message)
|
||||
dispatchCredentialUpdate(ctx)
|
||||
})()
|
||||
}, [workflowId])
|
||||
}
|
||||
|
||||
/**
|
||||
* Post-OAuth handler for KB connectors pages.
|
||||
* Consumes the return context and shows a toast notification.
|
||||
*/
|
||||
export function useOAuthReturnForKBConnectors(knowledgeBaseId: string) {
|
||||
useEffect(() => {
|
||||
const ctx = readOAuthReturnContext()
|
||||
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)
|
||||
toast.success(message)
|
||||
dispatchCredentialUpdate(ctx)
|
||||
})()
|
||||
}, [knowledgeBaseId])
|
||||
}
|
||||
Reference in New Issue
Block a user