Merge pull request #92 from cabinetoffice/NTRNL-511-update-header-wit…

…h-signout-link

Add sign-out link to header

package.json

@@ -46,7 +46,7 @@
     "@aws-sdk/lib-dynamodb": "^3.585.0",
     "@co-digital/api-sdk": "^1.0.6",
     "@co-digital/logging": "^1.0.1",
-    "@co-digital/login": "^1.0.3",
+    "@co-digital/login": "^1.0.4",
     "cookie-parser": "^1.4.6",
     "cookie-session": "^2.1.0",
     "cors": "^2.8.5",

src/config/helmet.ts

@@ -13,7 +13,7 @@ export const configureHelmet = (app: express.Application) => {
             directives: {
                 defaultSrc: ["'self'"],
                 fontSrc: ["'self'", config.CDN_HOST],
-                styleSrc: ["'self'", config.CDN_HOST],
+                styleSrc: ["'self'", "'unsafe-hashes'", "'sha256-6FWIojjtZwiNizws7ImlHjGH3DA5yMh5x4c+/4UVpXk='", config.CDN_HOST],
                 scriptSrc: [
                     "'self'",
                     "'sha256-l1eTVSK8DTnK8+yloud7wZUqFrI0atVo6VlC6PJvYaQ='",

src/views/include/sign-out.html

@@ -0,0 +1,10 @@
+{% if userEmailAuth or userEmail %}
+  <ul class="govuk-list" style="float: right;">
+    <li class="govuk-list govuk-!-margin-top-2">
+      <p class="govuk-body">
+        {{ userEmailAuth | default(userEmail) }} | 
+        <a class="govuk-link govuk-link--no-underline govuk-link--no-visited-state" href={{ ROUTES.SIGN_OUT_URL }}>Sign out</a>
+      </p>
+    </li>
+  </ul>
+{% endif %}

src/views/layout.html

@@ -20,7 +20,7 @@
 {% from "govuk/components/notification-banner/macro.njk"    import govukNotificationBanner %}
 
 {% block head %}
-  <link rel="stylesheet" type="text/css" media="all" href="//{{CDN_HOST}}/stylesheets/govuk-frontend/v3.11.0/govuk-frontend-3.11.0.min.css">
+  <link rel="stylesheet" type="text/css" media="all" href="//{{CDN_HOST}}/govuk-frontend/v5.3.0/govuk-frontend-5.3.0.min.css">
 
   <link rel="SHORTCUT ICON" href="//{{CDN_HOST}}/images/favicon.ico"/>
   <link rel="icon" href="//{{CDN_HOST}}/images/favicon.ico" type="image/x-icon"/>
@@ -44,6 +44,7 @@
 
 {% block beforeContent %}
   {% include "include/phase-banner.html" %}
+  {% include "include/sign-out.html" %}
   {% block backLink %}
   {% endblock %}
 {% endblock %}
@@ -86,6 +87,6 @@
   {% if FEATURE_FLAG_ENABLE_COOKIE_BANNER == "true" %}
     <script src="/assets/javascripts/cookies.js"></script>
   {% endif %}
-  <script src="//{{CDN_HOST}}/javascripts/govuk-frontend/v3.11.0/govuk-frontend-3.11.0.min.js"></script>
+  <script src="//{{CDN_HOST}}/govuk-frontend/v5.3.0/govuk-frontend-5.3.0.min.js"></script>
   <script>window.GOVUKFrontend.initAll()</script>
 {% endblock %}

test/mock/data.ts

@@ -107,7 +107,7 @@ export const MOCK_HELMET_VALUE = {
         directives: {
             defaultSrc: ["'self'"],
             fontSrc: ["'self'", config.CDN_HOST],
-            styleSrc: ["'self'", config.CDN_HOST],
+            styleSrc: ["'self'", "'unsafe-hashes'", "'sha256-6FWIojjtZwiNizws7ImlHjGH3DA5yMh5x4c+/4UVpXk='", config.CDN_HOST],
             scriptSrc: [
                 "'self'",
                 // Hash of the inline scripts respectively for: