Improvement for authentication module

src/app/core/data/request.service.ts

@@ -17,6 +17,7 @@ import { RequestConfigureAction, RequestExecuteAction } from './request.actions'
 import { GetRequest, RestRequest, RestRequestMethod } from './request.models';
 
 import { RequestEntry, RequestState } from './request.reducer';
+import { ResponseCacheRemoveAction } from '../cache/response-cache.actions';
 
 @Injectable()
 export class RequestService {
@@ -66,9 +67,9 @@ export class RequestService {
       .flatMap((uuid: string) => this.getByUUID(uuid));
   }
 
-  configure<T extends CacheableObject>(request: RestRequest): void {
-    if (request.method !== RestRequestMethod.Get || !this.isCachedOrPending(request)) {
-      this.dispatchRequest(request);
+  configure<T extends CacheableObject>(request: RestRequest, overrideRequest: boolean = false): void {
+    if (request.method !== RestRequestMethod.Get || !this.isCachedOrPending(request) || overrideRequest) {
+      this.dispatchRequest(request, overrideRequest);
     }
   }
 
@@ -101,10 +102,10 @@ export class RequestService {
     return isCached || isPending;
   }
 
-  private dispatchRequest(request: RestRequest) {
+  private dispatchRequest(request: RestRequest, overrideRequest: boolean) {
     this.store.dispatch(new RequestConfigureAction(request));
     this.store.dispatch(new RequestExecuteAction(request.uuid));
-    if (request.method === RestRequestMethod.Get) {
+    if (request.method === RestRequestMethod.Get && !overrideRequest) {
       this.trackRequestsOnTheirWayToTheStore(request);
     }
   }

src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts

+import { HttpHeaders } from '@angular/common/http';
+
 export interface DSpaceRESTV2Response {
   payload: {
     [name: string]: any;
@@ -5,5 +7,6 @@ export interface DSpaceRESTV2Response {
     _links?: any;
     page?: any;
   },
+  headers: HttpHeaders,
   statusCode: string
 }

src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts

@@ -61,21 +61,16 @@ export class DSpaceRESTv2Service {
     requestOptions.body = body;
     requestOptions.observe = 'response';
     if (options && options.headers) {
-      let headers = new HttpHeaders();
-      headers = headers.append('Accept', 'application/json');
-      headers = headers.append('Content-Type', 'application/x-www-form-urlencoded');
-      // requestOptions.headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded');
-      requestOptions.headers = headers;
-      /* const keys = options.headers.getAll('');
-      keys.forEach((key) => {
-        requestOptions.headers.append(key, options.headers.get(key));
-      })*/
+      requestOptions.headers = Object.assign(new HttpHeaders(),  options.headers);
     }
     if (options && options.responseType) {
-      // requestOptions.responseType = options.responseType;
+      requestOptions.responseType = options.responseType;
     }
     return this.http.request(method, url, requestOptions)
-      .map((res) => ({ payload: res.body, statusCode: res.statusText }))
+      .map((res) => {
+        console.log(res);
+        return ({ payload: res.body, headers: res.headers, statusCode: res.statusText })
+      })
       .catch((err) => {
         console.log('Error: ', err);
         return Observable.throw(err);