{{ 'forbiddenPage.message' | translate }} - support@osf.io + support@osf.io.
diff --git a/src/app/core/components/page-not-found/page-not-found.component.html b/src/app/core/components/page-not-found/page-not-found.component.html index dce559811..bf7889c25 100644 --- a/src/app/core/components/page-not-found/page-not-found.component.html +++ b/src/app/core/components/page-not-found/page-not-found.component.html @@ -2,6 +2,6 @@{{ 'pageNotFound.message' | translate }} - support@osf.io + support@osf.io.
diff --git a/src/app/core/components/request-access/request-access.component.html b/src/app/core/components/request-access/request-access.component.html index c013e1fc5..edc8780f5 100644 --- a/src/app/core/components/request-access/request-access.component.html +++ b/src/app/core/components/request-access/request-access.component.html @@ -37,6 +37,6 @@{{ 'requestAccess.helpMessage' | translate }} - support@osf.io + support@osf.io.
diff --git a/src/app/core/components/request-access/request-access.component.ts b/src/app/core/components/request-access/request-access.component.ts index 34a07c419..0881a2fc9 100644 --- a/src/app/core/components/request-access/request-access.component.ts +++ b/src/app/core/components/request-access/request-access.component.ts @@ -5,6 +5,7 @@ import { Textarea } from 'primeng/textarea'; import { map, of } from 'rxjs'; +import { HttpErrorResponse } from '@angular/common/http'; import { ChangeDetectionStrategy, Component, inject, model } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; @@ -35,10 +36,17 @@ export class RequestAccessComponent { requestAccess() { this.loaderService.show(); - this.requestAccessService.requestAccessToProject(this.projectId(), this.comment()).subscribe(() => { - this.loaderService.hide(); - this.router.navigate(['/']); - this.toastService.showSuccess('requestAccess.requestedSuccessMessage'); + this.requestAccessService.requestAccessToProject(this.projectId(), this.comment()).subscribe({ + next: () => { + this.loaderService.hide(); + this.router.navigate(['/']); + this.toastService.showSuccess('requestAccess.requestedSuccessMessage'); + }, + error: (error: HttpErrorResponse) => { + if (error.status === 409) { + this.toastService.showError('requestAccess.alreadyRequestedMessage'); + } + }, }); } diff --git a/src/app/core/interceptors/auth.interceptor.ts b/src/app/core/interceptors/auth.interceptor.ts index 707dca12d..0ddb43ab9 100644 --- a/src/app/core/interceptors/auth.interceptor.ts +++ b/src/app/core/interceptors/auth.interceptor.ts @@ -15,12 +15,10 @@ export const authInterceptor: HttpInterceptorFn = ( const authReq = req.clone({ setHeaders: { Authorization: `Bearer ${authToken}`, + Accept: req.responseType === 'text' ? '*/*' : 'application/vnd.api+json', 'Content-Type': 'application/vnd.api+json', }, }); - if (req.responseType !== 'text') { - authReq.headers.set('Accept', 'application/vnd.api+json'); - } return next(authReq); } diff --git a/src/app/core/interceptors/error.interceptor.ts b/src/app/core/interceptors/error.interceptor.ts index cc6b7d2c1..feafc2605 100644 --- a/src/app/core/interceptors/error.interceptor.ts +++ b/src/app/core/interceptors/error.interceptor.ts @@ -40,6 +40,11 @@ export const errorInterceptor: HttpInterceptorFn = (req, next) => { } loaderService.hide(); + + if (error.status === 409) { + return throwError(() => error); + } + toastService.showError(errorMessage); return throwError(() => error); diff --git a/src/app/features/project/wiki/components/view-section/view-section.component.html b/src/app/features/project/wiki/components/view-section/view-section.component.html index 9190e497d..901b184a7 100644 --- a/src/app/features/project/wiki/components/view-section/view-section.component.html +++ b/src/app/features/project/wiki/components/view-section/view-section.component.html @@ -9,7 +9,7 @@