Skip to content

fix: handle empty organization data correctly (CM-1113) #4032

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
themarolt merged 2 commits into from
Apr 17, 2026
+12 −1
Merged

fix: handle empty organization data correctly (CM-1113) #4032

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ca2302
fix: issue with org data preparation
themarolt Apr 17, 2026
ae719a8
fix: comment
themarolt Apr 17, 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
13 changes: 12 additions & 1 deletion services/libs/data-access-layer/src/organizations/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,8 @@ export async function findOrCreateOrganization(
integrationId?: string,
throttleUpdatedAt = false,
): Promise<string | undefined> {
const 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!`
Expand All @@ -471,6 +472,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) {
Expand Down
Loading