From d063c3a5b90a2411b391b7b44f5bba110483a090 Mon Sep 17 00:00:00 2001 From: erin claudio Date: Mon, 10 Apr 2023 18:24:29 -0400 Subject: [PATCH 01/31] Update with placeholder code --- app/javascript/src/session_timeout_poller.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/javascript/src/session_timeout_poller.js b/app/javascript/src/session_timeout_poller.js index 155b27819d..83b96db9c7 100644 --- a/app/javascript/src/session_timeout_poller.js +++ b/app/javascript/src/session_timeout_poller.js @@ -2,6 +2,7 @@ const deviseTimeoutInMinutes = 180 const twoMinuteWarning = deviseTimeoutInMinutes - 2 const totalTimerAmount = twoMinuteWarning * 60 * 1000 const deviseTimeoutInMilliseconds = deviseTimeoutInMinutes * 60 * 1000 +// config.timeout_in = 3.hours const startTime = new Date().getTime() let lastTime = new Date().getTime() let currentTime From 175c732fa57126956be0606d77817be136f8ac7c Mon Sep 17 00:00:00 2001 From: Erin Claudio Date: Wed, 28 Jun 2023 15:14:45 -0400 Subject: [PATCH 02/31] Update timeout_duration now in view, roughdraft --- app/controllers/application_controller.rb | 5 +++++ app/views/layouts/application.html.erb | 1 + 2 files changed, 6 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ea3142cdb1..ff167b0a38 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,6 +7,7 @@ class ApplicationController < ActionController::Base before_action :store_user_location!, if: :storable_location? before_action :authenticate_user! before_action :set_current_user + before_action :set_timeout_duration before_action :set_current_organization after_action :verify_authorized, except: :index, unless: :devise_controller? # after_action :verify_policy_scoped, only: :index @@ -101,6 +102,10 @@ def set_current_user RequestStore.store[:current_user] = current_user end + def set_timeout_duration + @timeout_duration = current_user.timeout_in + end + def set_current_organization RequestStore.store[:current_organization] = current_organization end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 55a69148a5..a51a5d6bf2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -29,6 +29,7 @@ +

<%= @timeout_duration %>