From d7f6885232ecbcef368ef3c8fb7354d3ff28b0a1 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Thu, 3 Sep 2020 11:37:33 +0200
Subject: [PATCH] updated consent configuration

---
 src/app/shared/cookies/klaro-configuration.ts | 40 ++++----------
 src/assets/i18n/en.json5                      | 52 ++++++-------------
 2 files changed, 25 insertions(+), 67 deletions(-)

diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
index 8534fc0b4b..45b5f8013f 100644
--- a/src/app/shared/cookies/klaro-configuration.ts
+++ b/src/app/shared/cookies/klaro-configuration.ts
@@ -57,6 +57,7 @@ export const klaroConfiguration: any = {
       },
       close: 'cookies.consent.close',
       decline: 'cookies.consent.decline',
+      changeDescription: 'cookies.consent.update',
       consentNotice: {
         description: 'cookies.consent.content-notice.description',
         learnMore: 'cookies.consent.content-notice.learnMore'
@@ -74,56 +75,35 @@ export const klaroConfiguration: any = {
   },
   apps: [
     {
-      name: 'token_item',
-      purposes: ['authentication'],
-      required: true,
-      cookies: [
-        TOKENITEM
-      ]
-    },
-    {
-      name: 'impersonation',
-      purposes: ['authentication'],
-      required: true,
-      cookies: [
-        IMPERSONATING_COOKIE
-      ]
-    },
-    {
-      name: 'redirect',
-      purposes: ['authentication'],
+      name: 'authentication',
+      purposes: ['functional'],
       required: true,
       cookies: [
+        TOKENITEM,
+        IMPERSONATING_COOKIE,
         REDIRECT_COOKIE
       ]
     },
     {
-      name: 'language',
-      purposes: ['preferences'],
+      name: 'preferences',
+      purposes: ['functional'],
       required: true,
       cookies: [
         LANG_COOKIE
       ]
     },
     {
-      name: 'klaro',
-      purposes: ['acknowledgement'],
+      name: 'acknowledgement',
+      purposes: ['functional'],
       required: true,
       cookies: [
         [/^klaro-.+$/],
-      ]
-    },
-    {
-      name: 'has_agreed_end_user',
-      purposes: ['acknowledgement'],
-      required: true,
-      cookies: [
         HAS_AGREED_END_USER
       ]
     },
     {
       name: 'google-analytics',
-      purposes: ['statistics'],
+      purposes: ['statistical'],
       required: false,
       cookies: [
         //     /*
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 8beb133758..bcb58a6f17 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -951,11 +951,13 @@
 
   "cookies.consent.app.required.title": "(always required)",
 
+  "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+
   "cookies.consent.close": "Close",
 
   "cookies.consent.decline": "Decline",
 
-  "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: {purposes}. <br/> To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
 
   "cookies.consent.content-notice.learnMore": "Customize",
 
@@ -969,56 +971,32 @@
 
 
 
-  "cookies.consent.app.title.token_item": "User Token",
+  "cookies.consent.app.title.authentication": "Authentication",
 
-  "cookies.consent.app.description.token_item": "User login identification",
+  "cookies.consent.app.description.authentication": "Required for signing you in",
+
+
+  "cookies.consent.app.title.preferences": "Preferences",
+
+  "cookies.consent.app.description.preferences": "Required for saving your preferences",
 
 
 
-  "cookies.consent.app.title.impersonation": "Impersonation",
+  "cookies.consent.app.title.acknowledgement": "Acknowledgement",
 
-  "cookies.consent.app.description.impersonation": "Switching users",
-
-
-
-  "cookies.consent.app.title.redirect": "Redirect",
-
-  "cookies.consent.app.description.redirect": "",
-
-
-
-  "cookies.consent.app.title.language": "Language",
-
-  "cookies.consent.app.description.language": "",
-
-
-
-  "cookies.consent.app.title.klaro": "Klaro",
-
-  "cookies.consent.app.description.klaro": "Cookie consent preferences",
-
-
-
-  "cookies.consent.app.title.has_agreed_end_user": "Has agreed end user",
-
-  "cookies.consent.app.description.has_agreed_end_user": "",
+  "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
 
 
 
   "cookies.consent.app.title.google-analytics": "Google Analytics",
 
-  "cookies.consent.app.description.google-analytics": "",
+  "cookies.consent.app.description.google-analytics": "Required for storing statistical data",
 
 
 
-  "cookies.consent.purpose.authentication": "Authentication",
-
-  "cookies.consent.purpose.statistics": "Statistics",
-
-  "cookies.consent.purpose.preferences": "Preferences",
-
-  "cookies.consent.purpose.acknowledgement": "Acknowledgement",
+  "cookies.consent.purpose.functional": "Functional",
 
+  "cookies.consent.purpose.statistical": "Statistical",
 
 
   "curation-task.task.checklinks.label":  "Check Links in Metadata",