Skip to content

fix(document-store): sync top-level credential on confluence loader update #6560

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

Open
SyncWithRaj wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −4
Open

fix(document-store): sync top-level credential on confluence loader update #6560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions packages/server/src/services/documentstore/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,8 +785,12 @@ const saveProcessingLoader = async (
if (!data.splitterId) data.splitterId = found.splitterId
if (!data.splitterName) data.splitterName = found.splitterName
if (!data.splitterConfig) data.splitterConfig = found.splitterConfig
if (found.credential) {
data.credential = found.credential
// Only fall back to the existing credential if no new credential was provided
// either directly or inside loaderConfig
if (!data.credential && !data.loaderConfig?.credential && !data.loaderConfig?.FLOWISE_CREDENTIAL_ID) {
if (found.credential) {
data.credential = found.credential
}
}

let loader: IDocumentStoreLoader = {
Expand All @@ -801,7 +805,12 @@ const saveProcessingLoader = async (
totalChars: 0,
status: DocumentStoreStatus.SYNCING
}
if (data.credential) {
// Sync top-level credential from loaderConfig if present,
// ensuring it stays in sync when the user updates credentials via the UI
const credentialFromConfig = data.loaderConfig?.credential || data.loaderConfig?.FLOWISE_CREDENTIAL_ID
if (credentialFromConfig) {
loader.credential = credentialFromConfig
} else if (data.credential) {
loader.credential = data.credential
}

Expand All @@ -820,7 +829,11 @@ const saveProcessingLoader = async (
totalChars: 0,
status: DocumentStoreStatus.SYNCING
}
if (data.credential) {
// Sync top-level credential from loaderConfig if present
const newCredentialFromConfig = data.loaderConfig?.credential || data.loaderConfig?.FLOWISE_CREDENTIAL_ID
if (newCredentialFromConfig) {
loader.credential = newCredentialFromConfig
} else if (data.credential) {
loader.credential = data.credential
}
existingLoaders.push(loader)
Expand Down
Loading