ER-988: Remove timeout modal functionality (#1151)

* Remove timeout modal functionality Retire these locales: timeout.title timeout.heading timeout.body timeout.noscript * Configure using env vars and hide flash message
DFE-Digital · May 20, 2024 · 7c1879e · 7c1879e
1 parent 6dc8dd7
commit 7c1879e
Show file tree

Hide file tree

Showing 30 changed files with 43 additions and 928 deletions.
diff --git a/.env.example b/.env.example
@@ -49,12 +49,11 @@ POSTGRES_PASSWORD=
 # user research
 FEEDBACK_URL=
 
-# logout
-TIMEOUT_MINUTES=360
-TIMEOUT_WARNING_MINUTES=5
 
-# Time interval, in minutes, to unlock the account if :time is enabled as unlock_strategy
+# Account unlock wait duration if :time is enabled
 UNLOCK_IN_MINUTES=
+# Account session expiration aligned to GovOne by default
+TIMEOUT_IN_MINUTES=
 
 # user acceptance tests
 BASE_URL=

diff --git a/README.md b/README.md
@@ -312,16 +312,6 @@ User [service accounts](https://cloud.google.com/iam/docs/service-accounts) can
 - `gsutil -m cp -r "gs://eyfs-data-dashboard-live/eventsdata" "gs://eyfs-data-dashboard-live/useranswers" .` (export folders recursively)
 
 
----
-
-## User experience
-
-Session timeout functionality:
-
-- default timeout period is 25 minutes
-- default timeout warning appears after 5 minutes
-- screen readers announce every time the timeout refreshes every 15 secs
-
 ---
 
 ## Hotjar

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -30,7 +30,6 @@ $light-blue: tint($department-for-education-websafe, 90%);
 @import 'interruption';
 @import 'quote';
 @import 'icons';
-@import 'modal';
 @import 'autocomplete';
 @import 'assets-page';
 
@@ -192,12 +191,6 @@ ul>li>ul>li {
   background: #f3f2f1;
 }
 
-#js-timeout-warning:focus {
-  outline: 3px solid #ffdd00;
-  outline-offset: 0;
-  box-shadow: inset 0 0 0 2px;
-}
-
 .govuk-footer__copyright-logo {
   display: none;
 }

diff --git a/app/assets/stylesheets/modal.scss b/app/assets/stylesheets/modal.scss
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -8,7 +8,6 @@ class ApplicationController < ActionController::Base
                 :prepare_cms
 
   helper_method :current_user,
-                :timeout_timer,
                 :debug?
 
   default_form_builder ::FormBuilder
@@ -58,13 +57,6 @@ def debug?
     Rails.application.debug? && !bot?
   end
 
-  def timeout_timer
-    timeout_controller = TimeoutController.new
-    timeout_controller.request = request
-    timeout_controller.response = response
-    timeout_controller.send(:ttl_to_timeout)
-  end
-
 private
 
   # @return [Boolean]

diff --git a/app/controllers/timeout_controller.rb b/app/controllers/timeout_controller.rb
diff --git a/app/helpers/timeout_helper.rb b/app/helpers/timeout_helper.rb
diff --git a/app/javascript/application.js b/app/javascript/application.js
@@ -1,9 +1,7 @@
-import "@hotwired/turbo-rails";
-import "@fortawesome/fontawesome-free/js/all";
+import '@hotwired/turbo-rails';
+import '@fortawesome/fontawesome-free/js/all';
 
-import TimeoutWarning from "./timeout-warning";
-
-import "./controllers";
+import './controllers';
 
 import { initAll } from "govuk-frontend";
 
@@ -16,19 +14,8 @@ function nodeListForEach (nodes, callback) {
   }
 }
 
-
 /*
-Govuk Accordion component suffers from lag without the turbo listener
-*/
-document.addEventListener("turbo:load", function() {
+document.addEventListener('turbo:load', function() {
   initAll();
-
-  /*
-  timeout functionality
-  */
-  var $timeoutWarnings = document.querySelectorAll('[data-module="govuk-timeout-warning"]')
-
-  nodeListForEach($timeoutWarnings, function ($timeoutWarning) {
-    new TimeoutWarning($timeoutWarning).init()
-  });
 })
+*/
diff --git a/app/javascript/controllers/application.js b/app/javascript/controllers/application.js
@@ -1,4 +1,4 @@
-import { Application } from "@hotwired/stimulus"
+import { Application } from '@hotwired/stimulus'
 import Reveal from 'stimulus-reveal-controller'
 
 const application = Application.start()
@@ -7,4 +7,4 @@ application.register('reveal', Reveal)
 
 application.debug = true
 window.Stimulus = application
-export { application }
+export { application }
diff --git a/app/javascript/controllers/autocomplete_controller.js b/app/javascript/controllers/autocomplete_controller.js
@@ -1,4 +1,4 @@
-import { Controller } from "@hotwired/stimulus"
+import { Controller } from '@hotwired/stimulus'
 import accessibleAutocomplete from 'accessible-autocomplete'
 
 // Connects to data-controller="autocomplete"

diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
@@ -2,7 +2,7 @@
 // Run that command whenever you add a new controller or create them with
 // ./bin/rails generate stimulus controllerName
 
-import { application } from "./application"
+import { application } from './application'
 
-import AutocompleteController from "./autocomplete_controller"
-application.register("autocomplete", AutocompleteController)
+import AutocompleteController from './autocomplete_controller'
+application.register('autocomplete', AutocompleteController)