Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 22 additions & 1 deletion src/app/core/interceptors/error.interceptor.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { MockProvider } from 'ng-mocks';

import { throwError } from 'rxjs';

import { HttpContext, HttpErrorResponse, HttpRequest } from '@angular/common/http';
import { HttpContext, HttpErrorResponse, HttpHeaders, HttpRequest } from '@angular/common/http';
import { runInInjectionContext } from '@angular/core';
import { TestBed } from '@angular/core/testing';
import { Router } from '@angular/router';
Expand Down Expand Up @@ -271,4 +271,25 @@ describe('errorInterceptor', () => {
});
});
});

it('should not navigate for 403 errors when X-No-Auth-Redirect header is true', () => {
const error = new HttpErrorResponse({
error: {},
status: 403,
url: '/metadata/abcde/?format=google-dataset-json-ld',
headers: new HttpHeaders({ 'X-No-Auth-Redirect': 'true' }),
});
const request = createRequest();

runInInjectionContext(TestBed, () => {
const result = errorInterceptor(request, createErrorHandler(error));
result.subscribe({
error: () => {
expect(router.navigate).not.toHaveBeenCalled();
expect(loaderService.hide).toHaveBeenCalled();
expect(toastService.showError).not.toHaveBeenCalled();
},
});
});
});
});
3 changes: 2 additions & 1 deletion src/app/core/interceptors/error.interceptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ export const errorInterceptor: HttpInterceptorFn = (req, next) => {

if (error.status === 403) {
const requestAccessRegex = /\/v2\/nodes\/[^/]+\/requests\/?$/i;
if (error.url && requestAccessRegex.test(error.url)) {

if (error.url && (requestAccessRegex.test(error.url) || req.headers.has('X-No-Auth-Redirect'))) {
loaderService.hide();
return throwError(() => error);
}
Expand Down
7 changes: 5 additions & 2 deletions src/app/shared/services/metadata-records.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Observable } from 'rxjs';

import { HttpClient } from '@angular/common/http';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { inject, Injectable } from '@angular/core';

import { ENVIRONMENT } from '@core/provider/environment.provider';
Expand All @@ -23,6 +23,9 @@ export class MetadataRecordsService {
}

getMetadataRecord(osfid: string, format: MetadataRecordFormat): Observable<string> {
return this.http.get(this.metadataRecordUrl(osfid, format), { responseType: 'text' });
return this.http.get(this.metadataRecordUrl(osfid, format), {
responseType: 'text',
headers: new HttpHeaders({ 'X-No-Auth-Redirect': 'true' }),
});
}
}
Loading