Skip to content

Commit

Permalink
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions packages/server/dataloader/customLoaderMakers.ts
Original file line number Diff line number Diff line change
@@ -715,7 +715,8 @@ export const samlByDomain = (parent: RootDataLoader, dependsOn: RegisterDependsO
.selectAll('SAML')
.select(({fn}) => [fn.agg<string[]>('array_agg', ['SAMLDomain.domain']).as('domains')])
.execute()
return normalizeResults(domains, res)
// not the same as normalizeResults
return domains.map((domain) => res.find((row) => row.domains.includes(domain)))
},
{
...parent.dataLoaderOptions
@@ -735,7 +736,8 @@ export const samlByOrgId = (parent: RootDataLoader, dependsOn: RegisterDependsOn
.selectAll('SAML')
.select(({fn}) => [fn.agg<string[]>('array_agg', ['SAMLDomain.domain']).as('domains')])
.execute()
return normalizeResults(orgIds, res)
// not the same as normalizeResults
return orgIds.map((orgId) => res.find((row) => row.orgId === orgId))
},
{
...parent.dataLoaderOptions

0 comments on commit 4f883fe

Please sign in to comment.