Fix issues from backend tests (#195)

* Improve error handling for search results

* Set user after OIDC callback

* Set CSRF header on POST requests

* Bump version

Author: Cito

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "data-portal-ui",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "~6.4.2",

package.json

@@ -54,6 +54,9 @@ export const querySearchService: getDatasetsSearchRespType = async (
   try {
     const response = await fetchJson(url, "POST", payload);
     const data = await response.json();
+    if (response.status !== 200) {
+      throw new Error(`Status code ${response.status} in search response`);
+    }
     callbackFunc(data);
   } catch (error) {
     showFetchDataError();

src/api/browse.ts

@@ -63,7 +63,7 @@ const Browse = () => {
   var dsCount: number = 0;
 
   if (searchResults !== null) {
-    if (searchResults.hits.length > 0 || searchResults.count === -1) {
+    if ((searchResults.hits && searchResults.hits.length > 0) || searchResults.count === -1) {
       dsList = searchResults.hits;
       facetList = searchResults.facets;
       dsCount = searchResults.count;

src/components/browse/browse.tsx

@@ -38,7 +38,7 @@ const DatasetHeader = (props: DatasetHeaderProps) => {
 
   var listOfAllFacets: FacetModel[] | null = null;
   if (searchResults !== null) {
-    if (searchResults.hits.length > 0 || searchResults.count === -1) {
+    if ((searchResults.hits && searchResults.hits.length > 0) || searchResults.count === -1) {
       listOfAllFacets = searchResults.facets;
     } else {
       listOfAllFacets = [];

src/components/browse/dataset/datasetHeader.tsx

@@ -174,6 +174,7 @@ class AuthService {
     if (!user) {
       showMessage({ type: "error", title: "Login failed" });
     }
+    this.setUser(user);
     return user;
   }
 

src/services/auth.ts

@@ -1,3 +1,5 @@
+import { authService } from "../services/auth";
+
 /**
  * Checks and cleans up URL if last character is or is not forward slash
  * Duplicate of utils version because of infinite recursion error, needs refactoring
@@ -99,6 +101,14 @@ export const fetchJson = async (
   if (CLIENT_URL) {
     headers["Origin"] = CLIENT_URL.hostname;
   }
+  if (method.match(/^POST|PUT|PATCH|DELETE$/) &&
+      !additionalHeaders?.hasOwnProperty("X-Authorization")) {
+    const user = await authService.getUser();
+    const csrf = user?.csrf;
+    if (csrf) {
+      headers["X-CSRF-Token"] = csrf;
+    }
+  }
   if (additionalHeaders) Object.assign(headers, additionalHeaders);
   const body = payload ? JSON.stringify(payload) : undefined;
   try {