Merge 2de64e4 into 341d871

nhsuk · Mar 15, 2019 · 0746cd6 · 0746cd6
2 parents 341d871 + 2de64e4
commit 0746cd6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -52,6 +52,7 @@ environment.
 | :--------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------- | :------------------------ | :--------- |
 | `ADOBE_TRACKING_URL`               | [Adobe Analytics](https://www.adobe.com/analytics/adobe-analytics.html) Dynamic Tag Management URL                                                         |                           | No         |
 | `BASIC_AUTH`                       | An MD5 encrypted [htpasswd](https://httpd.apache.org/docs/2.4/misc/password_encryptions.html)                                                              | test:test                 | No         |
+| `COOKIEBOT_SCRIPT_URL`             | The URL for the in-house implementation of Cookiebot                                                                                                       | //assets.nhs.uk/scripts/cookie-consent.js |            |
 | `HOTJAR_ANALYTICS_TRACKING_ID`     | [Hotjar](https://www.hotjar.com/) tracking id                                                                                                              |                           | No         |
 | `GOOGLE_ANALYTICS_TRACKING_ID`     | [Google Analytics](https://www.google.co.uk/analytics) property id                                                                                         |                           | No         |
 | `LOG_LEVEL`                        | Numeric [log level](https://github.com/trentm/node-bunyan#levels)                                                                                          | Depends on `NODE_ENV`     | No         |

diff --git a/app/middleware/locals.js b/app/middleware/locals.js
@@ -7,6 +7,8 @@ module.exports = config => (req, res, next) => {
   res.locals.GOOGLE_ANALYTICS_TRACKING_ID = config.analytics.googleAnalyticsId;
   res.locals.HOTJAR_ANALYTICS_TRACKING_ID = config.analytics.hotjarId;
 
+  res.locals.COOKIEBOT_SCRIPT_URL = config.cookiebot.scriptUrl;
+
   res.locals.assetsUrl = req.app.locals.assetsUrl;
   res.locals.siteRoot = req.app.locals.siteRoot;
   res.locals.digitalData = digitalData(req);

diff --git a/app/views/includes/analytics.nunjucks b/app/views/includes/analytics.nunjucks
@@ -1,5 +1,5 @@
 {% if GOOGLE_ANALYTICS_TRACKING_ID %}
-  <script>
+  <script type="text/plain" data-cookieconsent="marketing,statistics">
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)

diff --git a/app/views/includes/foot.nunjucks b/app/views/includes/foot.nunjucks
@@ -6,3 +6,5 @@
 <!--<![endif]-->
 <script src="{{ siteRoot }}/js/vendor/typeahead.bundle-1.2.1.min.js"></script>
 <script src="{{ siteRoot }}/js/app.js"></script>
+
+{% include 'includes/analytics.nunjucks' %}
diff --git a/app/views/layout.nunjucks b/app/views/layout.nunjucks
@@ -27,9 +27,11 @@
 
     <!--[if lt IE 9]><script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script><![endif]-->
 
+    <script src="{{ COOKIEBOT_SCRIPT_URL }}" type="text/javascript" data-cookieconsent="necessary" async></script>
+
     {% if HOTJAR_ANALYTICS_TRACKING_ID %}
        <!-- rational for this code being in head: https://docs.hotjar.com/v1.0/docs/manual -->
-      <script>
+      <script type="text/plain" data-cookieconsent="statistics">
         (function(h,o,t,j,a,r){
         h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
         h._hjSettings={hjid:{{ HOTJAR_ANALYTICS_TRACKING_ID }},hjsv:5};
@@ -44,7 +46,7 @@
     {% block meta %}{% endblock %}
 
     {% if ADOBE_TRACKING_URL %}
-      <script src="{{ ADOBE_TRACKING_URL }}" async></script>
+      <script type="text/plain" data-cookieconsent="statistics" src="{{ ADOBE_TRACKING_URL }}" async></script>
     {% endif %}
 
     {% include "includes/digitalData.nunjucks" %}

diff --git a/config/config.js b/config/config.js
@@ -14,6 +14,9 @@ module.exports = {
     port: process.env.PORT || 3000,
     root: rootPath,
   },
+  cookiebot: {
+    scriptUrl: process.env.COOKIEBOT_SCRIPT_URL || '//assets.nhs.uk/scripts/cookie-consent.js',
+  },
   search: {
     apiKey: process.env.SEARCH_API_KEY,
     host: process.env.SEARCH_API_HOST || 'api.nhs.uk',

diff --git a/rancher-config/docker-compose.yml b/rancher-config/docker-compose.yml
@@ -6,6 +6,7 @@ services:
     image: "nhsuk/sexual-health-service-finder:${DOCKER_IMAGE_TAG}"
     environment:
       ADOBE_TRACKING_URL: ${ADOBE_TRACKING_URL}
+      COOKIEBOT_SCRIPT_URL: ${COOKIEBOT_SCRIPT_URL}
       GOOGLE_ANALYTICS_TRACKING_ID: ${GOOGLE_ANALYTICS_TRACKING_ID}
       HOTJAR_ANALYTICS_TRACKING_ID: ${HOTJAR_ANALYTICS_TRACKING_ID}
       NODE_ENV: production