Skip to content

114-fe/cannot-download-item-with-restricted-license #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
milanmajchrak merged 2 commits into from
Jun 16, 2023
Merged

114-fe/cannot-download-item-with-restricted-license #187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c42260
The user is redirected to the license agreement page
milanmajchrak May 24, 2023
1138782
ClarinAuthorization request must be completed
milanmajchrak Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...bitstream-page/clarin-bitstream-download-page/clarin-bitstream-download-page.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { getRemoteDataPayload, redirectOn4xx } from '../../core/shared/operators
import { HardRedirectService } from '../../core/services/hard-redirect.service';
import { GetRequest } from '../../core/data/request.models';
import { RequestService } from '../../core/data/request.service';
import { hasFailed, RequestEntryState } from '../../core/data/request.reducer';
import {hasCompleted, hasFailed, RequestEntryState} from '../../core/data/request.reducer';
import {
DOWNLOAD_TOKEN_EXPIRED_EXCEPTION,
HTTP_STATUS_UNAUTHORIZED,
Expand Down Expand Up @@ -84,7 +84,7 @@ export class ClarinBitstreamDownloadPageComponent implements OnInit {
const isLoggedIn$ = this.auth.isAuthenticated();
return observableCombineLatest([clarinIsAuthorized$, isAuthorized$, isLoggedIn$, observableOf(bitstream)]);
}),
filter(([clarinIsAuthorized, isAuthorized, isLoggedIn, bitstream]: [RemoteData<any>, boolean, boolean, Bitstream]) => hasValue(isAuthorized) && hasValue(isLoggedIn) && hasValue(clarinIsAuthorized)),
filter(([clarinIsAuthorized, isAuthorized, isLoggedIn, bitstream]: [RemoteData<any>, boolean, boolean, Bitstream]) => hasValue(isAuthorized) && hasValue(isLoggedIn) && hasValue(clarinIsAuthorized) && hasCompleted(clarinIsAuthorized.state)),
take(1),
switchMap(([clarinIsAuthorized, isAuthorized, isLoggedIn, bitstream]: [RemoteData<any>, boolean, boolean, Bitstream]) => {
const isAuthorizedByClarin = this.processClarinAuthorization(clarinIsAuthorized);
Expand Down Expand Up @@ -116,7 +116,9 @@ export class ClarinBitstreamDownloadPageComponent implements OnInit {
} else if ((isAuthorized || isAuthorizedByClarin) && !isLoggedIn) {
this.downloadStatus.next(RequestEntryState.Success);
this.hardRedirectService.redirect(bitstreamURL);
} else if (!(isAuthorized || isAuthorizedByClarin) && isLoggedIn) {
} else if (!(isAuthorized || isAuthorizedByClarin) && isLoggedIn &&
this.downloadStatus.value === RequestEntryState.Error) {
// this.downloadStatus is `ERROR` - no CLARIN exception is thrown up
this.downloadStatus.next(HTTP_STATUS_UNAUTHORIZED.toString());
this.router.navigateByUrl(getForbiddenRoute(), {skipLocationChange: true});
} else if (!(isAuthorized || isAuthorizedByClarin) && !isLoggedIn && isEmpty(this.downloadStatus.value)) {
Expand Down