From fdb1914acdaebf14c854e28f343f401eb6c4149b Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Fri, 8 Mar 2024 10:52:24 +0100
Subject: [PATCH] Only log errors for DspaceRestService.get

---
 .../core/dspace-rest/dspace-rest.service.ts   | 49 +++++++++++++------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/app/core/dspace-rest/dspace-rest.service.ts b/src/app/core/dspace-rest/dspace-rest.service.ts
index bd9da4cf294..b27527cba6c 100644
--- a/src/app/core/dspace-rest/dspace-rest.service.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.ts
@@ -3,6 +3,7 @@ import {
   HttpErrorResponse,
   HttpHeaders,
   HttpParams,
+  HttpResponse,
 } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import {
@@ -16,6 +17,7 @@ import {
 
 import {
   hasNoValue,
+  hasValue,
   isNotEmpty,
 } from '../../shared/empty.util';
 import { RequestError } from '../data/request-error.model';
@@ -53,7 +55,21 @@ export class DspaceRestService {
    *      An Observable<string> containing the response from the server
    */
   get(absoluteURL: string): Observable<RawRestResponse> {
-    return this.request(RestRequestMethod.GET, absoluteURL);
+    const requestOptions = {
+      observe: 'response' as any,
+      headers: new HttpHeaders({ 'Content-Type': DEFAULT_CONTENT_TYPE }),
+    };
+    return this.http.get(absoluteURL, requestOptions).pipe(
+      map((res: HttpResponse<any>) => ({
+        payload: res.body,
+        statusCode: res.status,
+        statusText: res.statusText,
+      })),
+      catchError((err: unknown) => observableThrowError(() => {
+        console.log('Error: ', err);
+        return this.handleHttpError(err);
+      })),
+    );
   }
 
   /**
@@ -110,20 +126,7 @@ export class DspaceRestService {
         statusText: res.statusText,
       })),
       catchError((err: unknown) => observableThrowError(() => {
-        console.log('Error: ', err);
-        if (err instanceof HttpErrorResponse) {
-          const error = new RequestError(
-            (isNotEmpty(err?.error?.message)) ? err.error.message : err.message,
-          );
-
-          error.statusCode = err.status;
-          error.statusText = err.statusText;
-
-          return error;
-        } else {
-          console.error('Cannot construct RequestError from', err);
-          return err;
-        }
+        return this.handleHttpError(err);
       })),
     );
   }
@@ -149,4 +152,20 @@ export class DspaceRestService {
     return form;
   }
 
+  protected handleHttpError(err: unknown): RequestError | unknown {
+    if (err instanceof HttpErrorResponse) {
+      const error = new RequestError(
+        (isNotEmpty(err?.error?.message)) ? err.error.message : err.message,
+      );
+
+      error.statusCode = err.status;
+      error.statusText = err.statusText;
+
+      return error;
+    } else {
+      console.error('Cannot construct RequestError from', err);
+      return err;
+    }
+  }
+
 }