diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 52deedb..50b7041 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -262,4 +262,11 @@ # When using OmniAuth, Devise cannot automatically set OmniAuth path, # so you need to do it manually. For the users scope, it would be: # config.omniauth_path_prefix = '/my_engine/users/auth' + + # Configure the system to redirect to the home page after a session timeout + require "custom_failure_app" + + config.warden do |manager| + manager.failure_app = CustomFailureApp + end end diff --git a/config/locales/de.yml b/config/locales/de.yml index 8750ba2..4f85bdd 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -133,6 +133,9 @@ option_order_label: "Reihenfolge" option_text_label: "Text" option_default_label: "Vorgabe" + api_privileges: 'API Berechtigungen?' + edit_user_privileges: 'Bearbeiten Benutzerberechtigungen' + guidance: guidance_list: "Liste der Hilfestellungen" text_label: "Text" @@ -297,7 +300,6 @@ institution_sign_in_link: "Oder melden Sie sich mit den Zugangsdaten Ihres Instituts an" institution_sign_in: "" - user_name: "E-Mail-Adresse" email: "E-Mail" org_not_listed: "Meine Organisation ist nicht in der Auflistung." diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 18b6c0b..0b09d05 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -140,6 +140,9 @@ option_order_label: "Classer" option_text_label: "Texte" option_default_label: "Défaut" + api_privileges: 'Privilèges de l'API?' + edit_user_privileges: 'Privilèges Modifier l'utilisateur' + guidance: guidance_list: "Liste des directives" text_label: "Texte" @@ -300,7 +303,6 @@ signed_in: "Connecté en tant que " institution_sign_in_link: "Ou encore, connectez-vous avec l'authentifiant de votre établissement" institution_sign_in: "Authentification à l'aide du compte institutionnel bientôt disponible!" - user_name: "Adresse électronique" email: "Courriel" diff --git a/lib/custom_failure.rb b/lib/custom_failure.rb index fe28aa9..e8fbb7d 100644 --- a/lib/custom_failure.rb +++ b/lib/custom_failure.rb @@ -1,13 +1,12 @@ class CustomFailure < Devise::FailureApp - def redirect_url - root_path - end - - def respond - if http_auth? - http_auth + def redirect + store_location! + message = warden.message || warden_options[:message] + + if message == :timeout + redirect_to root_path else - redirect + super end end end \ No newline at end of file