Merge pull request #1280 from atmire/fix-first-request-issue

Fix issue where the app wouldn't load for the first request in prod mode
DSpace · Jul 26, 2021 · 4292af4 · 4292af4
2 parents e9a0399 + 8ee1286
commit 4292af4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/app/core/dspace-rest/dspace-rest.service.ts b/src/app/core/dspace-rest/dspace-rest.service.ts
@@ -112,11 +112,15 @@ export class DspaceRestService {
         statusText: res.statusText
       })),
       catchError((err) => {
-        return observableThrowError({
-          statusCode: err.status,
-          statusText: err.statusText,
-          message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
-        });
+        if (hasValue(err.status)) {
+          return observableThrowError({
+            statusCode: err.status,
+            statusText: err.statusText,
+            message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
+          });
+        } else {
+          return observableThrowError(err);
+        }
       }));
   }
 

diff --git a/src/app/core/log/log.interceptor.ts b/src/app/core/log/log.interceptor.ts
@@ -5,6 +5,7 @@ import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
 
 import { CookieService } from '../services/cookie.service';
+import { hasValue } from '../../shared/empty.util';
 
 /**
  * Log Interceptor intercepting Http Requests & Responses to
@@ -23,7 +24,9 @@ export class LogInterceptor implements HttpInterceptor {
 
     // Add headers from the intercepted request
     let headers = request.headers;
-    headers = headers.append('X-CORRELATION-ID', correlationId);
+    if (hasValue(correlationId)) {
+      headers = headers.append('X-CORRELATION-ID', correlationId);
+    }
     headers = headers.append('X-REFERRER', this.router.url);
 
     // Add new headers to the intercepted request