From 7ca2302ed089059dcddaf3ee782a48fd63d33497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uro=C5=A1=20Marolt?= Date: Fri, 17 Apr 2026 13:45:33 +0200 Subject: [PATCH 1/2] fix: issue with org data preparation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Uroš Marolt --- .../libs/data-access-layer/src/organizations/base.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/services/libs/data-access-layer/src/organizations/base.ts b/services/libs/data-access-layer/src/organizations/base.ts index a24cac29bb..699373fc97 100644 --- a/services/libs/data-access-layer/src/organizations/base.ts +++ b/services/libs/data-access-layer/src/organizations/base.ts @@ -450,7 +450,7 @@ export async function findOrCreateOrganization( integrationId?: string, throttleUpdatedAt = false, ): Promise { - const verifiedIdentities = data.identities ? data.identities.filter((i) => i.verified) : [] + let verifiedIdentities = data.identities ? data.identities.filter((i) => i.verified) : [] if (verifiedIdentities.length === 0 && !data.displayName) { const message = `Missing organization identity or displayName while creating/updating organization!` @@ -471,6 +471,16 @@ export async function findOrCreateOrganization( data.identities = data.identities.filter((i) => i.value !== undefined) + // Re-derive after normalization may have set domain identity values to undefined + verifiedIdentities = data.identities.filter((i) => i.verified) + + if (verifiedIdentities.length === 0 && !data.displayName) { + log.debug( + 'Organization has no valid verified identities after domain normalization and no displayName, skipping.', + ) + return undefined + } + let existing // find existing org by sent verified identities for (const identity of verifiedIdentities) { From ae719a86fc9c6203a6c789130f0bb33aa30fcfb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uro=C5=A1=20Marolt?= Date: Fri, 17 Apr 2026 14:24:36 +0200 Subject: [PATCH 2/2] fix: comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Uroš Marolt --- services/libs/data-access-layer/src/organizations/base.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/libs/data-access-layer/src/organizations/base.ts b/services/libs/data-access-layer/src/organizations/base.ts index 699373fc97..a638938364 100644 --- a/services/libs/data-access-layer/src/organizations/base.ts +++ b/services/libs/data-access-layer/src/organizations/base.ts @@ -450,7 +450,8 @@ export async function findOrCreateOrganization( integrationId?: string, throttleUpdatedAt = false, ): Promise { - let verifiedIdentities = data.identities ? data.identities.filter((i) => i.verified) : [] + data.identities = data.identities ?? [] + let verifiedIdentities = data.identities.filter((i) => i.verified) if (verifiedIdentities.length === 0 && !data.displayName) { const message = `Missing organization identity or displayName while creating/updating organization!`