[DSC-1864] Uncomment xsrf token validator

Author: vins01-4science

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

@@ -1,15 +1,15 @@
 import { Injectable, Injector } from '@angular/core';
 
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { catchError, filter, map, mergeMap, take } from 'rxjs/operators';
+import { catchError, filter, map, mergeMap, take, withLatestFrom } from 'rxjs/operators';
 
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { StoreActionTypes } from '../../store.actions';
 import { getClassForType } from '../cache/builders/build-decorators';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
-//import { XSRFService } from '../xsrf/xsrf.service';
+import { XSRFService } from '../xsrf/xsrf.service';
 import {
   RequestActionTypes,
   RequestErrorAction,
@@ -22,25 +22,25 @@ import { ParsedResponse } from '../cache/response.models';
 import { RequestError } from './request-error.model';
 import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
 import { RequestEntry } from './request-entry.model';
+import { RestRequestMethod } from './rest-request-method';
 
 @Injectable()
 export class RequestEffects {
 
-   execute = createEffect(() => this.actions$.pipe(
+  execute = createEffect(() => this.actions$.pipe(
     ofType(RequestActionTypes.EXECUTE),
     mergeMap((action: RequestExecuteAction) => {
       return this.requestService.getByUUID(action.payload).pipe(
         take(1)
       );
     }),
     filter((entry: RequestEntry) => hasValue(entry)),
-     map((entry: RequestEntry) => entry.request),
-    //TODO: test once rest part is aligned
-     //withLatestFrom(this.xsrfService.tokenInitialized$),
+    // TODO: test once rest part is aligned
+    withLatestFrom(this.xsrfService.tokenInitialized$),
     // If it's a GET request, or we have an XSRF token, dispatch it immediately
     // Otherwise wait for the XSRF token first
-    //filter(([entry, tokenInitialized]: [RequestEntry, boolean]) => entry.request.method === RestRequestMethod.GET || tokenInitialized === true),
-    // map(([entry, tokenInitialized]: [RequestEntry, boolean]) => entry.request),
+    filter(([entry, tokenInitialized]) => entry?.request?.method === RestRequestMethod.GET || tokenInitialized === true),
+    map(([entry,]) => entry.request),
     mergeMap((request: RestRequestWithResponseParser) => {
       let body = request.body;
       if (isNotEmpty(request.body) && !request.isMultipart) {
@@ -81,7 +81,7 @@ export class RequestEffects {
     private restApi: DspaceRestService,
     private injector: Injector,
     protected requestService: RequestService,
-    //protected xsrfService: XSRFService,
+    protected xsrfService: XSRFService,
   ) { }
 
 }