From c650aeeecef69a122c91cfc35bbf5fd920975cea Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 27 Apr 2026 15:40:37 +0100 Subject: [PATCH 1/7] More error pages Adding more error pages to the prototype for completeness: 1. Error page shown if a deactivated user tries to log in. 2. Error page shown in Keycloak only, if user takes too long to log in and in some other scenarios, like clicking on the back link at the wrong time. --- app/views/errors/deactivated-user.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 app/views/errors/deactivated-user.html diff --git a/app/views/errors/deactivated-user.html b/app/views/errors/deactivated-user.html new file mode 100644 index 00000000..13537959 --- /dev/null +++ b/app/views/errors/deactivated-user.html @@ -0,0 +1,19 @@ +{% extends 'layout.html' %} + +{% set pageName = "Sorry, there is a problem with your account" %} + +{% block content %} +
+
+

{{ pageName }}

+ +

It's likely your account has been deactivated. To get it reactivated, ask a lead administrator.

+ +

If that does not work, contact us.

+ + +
+
+ + +{% endblock %} From 7b46d6b80ec467867d7fa032e31c906bf71fe337 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 27 Apr 2026 15:44:24 +0100 Subject: [PATCH 2/7] Update deactivated-user.html --- app/views/errors/deactivated-user.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/errors/deactivated-user.html b/app/views/errors/deactivated-user.html index 13537959..f9bc8087 100644 --- a/app/views/errors/deactivated-user.html +++ b/app/views/errors/deactivated-user.html @@ -9,7 +9,8 @@

{{ pageName }}

It's likely your account has been deactivated. To get it reactivated, ask a lead administrator.

-

If that does not work, contact us.

+

If that does not work, contact us. + From f395fa81b419fb34ec117f9cc5d4ab4a7a398340 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 27 Apr 2026 15:46:35 +0100 Subject: [PATCH 3/7] Create keycloak-time-out-and-generic-problem --- .../keycloak-time-out-and-generic-problem | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 app/views/errors/keycloak-time-out-and-generic-problem diff --git a/app/views/errors/keycloak-time-out-and-generic-problem b/app/views/errors/keycloak-time-out-and-generic-problem new file mode 100644 index 00000000..20087613 --- /dev/null +++ b/app/views/errors/keycloak-time-out-and-generic-problem @@ -0,0 +1,20 @@ +{% extends 'layout.html' %} + +{% set pageName = "Sorry, there is a problem" %} + +{% block content %} +

+
+

{{ pageName }}

+ +

You'll have to start again.

+ +

Start again

+ + + +
+
+ + +{% endblock %} From 4ddf460796e482da444ee74ebbca2d9d97157b6c Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 27 Apr 2026 15:51:00 +0100 Subject: [PATCH 4/7] Update and rename keycloak-time-out-and-generic-problem to keycloak-timeout --- .../{keycloak-time-out-and-generic-problem => keycloak-timeout} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename app/views/errors/{keycloak-time-out-and-generic-problem => keycloak-timeout} (88%) diff --git a/app/views/errors/keycloak-time-out-and-generic-problem b/app/views/errors/keycloak-timeout similarity index 88% rename from app/views/errors/keycloak-time-out-and-generic-problem rename to app/views/errors/keycloak-timeout index 20087613..9365419c 100644 --- a/app/views/errors/keycloak-time-out-and-generic-problem +++ b/app/views/errors/keycloak-timeout @@ -9,7 +9,7 @@

You'll have to start again.

-

Start again

+

Start again From 699f70fada8460f87c279be7930c396ffc8c8b59 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 27 Apr 2026 15:52:55 +0100 Subject: [PATCH 5/7] Rename keycloak-timeout to keycloak-timeout.html --- app/views/errors/{keycloak-timeout => keycloak-timeout.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/views/errors/{keycloak-timeout => keycloak-timeout.html} (100%) diff --git a/app/views/errors/keycloak-timeout b/app/views/errors/keycloak-timeout.html similarity index 100% rename from app/views/errors/keycloak-timeout rename to app/views/errors/keycloak-timeout.html From 514bdd829be8f4755e66f7523f0bffaa2250ce9d Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 27 Apr 2026 16:10:14 +0100 Subject: [PATCH 6/7] Added 2 more error pages to index.html --- app/views/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/index.html b/app/views/index.html index 25e6fa0d..f35e9caf 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -67,8 +67,10 @@

Error pages

  • Sorry, there is a problem with the service (500 error)
  • Sorry, the service is unavailable (503 error)
  • Rate limited (429 error)
  • +
  • Sorry there is a problem with your account (user deactivated)
  • We cannot find a user with this email (after a successful 3rd party login)
  • You previously logged in a different way (Keycloak error)
  • +
  • Sorry, there is a problem (Keycloak generic error)
  • There is a temporary problem getting the patient's details (PDS API issue)
  • There is still a problem getting the patient's details (ongoing PDS API issue)
  • There is a temporary problem getting [patient name]'s vaccination history (history API issue)
  • From c799cc7e4947c63c7458cf088fcc0e8f964c25d9 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 27 Apr 2026 16:15:36 +0100 Subject: [PATCH 7/7] Update index.html --- app/views/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/index.html b/app/views/index.html index f35e9caf..b0b46014 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -67,10 +67,10 @@

    Error pages

  • Sorry, there is a problem with the service (500 error)
  • Sorry, the service is unavailable (503 error)
  • Rate limited (429 error)
  • -
  • Sorry there is a problem with your account (user deactivated)
  • +
  • Sorry there is a problem with your account (user deactivated)
  • We cannot find a user with this email (after a successful 3rd party login)
  • You previously logged in a different way (Keycloak error)
  • -
  • Sorry, there is a problem (Keycloak generic error)
  • +
  • Sorry, there is a problem (Keycloak generic error)
  • There is a temporary problem getting the patient's details (PDS API issue)
  • There is still a problem getting the patient's details (ongoing PDS API issue)
  • There is a temporary problem getting [patient name]'s vaccination history (history API issue)