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

71429: Unauthorized page fixes

Browse Source
This commit is contained in:
Kristof De Langhe
2020-06-24 15:05:24 +02:00
parent 78a5bd5fce
commit 080ddf8a1f
8 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/core/shared/operators.ts
View File

@@ -1,4 +1,4 @@
import { Router } from '@angular/router';
import { Router, UrlTree } from '@angular/router';
import { Observable } from 'rxjs';
import { filter, find, flatMap, map, take, tap } from 'rxjs/operators';
import { hasValue, hasValueOperator, isNotEmpty } from '../../shared/empty.util';
@@ -11,6 +11,7 @@ import { RequestEntry } from '../data/request.reducer';
import { RequestService } from '../data/request.service';
import { BrowseDefinition } from './browse-definition.model';
import { DSpaceObject } from './dspace-object.model';
import { getUnauthorizedPath } from '../../app-routing.module';
/**
* This file contains custom RxJS operators that can be used in multiple places
@@ -181,16 +182,14 @@ export const redirectToPageNotFoundOn404 = (router: Router) =>
}));
/**
* Operator that redirects the user to the unauthorized page when the boolean received is false
* Operator that returns a UrlTree to the unauthorized page when the boolean received is false
* @param router
*/
export const redirectToUnauthorizedOnFalse = (router: Router) =>
(source: Observable<boolean>): Observable<boolean> =>
export const returnUnauthorizedUrlTreeOnFalse = (router: Router) =>
(source: Observable<boolean>): Observable<boolean | UrlTree> =>
source.pipe(
tap((authorized: boolean) => {
if (!authorized) {
router.navigateByUrl('/401', { skipLocationChange: true });
}
map((authorized: boolean) => {
return authorized ? authorized : router.parseUrl(getUnauthorizedPath())
}));
export const getFinishedRemoteData = () =>