From 8d23f6ae99b666ac3d8df96ba30501be78c28194 Mon Sep 17 00:00:00 2001
From: Christophe Robillard <christophe.robillard@beta.gouv.fr>
Date: Wed, 4 Nov 2020 17:56:23 +0100
Subject: [PATCH] remove useless redirection for manager sign_in and out

The manager alias for signin causes layout problems
---
 app/controllers/manager/application_controller.rb  | 2 +-
 app/views/manager/application/_navigation.html.erb | 2 +-
 config/routes.rb                                   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/manager/application_controller.rb b/app/controllers/manager/application_controller.rb
index 4d8153b15..90cba7225 100644
--- a/app/controllers/manager/application_controller.rb
+++ b/app/controllers/manager/application_controller.rb
@@ -18,7 +18,7 @@ module Manager
       elsif administration_signed_in?
         redirect_to edit_administration_otp_path
       else
-        redirect_to manager_sign_in_path
+        redirect_to new_administration_session_path
       end
     end
 
diff --git a/app/views/manager/application/_navigation.html.erb b/app/views/manager/application/_navigation.html.erb
index 891658871..eb6ce1ad8 100644
--- a/app/views/manager/application/_navigation.html.erb
+++ b/app/views/manager/application/_navigation.html.erb
@@ -8,7 +8,7 @@ as defined by the routes in the `admin/` namespace
 %>
 
 <nav class="navigation" role="navigation">
-  <%= link_to "Se déconnecter", manager_sign_out_path, method: :delete, class: "navigation__link" %>
+  <%= link_to "Se déconnecter", destroy_administration_session_path, method: :delete, class: "navigation__link" %>
 
   <hr />
 
diff --git a/config/routes.rb b/config/routes.rb
index 8acc97dda..20cac2070 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,8 +3,6 @@ Rails.application.routes.draw do
   # Manager
   #
 
-  get 'manager/sign_in' => 'administrations/sessions#new'
-  delete 'manager/sign_out' => 'administrations/sessions#destroy'
   namespace :manager do
     resources :procedures, only: [:index, :show] do
       post 'whitelist', on: :member
@@ -77,7 +75,9 @@ Rails.application.routes.draw do
   # Authentication
   #
 
-  devise_for :administrations, skip: [:registrations]
+  devise_for :administrations,
+    skip: [:registrations],
+    controllers: { sessions: 'administrations/sessions' }
 
   get 'administrations/edit_otp', to: 'administrations#edit_otp', as: 'edit_administration_otp'
   put 'administrations/enable_otp', to: 'administrations#enable_otp', as: 'enable_administration_otp'