added basic auth support back into rdt package

DANS-KNAW · Jan 28, 2025 · 70865c5 · 70865c5
1 parent 6779061
commit 70865c5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/apps/supercatalog/src/config/elasticSearch.tsx b/apps/supercatalog/src/config/elasticSearch.tsx
@@ -97,6 +97,8 @@ export const elasticConfig: EndpointProps[] = [
   {
     name: "Super Catalog",
     url: import.meta.env.VITE_ELASTICSEARCH_API_ENDPOINT,
+    user: import.meta.env.VITE_ELASTICSEARCH_API_USER,
+    pass: import.meta.env.VITE_ELASTICSEARCH_API_PASS,
     fullTextFields: fieldConfig.fullTextFields,
     fullTextHighlight: fieldConfig.fullTextHighlight,
     resultBodyComponent: SingleResult,

diff --git a/packages/rdt-search-ui/src/context/props/index.ts b/packages/rdt-search-ui/src/context/props/index.ts
@@ -66,12 +66,18 @@ interface OptionalSearchProps {
 
   SearchHomeComponent?: React.FC<any>;
   fixedFacets?: FixedFacetsProps[];
+
+  // For basic auth
+  user?: string;
+  pass?: string;
 }
 
 // Endpoints for search/endpoint urls
 export interface EndpointBaseProps {
   name: string;
   url: string;
+  user?: string;
+  pass?: string;
 }
 
 export interface FixedFacetsProps {

diff --git a/packages/rdt-search-ui/src/context/state/use-search/fetch.ts b/packages/rdt-search-ui/src/context/state/use-search/fetch.ts
@@ -45,6 +45,8 @@ export async function fetchSearchResult(
   payload: Payload,
   dispatch: any,
   fixedFacets?: FixedFacetsProps[],
+  user?: string,
+  pass?: string,
 ) {
   let fetchResponse: Response;
   let response: any;
@@ -71,6 +73,10 @@ export async function fetchSearchResult(
       method: "post",
       headers: {
         "Content-Type": "application/json",
+        // if user and pass are provided, add basic auth header
+        ...(user && pass && {
+          Authorization: `Basic ${btoa(`${user}:${pass}`)}`,
+        }),
       },
       body: body,
     });

diff --git a/packages/rdt-search-ui/src/context/state/use-search/index.ts b/packages/rdt-search-ui/src/context/state/use-search/index.ts
@@ -122,7 +122,7 @@ async function fetchSearchResultOnly(
   dispatch: any,
 ) {
   const { payload } = new ESRequest(searchState, searchProps, controllers);
-  const response = await fetchSearchResult(searchProps.url, payload, dispatch, searchProps.fixedFacets);
+  const response = await fetchSearchResult(searchProps.url, payload, dispatch, searchProps.fixedFacets, searchProps.user, searchProps.pass);
   const result = ESResponseParser(response);
   return result;
 }
@@ -138,7 +138,7 @@ async function fetchSearchResultWithFacets(
     searchProps,
     controllers,
   );
-  const response = await fetchSearchResult(searchProps.url, payload, dispatch, searchProps.fixedFacets);
+  const response = await fetchSearchResult(searchProps.url, payload, dispatch, searchProps.fixedFacets, searchProps.user, searchProps.pass);
   const result = ESResponseWithFacetsParser(response, controllers);
   return result;
 }
@@ -172,7 +172,7 @@ async function fetchFacetValuesOnly(
   payload.track_total_hits = false;
 
   // Fetch the response
-  const response = await fetchSearchResult(searchProps.url, payload, dispatch, searchProps.fixedFacets);
+  const response = await fetchSearchResult(searchProps.url, payload, dispatch, searchProps.fixedFacets, searchProps.user, searchProps.pass);
 
   // Parse only the facet values of the requested facet
   let buckets = getBuckets(response, controller.ID);

diff --git a/packages/rdt-search-ui/src/index.tsx b/packages/rdt-search-ui/src/index.tsx
@@ -297,6 +297,8 @@ export const FacetedWrapper = ({
               }
               ResultBodyComponent={currentConfig.resultBodyComponent}
               url={currentConfig.url}
+              user={currentConfig.user}
+              pass={currentConfig.pass}
               shareRoutes={{
                 results: resultRoute,
                 dashboard: dashRoute,