Revert "Revert "Merge branch 'main' of https://github.com/nhsconnect/…

…nhslogin""

This reverts commit 1de6235.

.github/workflows/eleventy-build.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: '13.5.0'
+          node-version: '16.x'
       - name: Install npm packages
         run: npm ci
       - name: Build Deployment Package
@@ -22,4 +22,4 @@ jobs:
         env:
           PUBLISH_DIR: _site
           PUBLISH_BRANCH: gh-pages
-          PERSONAL_TOKEN: ${{ secrets.PERSONAL_TOKEN  }}
+          PERSONAL_TOKEN: ${{ secrets.GITHUB_TOKEN  }}

src/_includes/base.njk

@@ -64,7 +64,7 @@
 
      <div class="app-edit-instructions">
               <hr />
-              <p>Edit <a href="https://github.com/nhsconnect/nhslogin/blob/main/{{page.inputPath}}">this page</a> on GitHub
+              <p><a href="https://github.com/nhsconnect/nhslogin/blob/main/{{page.inputPath}}">Edit this page</a> on GitHub
               </p>
       </div>
 

src/_includes/mobile-menu.njk

@@ -242,6 +242,18 @@
         </a>
       </li>
 
+       <li class="nhsuk-header__navigation-item">
+        <a class="nhsuk-header__navigation-link" href="/nhslogin/multiple-redirect-uris">
+          Multiple redirect URIs
+          <svg class="nhsuk-icon nhsuk-icon__chevron-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
+            aria-hidden="true">
+            <path
+              d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z">
+            </path>
+          </svg>
+        </a>
+      </li>
+
       <li class="nhsuk-header__navigation-item">
         <a class="nhsuk-header__navigation-link" href="/nhslogin/step-up-p5-p9">
           Medium (P5) to high (P9) verification step-up journey
@@ -334,4 +346,4 @@
 
     </ul>
   </div>
-</nav>
+</nav>

src/_includes/sidebar.njk

@@ -24,11 +24,9 @@
                   <li class="app-side-nav__item">
                     <a class="app-side-nav__link" href="nhslogin/button-guidance">Adding the NHS login button to your service</a>
                   </li>
-                  <!-- 
                   <li class="app-side-nav__item">
-                    <a class="app-side-nav__link" href="nhslogin/sharing-users-information">Sharing a user's NHS login information with your service</a>
+                    <a class="app-side-nav__link" href="nhslogin/no-consent-guidance">Sharing a user's NHS login information with your service</a>
                   </li>
-                  -->
                 </ul>
                 <h2 class="app-side-nav__heading">Testing NHS login</h2>
                 <ul class="nhsuk-list app-side-nav__list">
@@ -83,6 +81,9 @@
                   <li class="app-side-nav__item">
                     <a class="app-side-nav__link" href="nhslogin/step-up-p5-p9">Medium (P5) to high (P9) verification step-up journey</a>
                   </li>
+                  <li class="app-side-nav__item">
+                    <a class="app-side-nav__link" href="nhslogin/multiple-redirect-uris">Multiple redirect URIs</a>
+                  </li>
                   <li class="app-side-nav__item">
                     <a class="app-side-nav__link" href="nhslogin/linking-to-settings">NHS login user settings</a>
                   </li>

src/compare-environments.md

@@ -3,81 +3,7 @@ layout: base.njk
 title: Compare NHS login environments
 ---
 
-Compare and understand the differences and transitions between our 4 different environments.
-
----
-
-
-
-<div id="mock" class="design-example">
-
-<h2>Mock environment</h2>
-<p>We have developed a lightweight <a href="https://oidc.mock.signin.nhs.uk/client" target="_blank">mock environment</a> that is a representation of our OIDC endpoints. The mock is entirely self-service and requires no registration.</p>
-
-<div class="code-snippet">
-          <ul class="app-tabs" role="tablist">
-              <li class="app-tabs__item app-tabs__item--current" role="presentation" data-index="ex-1">
-                <a href="javascript:void(0);" role="tab" aria-controls="default-example" data-track="tab-html" aria-selected="true">
-                Purpose
-                </a>
-              </li>
-              <li class="app-tabs__item" role="presentation" data-index="ex-2">
-                <a href="javascript:void(0);" role="tab" aria-controls="default-example" data-track="tab-html" aria-selected="true">
-                Requirements
-                </a>
-              </li>
-            <li class="app-tabs__item" role="presentation" data-index="ex-3">
-                <a href="javascript:void(0);" role="tab" aria-controls="default-example" data-track="tab-html" aria-selected="true">
-                Restrictions
-                </a>
-              </li>
-          </ul>
-        <div class="app-tabs__container js-tabs__container" id="default-example" role="tabpanel">
-              <div class="app-tabs__item app-tabs__item--mobile" role="presentation" data-index="ex-1">
-                <a href="" role="tab" aria-controls="default-example" data-track="tab-html" aria-selected="true">
-                  Purpose
-                </a>
-              </div>
-            <div class="code-snippet__preformatted" data-index="ex-1">
-              <div class="app-code-snippet__macro"></div>
-              <div class="app-code-snippet__container">
-              <ul>
-              <li>Explore the NHS login service and complete a proof of concept</li>
-              </div>
-            </div>
-              <div class="app-tabs__item app-tabs__item--mobile" role="presentation" data-index="ex-2">
-                <a href="" role="tab" aria-controls="default-example" data-track="tab-html" aria-selected="true">
-                Requirements
-                </a>
-              </div>
-            <div class="code-snippet__preformatted js-hidden" data-index="ex-2">
-                <div class="code-snippet__macro">
-                </div>
-              <div class="app-code-snippet__macro"></div>
-              <div class="app-code-snippet__container">
-              <ul>
-              <li>ClientID and registered public key</li>
-                </ul>
-              </div>
-            </div>
-            <div class="app-tabs__item app-tabs__item--mobile" role="presentation" data-index="ex-3">
-                <a href="" role="tab" aria-controls="default-example" data-track="tab-html" aria-selected="true">
-                  Restrictions
-                </a>
-              </div>
-            <div class="code-snippet__preformatted js-hidden" data-index="ex-3">
-                <div class="code-snippet__macro">
-                </div>
-              <div class="app-code-snippet__macro"></div>
-              <div class="app-code-snippet__container">
-              <ul>
-              <li>Only a simple mock environment</li>
-                </ul>
-              </div>
-            </div>
-        </div>
-  </div>
-</div>
+Compare and understand the differences and transitions between our 3 different environments.
 
 ---
 

src/example-no-consent-content-other.md

@@ -0,0 +1,15 @@
+---
+layout: base-example.njk
+title: NHS login button for NHS services that use the Design System
+---
+
+<h1>You cannot continue without sharing your information</h1>
+
+<p>[Service name] needs your NHS login information to verify your identity.</p>
+
+<p>Dynamic content.</p>
+
+<p>If you need medical help, go to <a href="https://111.nhs.uk/">111.nhs.uk</a> or call <a href="tel:111">111</a> or your GP.</p>
+
+<p>Call <a href="tel:999">999</a> if it's a life-threatening emergency.</p>
+

src/example-no-consent-content-wayfinder.md

@@ -0,0 +1,13 @@
+---
+layout: base-example.njk
+title: NHS login button for NHS services that use the Design System
+---
+
+<h1>You cannot continue without sharing your information</h1>
+
+<p>The service provider needs your NHS login information to verify your identity.</p>
+
+<p>If you need medical help, go to <a href="https://111.nhs.uk/">111.nhs.uk</a> or call <a href="tel:111">111</a> or your GP.</p>
+
+<p>Call <a href="tel:999">999</a> if it's a life-threatening emergency.</p>
+

src/fido.md

@@ -2,13 +2,16 @@
 layout: base.njk
 title: Biometric FIDO Authentication
 ---
+<div class="nhsuk-warning-callout">
+  <h3 class="nhsuk-warning-callout__label">
+    Important<span class="nhsuk-u-visually-hidden">:</span>
+  </h3>
+  <p>We are currently adding FIDO2 authentication to NHS login.</p>
+  <p>You should avoid adding our existing biometric capabilities to your service as FIDO2 will replace this.</p>
+</div>
 
-Partners interested in using biometric authentication for NHS login, will need a FIDO client that works with our FIDO server.
+<p class="nhsuk-body">FIDO2 will offer a secure method of authentication, allowing users to access NHS services by using biometrics, PIN, or security keys instead of traditional passwords.
 
-[NHS client code for Android](https://github.com/nhsconnect/nhsapp-fido-client-android)
+If you're interested in adding FIDO2 authentication and would like to be involved in our testing, contact us via [Slack](https://nhs-login-support-slack-invite.herokuapp.com) or email <a href="mailto:[email protected]">[email protected]</a>.
 
-[NHS client code for iOS](https://github.com/nhsconnect/nhsapp-fido-client-ios)
-
-Partners can use this code to install their own client or reference it to create their own FIDO client.
-
-Find out more about how we use FIDO by reading the [external interface specification](https://nhsconnect.github.io/nhslogin/interface-spec-doc/) (EIS).
+You can find out more about how we currently use FIDO by reading the [external interface specification](https://nhsconnect.github.io/nhslogin/interface-spec-doc/) (EIS). </p>

src/multiple-redirect-uris.md

@@ -0,0 +1,12 @@
+---
+layout: base.njk
+title: Multiple redirect URIs
+---
+
+We advise partners who have a need for more than 10 (multiple) redirect URIs to use a “state” parameter to populate an identifier. This will help to identify different redirections.
+
+As per the [EIS documentation](https://nhsconnect.github.io/nhslogin/interface-spec-doc/) “state” is an opaque value used to maintain state between the request and the call back.
+
+The value in the “state” parameter will be returned to the partner as-it-is in the authentication response.
+
+NHS login can only support up to 10 re-direct URIs. If you need over 10, you need to implement the "state" parameter and, based on the value returned, add redirects accordingly. This keeps the partner service loosely coupled with NHS login and allows partners to effectively manage operational changes.