119602: Inject AppConfig instead of using environment directly

Author: AAwouters

src/app/accessibility/accessibility-settings.service.spec.ts

@@ -14,6 +14,7 @@ import { EPerson } from '../core/eperson/models/eperson.model';
 import { fakeAsync, flush } from '@angular/core/testing';
 import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from '../shared/remote-data.utils';
 import { KlaroServiceStub } from '../shared/cookies/klaro.service.stub';
+import { AppConfig } from '../../config/app-config.interface';
 
 
 describe('accessibilitySettingsService', () => {
@@ -22,11 +23,13 @@ describe('accessibilitySettingsService', () => {
   let authService: AuthServiceStub;
   let ePersonService: EPersonDataService;
   let klaroService: KlaroServiceStub;
+  let appConfig: AppConfig;
 
   beforeEach(() => {
     cookieService = new CookieServiceMock();
     authService = new AuthServiceStub();
     klaroService = new KlaroServiceStub();
+    appConfig = { accessibility: { cookieExpirationDuration: 10 }} as AppConfig;
 
     klaroService.getSavedPreferences.and.returnValue(of({ accessibility: true }));
 
@@ -43,6 +46,7 @@ describe('accessibilitySettingsService', () => {
       authService as unknown as AuthService,
       ePersonService,
       klaroService,
+      appConfig,
     );
   });
 

src/app/accessibility/accessibility-settings.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { Observable, of, switchMap, combineLatest } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 import { CookieService } from '../core/services/cookie.service';
@@ -11,6 +11,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import { environment } from '../../environments/environment';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { KlaroService } from '../shared/cookies/klaro.service';
+import { AppConfig, APP_CONFIG } from '../../config/app-config.interface';
 
 /**
  * Name of the cookie used to store the settings locally
@@ -64,6 +65,7 @@ export class AccessibilitySettingsService {
     protected authService: AuthService,
     protected ePersonService: EPersonDataService,
     protected klaroService: KlaroService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
   }
 
@@ -221,7 +223,7 @@ export class AccessibilitySettingsService {
       map((accessibilityCookieAccepted: boolean) => {
         if (accessibilityCookieAccepted) {
           if (isNotEmpty(settings)) {
-            this.cookieService.set(ACCESSIBILITY_COOKIE, settings, { expires: environment.accessibility.cookieExpirationDuration });
+            this.cookieService.set(ACCESSIBILITY_COOKIE, settings, { expires: this.appConfig.accessibility.cookieExpirationDuration });
           } else {
             this.cookieService.remove(ACCESSIBILITY_COOKIE);
           }