hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 02:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix issue where the app wouldn't load for the first request in prod mode
This commit is contained in:
Tim Donohue
2021-07-26 10:03:08 -05:00
committed by GitHub
parent e9a03994e2 8ee12868aa
commit 4292af4294
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/core/dspace-rest/dspace-rest.service.ts
View File

@@ -112,11 +112,15 @@ export class DspaceRestService {
statusText: res.statusText statusText: res.statusText
})), })),
catchError((err) => { catchError((err) => {
return observableThrowError({ if (hasValue(err.status)) {
statusCode: err.status, return observableThrowError({
statusText: err.statusText, statusCode: err.status,
message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message statusText: err.statusText,
}); message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
});
} else {
return observableThrowError(err);
}
})); }));
} }

5
src/app/core/log/log.interceptor.ts
View File

@@ -5,6 +5,7 @@ import { Router } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { CookieService } from '../services/cookie.service'; import { CookieService } from '../services/cookie.service';
import { hasValue } from '../../shared/empty.util';
/** /**
* Log Interceptor intercepting Http Requests & Responses to * Log Interceptor intercepting Http Requests & Responses to
@@ -23,7 +24,9 @@ export class LogInterceptor implements HttpInterceptor {
// Add headers from the intercepted request // Add headers from the intercepted request
let headers = request.headers; 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); headers = headers.append('X-REFERRER', this.router.url);
// Add new headers to the intercepted request // Add new headers to the intercepted request