Feat/480 head tags

src/app/core/components/forbidden-page/forbidden-page.component.html

@@ -2,6 +2,7 @@
   <h2>{{ 'forbiddenPage.title' | translate }}</h2>
   <p class="mt-4">
     <span>{{ 'forbiddenPage.message' | translate }}</span>
-    <a class="ml-1 font-bold" href="mailto:support@osf.io">support&#64;osf.io</a>.
+    <a class="ml-1 font-bold" [href]="'mailto:' + supportEmail">{{ supportEmail }}</a
+    >.
   </p>
 </section>

src/app/core/components/forbidden-page/forbidden-page.component.ts

@@ -2,11 +2,15 @@ import { TranslatePipe } from '@ngx-translate/core';
 
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-forbidden-page',
   imports: [TranslatePipe],
   templateUrl: './forbidden-page.component.html',
   styleUrl: './forbidden-page.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class ForbiddenPageComponent {}
+export class ForbiddenPageComponent {
+  readonly supportEmail = environment.supportEmail;
+}

src/app/core/components/page-not-found/page-not-found.component.html

@@ -2,6 +2,7 @@
   <h2>{{ 'pageNotFound.title' | translate }}</h2>
   <p class="mt-4">
     <span>{{ 'pageNotFound.message' | translate }}</span>
-    <a class="ml-1 font-bold" href="mailto:support@osf.io">support&#64;osf.io</a>.
+    <a class="ml-1 font-bold" [href]="'mailto:' + supportEmail">{{ supportEmail }}</a
+    >.
   </p>
 </section>

src/app/core/components/page-not-found/page-not-found.component.ts

@@ -2,11 +2,15 @@ import { TranslatePipe } from '@ngx-translate/core';
 
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-page-not-found',
   imports: [TranslatePipe],
   templateUrl: './page-not-found.component.html',
   styleUrl: './page-not-found.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class PageNotFoundComponent {}
+export class PageNotFoundComponent {
+  readonly supportEmail = environment.supportEmail;
+}

src/app/core/components/request-access/request-access.component.html

@@ -37,6 +37,7 @@ <h2>{{ 'requestAccess.title' | translate }}</h2>
 
   <p class="mt-4">
     <span>{{ 'requestAccess.helpMessage' | translate }}</span>
-    <a class="ml-1 font-bold" href="mailto:support@osf.io">support&#64;osf.io</a>.
+    <a class="ml-1 font-bold" [href]="'mailto:' + supportEmail">{{ supportEmail }}</a
+    >.
   </p>
 </section>

src/app/core/components/request-access/request-access.component.ts

@@ -15,6 +15,8 @@ import { AuthService, RequestAccessService } from '@osf/core/services';
 import { InputLimits } from '@osf/shared/constants';
 import { LoaderService, ToastService } from '@osf/shared/services';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-request-access',
   imports: [TranslatePipe, Button, Textarea, FormsModule],
@@ -23,9 +25,11 @@ import { LoaderService, ToastService } from '@osf/shared/services';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class RequestAccessComponent {
-  commentLimit = InputLimits.requestAccessComment.maxLength;
   comment = model('');
 
+  readonly supportEmail = environment.supportEmail;
+  readonly commentLimit = InputLimits.requestAccessComment.maxLength;
+
   private readonly route = inject(ActivatedRoute);
   private readonly id = toSignal(this.route?.params.pipe(map((params) => params['id'])) ?? of(undefined));
 

src/app/core/interceptors/error.interceptor.ts

@@ -48,10 +48,6 @@ export const errorInterceptor: HttpInterceptorFn = (req, next) => {
 
       loaderService.hide();
 
-      if (error.status === 409) {
-        return throwError(() => error);
-      }
-
       toastService.showError(errorMessage);
 
       return throwError(() => error);

src/app/core/services/auth.service.ts

@@ -71,7 +71,7 @@ export class AuthService {
         attributes: {
           uid: userId,
           token,
-          new_password: newPassword,
+          password: newPassword,
         },
       },
     };

src/app/features/auth/pages/reset-password/reset-password.component.html

@@ -51,7 +51,7 @@ <h2>{{ 'auth.resetPassword.success.title' | translate }}</h2>
     <p-button
       class="btn-full-width block mt-6"
       [label]="'auth.resetPassword.success.backToSignin' | translate"
-      [routerLink]="['/sign-in']"
+      (onClick)="backToSignIn()"
     />
   </section>
 }

src/app/features/auth/pages/reset-password/reset-password.component.ts

@@ -6,7 +6,7 @@ import { Password } from 'primeng/password';
 
 import { Component, inject, signal } from '@angular/core';
 import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
-import { ActivatedRoute, RouterLink } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 
 import { AuthService } from '@osf/core/services';
 import { CustomValidators, PASSWORD_REGEX } from '@osf/shared/helpers';
@@ -16,7 +16,7 @@ import { ResetPasswordFormGroupType } from '../../models';
 
 @Component({
   selector: 'osf-reset-password',
-  imports: [Button, Password, ReactiveFormsModule, RouterLink, PasswordInputHintComponent, Message, TranslatePipe],
+  imports: [Button, Password, ReactiveFormsModule, PasswordInputHintComponent, Message, TranslatePipe],
   templateUrl: './reset-password.component.html',
   styleUrl: './reset-password.component.scss',
 })
@@ -63,4 +63,8 @@ export class ResetPasswordComponent {
       this.isFormSubmitted.set(true);
     });
   }
+
+  backToSignIn() {
+    this.authService.navigateToSignIn();
+  }
 }

src/app/features/moderation/components/preprint-moderation-settings/preprint-moderation-settings.component.ts

@@ -14,12 +14,13 @@ import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 
 import { LoadingSpinnerComponent } from '@osf/shared/components';
-import { DEFAULT_SUPPORT_EMAIL } from '@osf/shared/constants';
 
 import { PREPRINT_SETTINGS_SECTIONS } from '../../constants';
 import { SettingsSectionControl } from '../../enums';
 import { GetPreprintProvider, PreprintModerationSelectors } from '../../store/preprint-moderation';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-preprint-moderation-settings',
   imports: [TranslatePipe, ReactiveFormsModule, Card, RadioButton, Message, LoadingSpinnerComponent],
@@ -40,9 +41,9 @@ export class PreprintModerationSettingsComponent implements OnInit {
   settingsForm!: FormGroup;
   sections = PREPRINT_SETTINGS_SECTIONS;
 
-  supportEmail = DEFAULT_SUPPORT_EMAIL;
+  readonly supportEmail = environment.supportEmail;
 
-  isLoading = select(PreprintModerationSelectors.arePreprintProviderLoading);
+  readonly isLoading = select(PreprintModerationSelectors.arePreprintProviderLoading);
 
   settings = computed(() =>
     this.store.selectSignal(PreprintModerationSelectors.getPreprintProvider)()(this.providerId())

src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.ts

@@ -19,6 +19,8 @@ import { WithdrawPreprint } from '@osf/features/preprints/store/preprint';
 import { CustomValidators } from '@osf/shared/helpers';
 import { INPUT_VALIDATION_MESSAGES } from '@shared/constants';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-withdraw-dialog',
   imports: [Textarea, ReactiveFormsModule, Message, TranslatePipe, Button, TitleCasePipe],
@@ -31,6 +33,8 @@ export class WithdrawDialogComponent implements OnInit {
   private readonly translateService = inject(TranslateService);
   readonly dialogRef = inject(DynamicDialogRef);
 
+  readonly supportEmail = environment.supportEmail;
+
   private provider!: PreprintProviderDetails;
   private preprint!: Preprint;
 
@@ -80,8 +84,6 @@ export class WithdrawDialogComponent implements OnInit {
 
   private calculateModalExplanation() {
     const providerReviewWorkflow = this.provider.reviewsWorkflow;
-    //[RNi] TODO: maybe extract to env, also see static pages
-    const supportEmail = 'support@osf.io';
 
     switch (providerReviewWorkflow) {
       case ProviderReviewsWorkflow.PreModeration: {
@@ -105,7 +107,7 @@ export class WithdrawDialogComponent implements OnInit {
         return this.translateService.instant('preprints.details.withdrawDialog.noModerationNotice', {
           singularPreprintWord: this.documentType.singular,
           pluralCapitalizedPreprintWord: this.documentType.pluralCapitalized,
-          supportEmail,
+          supportEmail: this.supportEmail,
         });
       }
     }

src/app/features/preprints/pages/landing/preprints-landing.component.html

@@ -76,6 +76,6 @@ <h2 class="text-2xl">{{ 'preprints.createServer.title' | translate }}</h2>
   </div>
 
   <p-button severity="success" class="link-button">
-    <a href="mailto:support@osf.io">{{ 'preprints.createServer.contactUs' | translate }}</a>
+    <a [href]="'mailto:' + supportEmail">{{ 'preprints.createServer.contactUs' | translate }}</a>
   </p-button>
 </section>

src/app/features/preprints/pages/landing/preprints-landing.component.ts

@@ -25,6 +25,8 @@ import { SearchInputComponent } from '@shared/components';
 import { ResourceTab } from '@shared/enums';
 import { BrandService } from '@shared/services';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-overview',
   imports: [
@@ -47,8 +49,10 @@ export class PreprintsLandingComponent implements OnInit, OnDestroy {
 
   protected searchControl = new FormControl<string>('');
 
+  readonly supportEmail = environment.supportEmail;
+  private readonly OSF_PROVIDER_ID = environment.defaultProvider;
+
   private readonly router = inject(Router);
-  private readonly OSF_PROVIDER_ID = 'osf';
   private readonly actions = createDispatchMap({
     getPreprintProviderById: GetPreprintProviderById,
     getPreprintProvidersToAdvertise: GetPreprintProvidersToAdvertise,

src/app/features/project/addons/components/configure-addon/configure-addon.component.ts

@@ -79,7 +79,7 @@ export class ConfigureAddonComponent implements OnInit {
   });
   protected readonly resourceUri = computed(() => {
     const id = this.route.parent?.parent?.snapshot.params['id'];
-    return `${environment.baseResourceUri}${id}`;
+    return `${environment.webUrl}/${id}`;
   });
   protected readonly addonTypeString = computed(() => {
     return getAddonTypeString(this.addon());

src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts

@@ -115,7 +115,7 @@ export class ConnectConfiguredAddonComponent {
   protected resourceUri = computed(() => {
     const id = this.route.parent?.parent?.snapshot.params['id'];
 
-    return `${environment.baseResourceUri}${id}`;
+    return `${environment.webUrl}/${id}`;
   });
 
   protected addonTypeString = computed(() => {

src/app/features/project/registrations/registrations.component.ts

@@ -16,6 +16,8 @@ import { RegistrationCardComponent } from '@osf/shared/components/registration-c
 
 import { GetRegistrations, RegistrationsSelectors } from './store';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-registrations',
   imports: [RegistrationCardComponent, SubHeaderComponent, FormsModule, TranslatePipe, LoadingSpinnerComponent],
@@ -31,14 +33,13 @@ export class RegistrationsComponent implements OnInit {
   protected registrations = select(RegistrationsSelectors.getRegistrations);
   protected isRegistrationsLoading = select(RegistrationsSelectors.isRegistrationsLoading);
   protected actions = createDispatchMap({ getRegistrations: GetRegistrations });
-  private readonly OSF_PROVIDER_ID = 'osf';
 
   ngOnInit(): void {
     this.actions.getRegistrations(this.projectId());
   }
 
   addRegistration(): void {
-    this.router.navigate([`registries/${this.OSF_PROVIDER_ID}/new`], {
+    this.router.navigate([`registries/${environment.defaultProvider}/new`], {
       queryParams: { projectId: this.projectId() },
     });
   }

src/app/features/registries/components/metadata/registries-license/registries-license.component.ts

@@ -15,6 +15,8 @@ import { INPUT_VALIDATION_MESSAGES, InputLimits } from '@osf/shared/constants';
 import { CustomValidators } from '@osf/shared/helpers';
 import { License, LicenseOptions } from '@osf/shared/models';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-registries-license',
   imports: [FormsModule, ReactiveFormsModule, LicenseComponent, Card, TranslatePipe, Message],
@@ -36,8 +38,6 @@ export class RegistriesLicenseComponent {
   protected selectedLicense = select(RegistriesSelectors.getSelectedLicense);
   protected draftRegistration = select(RegistriesSelectors.getDraftRegistration);
 
-  private readonly OSF_PROVIDER_ID = 'osf';
-
   currentYear = new Date();
   licenseYear = this.currentYear;
   licenseForm = this.fb.group({
@@ -52,7 +52,7 @@ export class RegistriesLicenseComponent {
   constructor() {
     effect(() => {
       if (this.draftRegistration() && !this.isLoaded) {
-        this.actions.fetchLicenses(this.draftRegistration()?.providerId ?? this.OSF_PROVIDER_ID);
+        this.actions.fetchLicenses(this.draftRegistration()?.providerId ?? environment.defaultProvider);
         this.isLoaded = true;
       }
     });

src/app/features/registries/components/review/review.component.ts

@@ -31,6 +31,8 @@ import { ClearState, DeleteDraft, FetchLicenses, FetchProjectChildren, Registrie
 import { ConfirmRegistrationDialogComponent } from '../confirm-registration-dialog/confirm-registration-dialog.component';
 import { SelectComponentsDialogComponent } from '../select-components-dialog/select-components-dialog.component';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-review',
   imports: [
@@ -71,7 +73,6 @@ export class ReviewComponent {
   protected readonly components = select(RegistriesSelectors.getRegistrationComponents);
   protected readonly license = select(RegistriesSelectors.getRegistrationLicense);
   protected readonly newRegistration = select(RegistriesSelectors.getRegistration);
-  private readonly OSF_PROVIDER_ID = 'osf';
 
   protected readonly FieldType = FieldType;
 
@@ -106,7 +107,7 @@ export class ReviewComponent {
 
     effect(() => {
       if (this.draftRegistration()) {
-        this.actions.fetchLicenses(this.draftRegistration()?.providerId ?? this.OSF_PROVIDER_ID);
+        this.actions.fetchLicenses(this.draftRegistration()?.providerId ?? environment.defaultProvider);
       }
     });
 

src/app/features/registries/pages/my-registrations/my-registrations.component.ts

@@ -32,6 +32,8 @@ import {
   RegistriesSelectors,
 } from '../../store';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-my-registrations',
   imports: [
@@ -80,7 +82,7 @@ export class MyRegistrationsComponent {
 
   protected readonly RegistrationTab = RegistrationTab;
 
-  readonly provider = 'osf';
+  readonly provider = environment.defaultProvider;
 
   selectedTab = signal(RegistrationTab.Submitted);
   itemsPerPage = 10;

src/app/features/registries/pages/registries-landing/registries-landing.component.ts

@@ -18,6 +18,8 @@ import {
 } from '@shared/components';
 import { ResourceTab } from '@shared/enums';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-registries-landing',
   imports: [
@@ -64,7 +66,6 @@ export class RegistriesLandingComponent implements OnInit {
   }
 
   goToCreateRegistration(): void {
-    const providerId = 'osf';
-    this.router.navigate([`/registries/${providerId}/new`]);
+    this.router.navigate([`/registries/${environment.defaultProvider}/new`]);
   }
 }

src/app/features/registry/components/archiving-message/archiving-message.component.html

@@ -8,7 +8,7 @@ <h2 class="mb-2 flex">
       <p class="text-red-500 mb-2 font-bold pl-5">{{ 'registry.archiving.pleaseNote' | translate }}</p>
       <p class="pl-5">
         {{ 'registry.archiving.description' | translate }}
-        <a href="mailto:support@osf.io">support.osf.io</a>
+        <a [href]="'mailto:' + supportEmail">{{ supportEmail }}</a>
         {{ 'registry.archiving.descriptionEnd' | translate }}
       </p>
     </div>

src/app/features/registry/components/archiving-message/archiving-message.component.ts

@@ -10,6 +10,8 @@ import { IconComponent } from '@osf/shared/components';
 import { RegistryOverview } from '../../models';
 import { ShortRegistrationInfoComponent } from '../short-registration-info/short-registration-info.component';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-archiving-message',
   imports: [TranslatePipe, Card, IconComponent, Divider, ShortRegistrationInfoComponent],
@@ -19,4 +21,6 @@ import { ShortRegistrationInfoComponent } from '../short-registration-info/short
 })
 export class ArchivingMessageComponent {
   registration = input.required<RegistryOverview>();
+
+  readonly supportEmail = environment.supportEmail;
 }