87382: fixing circular dependencies

src/app/core/shared/operators.ts

@@ -1,31 +1,13 @@
-import { Router, UrlTree } from '@angular/router';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import {
-  debounceTime,
-  filter,
-  find,
-  map,
-  mergeMap,
-  switchMap,
-  take,
-  takeWhile,
-  tap,
-  withLatestFrom
-} from 'rxjs/operators';
+import { debounceTime, filter, find, map, switchMap, take, takeWhile } from 'rxjs/operators';
 import { hasNoValue, hasValue, hasValueOperator, isNotEmpty } from '../../shared/empty.util';
 import { SearchResult } from '../../shared/search/search-result.model';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { RestRequest } from '../data/request.models';
-import { RequestEntry, ResponseState } from '../data/request.reducer';
-import { RequestService } from '../data/request.service';
 import { MetadataField } from '../metadata/metadata-field.model';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { BrowseDefinition } from './browse-definition.model';
 import { DSpaceObject } from './dspace-object.model';
-import { getForbiddenRoute, getPageNotFoundRoute } from '../../app-routing-paths';
-import { getEndUserAgreementPath } from '../../info/info-routing-paths';
-import { AuthService } from '../auth/auth.service';
 import { InjectionToken } from '@angular/core';
 
 export const DEBOUNCE_TIME_OPERATOR = new InjectionToken<<T>(dueTime: number) => (source: Observable<T>) => Observable<T>>('debounceTime', {
@@ -33,40 +15,6 @@ export const DEBOUNCE_TIME_OPERATOR = new InjectionToken<<T>(dueTime: number) =>
   factory: () => debounceTime
 });
 
-export const REDIRECT_ON_4XX = new InjectionToken<<T>(router: Router, authService: AuthService) => (source: Observable<RemoteData<T>>) => Observable<RemoteData<T>>>('redirectOn4xx', {
-  providedIn: 'root',
-  factory: () => redirectOn4xx
-});
-
-/**
- * This file contains custom RxJS operators that can be used in multiple places
- */
-
-export const getRequestFromRequestHref = (requestService: RequestService) =>
-  (source: Observable<string>): Observable<RequestEntry> =>
-    source.pipe(
-      mergeMap((href: string) => requestService.getByHref(href)),
-      hasValueOperator()
-    );
-
-export const getRequestFromRequestUUID = (requestService: RequestService) =>
-  (source: Observable<string>): Observable<RequestEntry> =>
-    source.pipe(
-      mergeMap((uuid: string) => requestService.getByUUID(uuid)),
-      hasValueOperator()
-    );
-
-export const getResponseFromEntry = () =>
-  (source: Observable<RequestEntry>): Observable<ResponseState> =>
-    source.pipe(
-      filter((entry: RequestEntry) => hasValue(entry) && hasValue(entry.response)),
-      map((entry: RequestEntry) => entry.response)
-    );
-
-export const sendRequest = (requestService: RequestService) =>
-  (source: Observable<RestRequest>): Observable<RestRequest> =>
-    source.pipe(tap((request: RestRequest) => requestService.send(request)));
-
 export const getRemoteDataPayload = <T>() =>
   (source: Observable<RemoteData<T>>): Observable<T> =>
     source.pipe(map((remoteData: RemoteData<T>) => remoteData.payload));
@@ -190,88 +138,6 @@ export const getAllSucceededRemoteListPayload = <T>() =>
       getPaginatedListPayload()
     );
 
-/**
- * Operator that checks if a remote data object returned a 4xx error
- * When it does contain such an error, it will redirect the user to the related error page, without
- * altering the current URL
- *
- * @param router The router used to navigate to a new page
- * @param authService Service to check if the user is authenticated
- */
-export const redirectOn4xx = <T>(router: Router, authService: AuthService) =>
-  (source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
-    source.pipe(
-      withLatestFrom(authService.isAuthenticated()),
-      filter(([rd, isAuthenticated]: [RemoteData<T>, boolean]) => {
-        if (rd.hasFailed) {
-          if (rd.statusCode === 404 || rd.statusCode === 422) {
-            router.navigateByUrl(getPageNotFoundRoute(), { skipLocationChange: true });
-            return false;
-          } else if (rd.statusCode === 403 || rd.statusCode === 401) {
-            if (isAuthenticated) {
-              router.navigateByUrl(getForbiddenRoute(), { skipLocationChange: true });
-              return false;
-            } else {
-              authService.setRedirectUrl(router.url);
-              router.navigateByUrl('login');
-              return false;
-            }
-          }
-        }
-        return true;
-      }),
-      map(([rd,]: [RemoteData<T>, boolean]) => rd)
-    );
-
-/**
- * Operator that returns a UrlTree to a forbidden page or the login page when the boolean received is false
- * @param router      The router used to navigate to a forbidden page
- * @param authService The AuthService used to determine whether or not the user is logged in
- * @param redirectUrl The URL to redirect back to after logging in
- */
-export const returnForbiddenUrlTreeOrLoginOnFalse = (router: Router, authService: AuthService, redirectUrl: string) =>
-  (source: Observable<boolean>): Observable<boolean | UrlTree> =>
-    source.pipe(
-      map((authorized) => [authorized]),
-      returnForbiddenUrlTreeOrLoginOnAllFalse(router, authService, redirectUrl),
-    );
-
-/**
- * Operator that returns a UrlTree to a forbidden page or the login page when the booleans received are all false
- * @param router      The router used to navigate to a forbidden page
- * @param authService The AuthService used to determine whether or not the user is logged in
- * @param redirectUrl The URL to redirect back to after logging in
- */
-export const returnForbiddenUrlTreeOrLoginOnAllFalse = (router: Router, authService: AuthService, redirectUrl: string) =>
-  (source: Observable<boolean[]>): Observable<boolean | UrlTree> =>
-    observableCombineLatest(source, authService.isAuthenticated()).pipe(
-      map(([authorizedList, authenticated]: [boolean[], boolean]) => {
-        if (authorizedList.some((b: boolean) => b === true)) {
-          return true;
-        } else {
-          if (authenticated) {
-            return router.parseUrl(getForbiddenRoute());
-          } else {
-            authService.setRedirectUrl(redirectUrl);
-            return router.parseUrl('login');
-          }
-        }
-      }));
-
-/**
- * Operator that returns a UrlTree to the unauthorized page when the boolean received is false
- * @param router    Router
- * @param redirect  Redirect URL to add to the UrlTree. This is used to redirect back to the original route after the
- *                  user accepts the agreement.
- */
-export const returnEndUserAgreementUrlTreeOnFalse = (router: Router, redirect: string) =>
-  (source: Observable<boolean>): Observable<boolean | UrlTree> =>
-    source.pipe(
-      map((hasAgreed: boolean) => {
-        const queryParams = { redirect: encodeURIComponent(redirect) };
-        return hasAgreed ? hasAgreed : router.createUrlTree([getEndUserAgreementPath()], { queryParams });
-      }));
-
 export const getFinishedRemoteData = <T>() =>
   (source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
     source.pipe(find((rd: RemoteData<T>) => !rd.isLoading));