From fcb5ce931453fad40664f36dcb242ef6a2ab46f2 Mon Sep 17 00:00:00 2001
From: julianajlk <julianajlk@gmail.com>
Date: Fri, 20 Dec 2024 10:55:27 -0500
Subject: [PATCH 1/4] fix: Add Cohesion onetrust and useBeacon configs

---
 public/index.html | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index c493ff0c1..33189dab6 100755
--- a/public/index.html
+++ b/public/index.html
@@ -40,7 +40,16 @@
               domainWhitelist: <%= htmlWebpackPlugin?.options?.cohesionConfig?.tagularDomainWhitelist %>,
               apiVersion: 'v2/t',
               multiparty: true,
-          }
+              useBeacon: true,
+          },
+          consent: {
+            onetrust: {
+              enabled: true,
+              optIn: true,
+            },
+            required: true,
+            domain: '<%= htmlWebpackPlugin?.options?.cohesionConfig?.tagularCookieDomain %>',
+          },
       })
     </script>
     <% } %>

From 95b972920c69f3034fdab1126e0206dba3f1b3a5 Mon Sep 17 00:00:00 2001
From: julianajlk <julianajlk@gmail.com>
Date: Fri, 20 Dec 2024 10:56:06 -0500
Subject: [PATCH 2/4] chore: Update allowlist security advisories

---
 audit-ci.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/audit-ci.json b/audit-ci.json
index 7edb4b42a..0a0249699 100644
--- a/audit-ci.json
+++ b/audit-ci.json
@@ -8,12 +8,11 @@
         "GHSA-952p-6rrq-rcjv",
         "GHSA-4vvj-4cpr-p986",
         "GHSA-qwcr-r2fm-qrc7",
-        "GHSA-qw6h-vgh9-j6wx",
         "GHSA-9wv6-86v2-598j",
-        "GHSA-m6fv-jmcg-4jfg",
-        "GHSA-cm22-4g7w-348p",
         "GHSA-c7qv-q95q-8v27",
-        "GHSA-3xgq-45jj-v275"
+        "GHSA-3xgq-45jj-v275",
+        "GHSA-mwcw-c2x4-8c55",
+        "GHSA-rhx6-c78j-4q9w"
     ],
     "moderate": true
 }

From 3874259d727e69d0d0eabe45486d1c0034799b2e Mon Sep 17 00:00:00 2001
From: julianajlk <julianajlk@gmail.com>
Date: Fri, 20 Dec 2024 11:24:37 -0500
Subject: [PATCH 3/4] fix: Modify domain to include period for subdomains

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 33189dab6..0c9317667 100755
--- a/public/index.html
+++ b/public/index.html
@@ -48,7 +48,7 @@
               optIn: true,
             },
             required: true,
-            domain: '<%= htmlWebpackPlugin?.options?.cohesionConfig?.tagularCookieDomain %>',
+            domain: '<%= "." + (htmlWebpackPlugin?.options?.cohesionConfig?.tagularCookieDomain || "") %>',
           },
       })
     </script>

From 6956652397581238acd08738a8097b5da2aaf4cb Mon Sep 17 00:00:00 2001
From: julianajlk <julianajlk@gmail.com>
Date: Fri, 20 Dec 2024 12:51:09 -0500
Subject: [PATCH 4/4] fix: Check for truthy for tagularCookieDomain before
 adding leading period

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 0c9317667..fd74fa639 100755
--- a/public/index.html
+++ b/public/index.html
@@ -48,7 +48,7 @@
               optIn: true,
             },
             required: true,
-            domain: '<%= "." + (htmlWebpackPlugin?.options?.cohesionConfig?.tagularCookieDomain || "") %>',
+            domain: '<%= htmlWebpackPlugin?.options?.cohesionConfig?.tagularCookieDomain ? "." + htmlWebpackPlugin?.options?.cohesionConfig?.tagularCookieDomain : ".edx.org" %>',
           },
       })
     </script>