From 1b5c801d0665f0c9fa39c3b63e45dfa01d4e59d2 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 27 Jun 2022 16:24:16 +0200
Subject: [PATCH] 92701: Disable user agreement feature

---
 config/config.example.yml                                  | 7 +++++++
 config/config.yml                                          | 4 ++++
 .../end-user-agreement-current-user.guard.spec.ts          | 2 +-
 src/config/default-app-config.ts                           | 7 ++++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 898b47784f..723568c020 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -246,3 +246,10 @@ bundle:
 mediaViewer:
   image: false
   video: false
+
+# Whether the end user agreement is required before users use the repository.
+# If enabled, the user will be required to accept the agreement before they can use the repository.
+# And whether the privacy statement should exist or not.
+info:
+  enableEndUserAgreement: true
+  enablePrivacyStatement: true
diff --git a/config/config.yml b/config/config.yml
index b5eecd112f..2b5ac3b52e 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -3,3 +3,7 @@ rest:
   host: api7.dspace.org
   port: 443
   nameSpace: /server
+
+info:
+  enableEndUserAgreement: true
+  enablePrivacyStatement: true
diff --git a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
index b280ef798c..40728ab601 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
@@ -2,7 +2,7 @@ import { EndUserAgreementCurrentUserGuard } from './end-user-agreement-current-u
 import { EndUserAgreementService } from './end-user-agreement.service';
 import { Router, UrlTree } from '@angular/router';
 import { of as observableOf } from 'rxjs';
-import { environment } from '../../../environments/mock-environment';
+import { environment } from '../../../environments/environment.test';
 
 describe('EndUserAgreementGuard', () => {
   let guard: EndUserAgreementCurrentUserGuard;
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 886f1598fd..4108444443 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -16,6 +16,7 @@ import { ThemeConfig } from './theme.model';
 import { UIServerConfig } from './ui-server-config.interface';
 import { BundleConfig } from './bundle-config.interface';
 import { ActuatorsConfig } from './actuators.config';
+import { InfoConfig } from './info-config.interface';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -324,8 +325,8 @@ export class DefaultAppConfig implements AppConfig {
     image: false,
     video: false
   };
-  info: {
-    enableEndUserAgreement: false,
-    enablePrivacyStatement: false
+  info: InfoConfig = {
+    enableEndUserAgreement: true,
+    enablePrivacyStatement: true
   };
 }