diff options
| -rw-r--r-- | app/controllers/devise/cas_sessions_controller.rb | 3 | ||||
| -rw-r--r-- | app/policies/application_policy.rb | 2 | ||||
| -rw-r--r-- | config/locales/devise.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/devise.fr.yml | 1 | ||||
| -rw-r--r-- | spec/controllers/devise/cas_sessions_controller_spec.rb | 3 |
5 files changed, 6 insertions, 4 deletions
diff --git a/app/controllers/devise/cas_sessions_controller.rb b/app/controllers/devise/cas_sessions_controller.rb index 399981c16..3b16603b9 100644 --- a/app/controllers/devise/cas_sessions_controller.rb +++ b/app/controllers/devise/cas_sessions_controller.rb @@ -20,8 +20,7 @@ class Devise::CasSessionsController < Devise::SessionsController if LoginPolicy.new(current_user).boiv? redirect_to after_sign_in_path_for(current_user) else - # TODO: Set flash here - redirect_to cas_login_url + redirect_to cas_login_url, flash: {alert: t('devise.sessions.new.unauthorized')} end end diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb index 08752cda3..a863404ae 100644 --- a/app/policies/application_policy.rb +++ b/app/policies/application_policy.rb @@ -8,7 +8,7 @@ class ApplicationPolicy end def archived? - !!referential.try( :archived_at ) + !!referential.try(:archived_at) end def referential diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index af6feed2c..453b094fc 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -13,6 +13,7 @@ validating conformance of data wrt Neptune (French standard NFP 99 506)." introduction2: "The application is deployed in Saas mode and supports :" introduction_item1: "several data exchange formats (Neptune, GTFS, CSV ... Netex coming soon)" introduction_item2: "and also several base map backgrounds (Google, OSM, IGN)." + unauthorized: "Failed to connect due to missing IBOO connection rights" confirmations: new: title: Resend confirmation instructions diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml index 54b2ff680..d3fd6d03e 100644 --- a/config/locales/devise.fr.yml +++ b/config/locales/devise.fr.yml @@ -14,6 +14,7 @@ norme Neptune (NFP 99 506)" introduction2: "Déployé en mode Saas, ce logiciel est ouvert et peut gérer" introduction_item1: "plusieurs formats (Neptune, GTFS, CSV, prochainement Netex)" introduction_item2: "plusieurs fonds cartographiques, notamment IGN, OSM et Google." + unauthorized: "Vous ne pouvez pas vous connecter car vous n'avez pas les permissions pour accéder à IBOO" confirmations: new: title: Renvoyer le mail de confirmation diff --git a/spec/controllers/devise/cas_sessions_controller_spec.rb b/spec/controllers/devise/cas_sessions_controller_spec.rb index 6459e3b3d..8c42f370b 100644 --- a/spec/controllers/devise/cas_sessions_controller_spec.rb +++ b/spec/controllers/devise/cas_sessions_controller_spec.rb @@ -10,8 +10,9 @@ RSpec.describe Devise::CasSessionsController, type: :controller do end context 'user does not have any boiv:.+ permission' do - it 'cannot login and will be redirected to the login page' do + it 'cannot login and will be redirected to the login page, with a corresponding message' do get :service + expect(controller).to set_flash[:alert].to(%r{IBOO}) expect(response).to redirect_to("http://stif-portail-dev.af83.priv/sessions/login?service=http%3A%2F%2Ftest.host%2Fusers%2Fservice") end end |