fix(elasticsearch-plugin): Do not expose private facets in search result

vendure-ecommerce · Mar 19, 2020 · 60bb5b9 · 60bb5b9
1 parent 8b79617
commit 60bb5b9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/packages/core/e2e/default-search-plugin.e2e-spec.ts b/packages/core/e2e/default-search-plugin.e2e-spec.ts
@@ -282,6 +282,8 @@ describe('Default search plugin', () => {
                 },
             });
 
+            await awaitRunningJobs(adminClient);
+
             const result = await shopClient.query<SearchFacetValues.Query, SearchFacetValues.Variables>(
                 SEARCH_GET_FACET_VALUES,
                 {

diff --git a/packages/elasticsearch-plugin/e2e/elasticsearch-plugin.e2e-spec.ts b/packages/elasticsearch-plugin/e2e/elasticsearch-plugin.e2e-spec.ts
@@ -301,6 +301,8 @@ describe('Elasticsearch plugin', () => {
                 },
             });
 
+            await awaitRunningJobs(adminClient);
+
             const result = await shopClient.query<SearchFacetValues.Query, SearchFacetValues.Variables>(
                 SEARCH_GET_FACET_VALUES,
                 {

diff --git a/packages/elasticsearch-plugin/src/elasticsearch-resolver.ts b/packages/elasticsearch-plugin/src/elasticsearch-resolver.ts
@@ -33,7 +33,8 @@ export class ShopElasticSearchResolver implements Omit<SearchResolver, 'reindex'
         @Ctx() ctx: RequestContext,
         @Parent() parent: { input: ElasticSearchInput },
     ): Promise<Array<{ facetValue: FacetValue; count: number }>> {
-        return this.elasticsearchService.facetValues(ctx, parent.input, true);
+        const facetValues = await this.elasticsearchService.facetValues(ctx, parent.input, true);
+        return facetValues.filter(i => !i.facetValue.facet.isPrivate);
     }
 
     @ResolveProperty()
-Original file line number
+Diff line change
@@ Expand Up / @@ -282,6 +282,8 @@ describe('Default search plugin', () => { @@
                     },
                 });
+                await awaitRunningJobs(adminClient);
                 const result = await shopClient.query<SearchFacetValues.Query, SearchFacetValues.Variables>(
                     SEARCH_GET_FACET_VALUES,
                     {
@@ Expand Down @@