fix(env): added getters (#425)

Author: nsemets

src/app/core/components/osf-banners/services/maintenance.service.ts

@@ -19,7 +19,10 @@ export class MaintenanceService {
   /** Injected Angular `HttpClient` for making API requests. */
   private readonly http = inject(HttpClient);
   private readonly environment = inject(ENVIRONMENT);
-  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2`;
+
+  get apiUrl() {
+    return `${this.environment.apiDomainUrl}/v2`;
+  }
 
   /**
    * Fetches the maintenance status from the API and transforms the response.

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

@@ -19,11 +19,20 @@ export class AuthService {
   private readonly cookieService = inject(CookieService);
   private readonly loaderService = inject(LoaderService);
   private readonly environment = inject(ENVIRONMENT);
-  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2/users/`;
-  private readonly webUrl = this.environment.webUrl;
-  private readonly casUrl = this.environment.casUrl;
   private readonly actions = createDispatchMap({ clearCurrentUser: ClearCurrentUser });
 
+  get apiUrl() {
+    return `${this.environment.apiDomainUrl}/v2/users/`;
+  }
+
+  get webUrl() {
+    return this.environment.webUrl;
+  }
+
+  get casUrl() {
+    return this.environment.casUrl;
+  }
+
   navigateToSignIn(): void {
     this.loaderService.show();
     const loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login` })}`;

src/app/core/services/request-access.service.ts

@@ -11,7 +11,10 @@ import { JsonApiService } from '@osf/shared/services';
 export class RequestAccessService {
   private readonly jsonApiService = inject(JsonApiService);
   private readonly environment = inject(ENVIRONMENT);
-  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2`;
+
+  get apiUrl() {
+    return `${this.environment.apiDomainUrl}/v2`;
+  }
 
   requestAccessToProject(projectId: string, comment = ''): Observable<void> {
     const payload = {

src/app/core/services/user-emails.service.ts

@@ -13,7 +13,10 @@ import { JsonApiService } from '@osf/shared/services';
 export class UserEmailsService {
   private readonly jsonApiService = inject(JsonApiService);
   private readonly environment = inject(ENVIRONMENT);
-  private readonly baseUrl = `${this.environment.apiDomainUrl}/v2/users`;
+
+  get apiUrl() {
+    return `${this.environment.apiDomainUrl}/v2/users`;
+  }
 
   getEmails(): Observable<AccountEmailModel[]> {
     const params: Record<string, string> = {
@@ -22,7 +25,7 @@ export class UserEmailsService {
     };
 
     return this.jsonApiService
-      .get<EmailsResponseJsonApi>(`${this.baseUrl}/me/settings/emails/`, params)
+      .get<EmailsResponseJsonApi>(`${this.apiUrl}/me/settings/emails/`, params)
       .pipe(map((response) => MapEmails(response.data)));
   }
 
@@ -32,7 +35,7 @@ export class UserEmailsService {
     };
 
     return this.jsonApiService
-      .get<EmailResponseJsonApi>(`${this.baseUrl}/me/settings/emails/${emailId}/`, params)
+      .get<EmailResponseJsonApi>(`${this.apiUrl}/me/settings/emails/${emailId}/`, params)
       .pipe(map((response) => MapEmail(response.data)));
   }
 
@@ -55,7 +58,7 @@ export class UserEmailsService {
     };
 
     return this.jsonApiService
-      .post<EmailResponseJsonApi>(`${this.baseUrl}/${userId}/settings/emails/`, body)
+      .post<EmailResponseJsonApi>(`${this.apiUrl}/${userId}/settings/emails/`, body)
       .pipe(map((response) => MapEmail(response.data)));
   }
 
@@ -71,7 +74,7 @@ export class UserEmailsService {
     };
 
     return this.jsonApiService
-      .patch<EmailsDataJsonApi>(`${this.baseUrl}/me/settings/emails/${emailId}/`, body)
+      .patch<EmailsDataJsonApi>(`${this.apiUrl}/me/settings/emails/${emailId}/`, body)
       .pipe(map((response) => MapEmail(response)));
   }
 
@@ -87,11 +90,11 @@ export class UserEmailsService {
     };
 
     return this.jsonApiService
-      .patch<EmailsDataJsonApi>(`${this.baseUrl}/me/settings/emails/${emailId}/`, body)
+      .patch<EmailsDataJsonApi>(`${this.apiUrl}/me/settings/emails/${emailId}/`, body)
       .pipe(map((response) => MapEmail(response)));
   }
 
   deleteEmail(emailId: string): Observable<void> {
-    return this.jsonApiService.delete(`${this.baseUrl}/me/settings/emails/${emailId}/`);
+    return this.jsonApiService.delete(`${this.apiUrl}/me/settings/emails/${emailId}/`);
   }
 }

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

@@ -25,7 +25,10 @@ import { JsonApiService } from '@shared/services';
 export class UserService {
   private readonly jsonApiService = inject(JsonApiService);
   private readonly environment = inject(ENVIRONMENT);
-  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2`;
+
+  get apiUrl() {
+    return `${this.environment.apiDomainUrl}/v2`;
+  }
 
   getUserById(userId: string): Observable<User> {
     return this.jsonApiService

src/app/features/admin-institutions/services/institutions-admin.service.ts

@@ -34,8 +34,14 @@ import {
 export class InstitutionsAdminService {
   private readonly jsonApiService = inject(JsonApiService);
   private readonly environment = inject(ENVIRONMENT);
-  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2`;
-  private readonly shareTroveUrl = this.environment.shareTroveUrl;
+
+  get apiUrl() {
+    return `${this.environment.apiDomainUrl}/v2`;
+  }
+
+  get shareTroveUrl() {
+    return this.environment.shareTroveUrl;
+  }
 
   fetchDepartments(institutionId: string): Observable<InstitutionDepartment[]> {
     return this.jsonApiService

src/app/features/analytics/services/analytics.service.ts

@@ -16,7 +16,10 @@ import { AnalyticsMetricsGetResponse, AnalyticsMetricsModel, RelatedCountsGetRes
 export class AnalyticsService {
   private readonly jsonApiService = inject(JsonApiService);
   private readonly environment = inject(ENVIRONMENT);
-  private readonly apiDomainUrl = this.environment.apiDomainUrl;
+
+  get apiDomainUrl() {
+    return this.environment.apiDomainUrl;
+  }
 
   private readonly urlMap = new Map<ResourceType, string>([
     [ResourceType.Project, 'nodes'],

src/app/features/collections/services/add-to-collection.service.ts

@@ -13,7 +13,10 @@ import { JsonApiService } from '@shared/services';
 export class AddToCollectionService {
   private readonly jsonApiService = inject(JsonApiService);
   private readonly environment = inject(ENVIRONMENT);
-  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2`;
+
+  get apiUrl() {
+    return `${this.environment.apiDomainUrl}/v2`;
+  }
 
   fetchCollectionLicenses(providerId: string): Observable<LicenseModel[]> {
     return this.jsonApiService

src/app/features/meetings/services/meetings.service.ts

@@ -22,7 +22,10 @@ import {
 export class MeetingsService {
   private readonly jsonApiService = inject(JsonApiService);
   private readonly environment = inject(ENVIRONMENT);
-  private readonly baseUrl = `${this.environment.apiDomainUrl}/_/meetings/`;
+
+  get apiUrl() {
+    return `${this.environment.apiDomainUrl}/_/meetings/`;
+  }
 
   getAllMeetings(pageNumber: number, pageSize: number, filters: SearchFilters): Observable<MeetingsWithPaging> {
     const params: Record<string, unknown> = searchPreferencesToJsonApiQueryParams(
@@ -34,7 +37,7 @@ export class MeetingsService {
     );
 
     return this.jsonApiService
-      .get<ResponseJsonApi<MeetingGetResponseJsonApi[]>>(this.baseUrl, params)
+      .get<ResponseJsonApi<MeetingGetResponseJsonApi[]>>(this.apiUrl, params)
       .pipe(map((response) => MeetingsMapper.fromMeetingsGetResponse(response)));
   }
 
@@ -53,13 +56,13 @@ export class MeetingsService {
     );
 
     return this.jsonApiService
-      .get<ResponseJsonApi<MeetingSubmissionGetResponseJsonApi[]>>(`${this.baseUrl}${meetingId}/submissions/`, params)
+      .get<ResponseJsonApi<MeetingSubmissionGetResponseJsonApi[]>>(`${this.apiUrl}${meetingId}/submissions/`, params)
       .pipe(map((response) => MeetingsMapper.fromMeetingSubmissionGetResponse(response)));
   }
 
   getMeetingById(meetingId: string) {
     return this.jsonApiService
-      .get<JsonApiResponse<MeetingGetResponseJsonApi, null>>(this.baseUrl + meetingId)
+      .get<JsonApiResponse<MeetingGetResponseJsonApi, null>>(this.apiUrl + meetingId)
       .pipe(map((response) => MeetingsMapper.fromMeetingGetResponse(response.data)));
   }
 }

src/app/features/metadata/services/metadata.service.ts

@@ -27,9 +27,19 @@ import { CrossRefFundersResponse, CustomItemMetadataRecord, Metadata } from '../
 export class MetadataService {
   private readonly jsonApiService = inject(JsonApiService);
   private readonly environment = inject(ENVIRONMENT);
-  private readonly apiDomainUrl = this.environment.apiDomainUrl;
-  private readonly funderApiUrl = this.environment.funderApiUrl;
-  private readonly apiUrl = `${this.apiDomainUrl}/v2`;
+
+  get apiUrl() {
+    return `${this.environment.apiDomainUrl}/v2`;
+  }
+
+  get apiDomainUrl() {
+    return this.environment.apiDomainUrl;
+  }
+
+  get funderApiUrl() {
+    return this.environment.funderApiUrl;
+  }
+
   private readonly urlMap = new Map<ResourceType, string>([
     [ResourceType.Project, 'nodes'],
     [ResourceType.Registration, 'registrations'],