From c8a7bde5e0bfc8655b6b9830b74291eee16859bc Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Thu, 8 Aug 2019 17:33:49 +0200
Subject: [PATCH] Replace instructeur devise methods in app

---
 app/controllers/application_controller.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d71ab7b37..6e91e50b1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -18,6 +18,8 @@ class ApplicationController < ActionController::Base
   before_action :set_active_storage_host
   before_action :setup_tracking
 
+  helper_method :logged_in?, :multiple_devise_profile_connect?, :instructeur_signed_in?, :current_instructeur
+
   def staging_authenticate
     if StagingAuthService.enabled? && !authenticate_with_http_basic { |username, password| StagingAuthService.authenticate(username, password) }
       request_http_basic_authentication
@@ -42,16 +44,12 @@ class ApplicationController < ActionController::Base
     logged_user.present?
   end
 
-  helper_method :logged_in?
-
   def multiple_devise_profile_connect?
     user_signed_in? && instructeur_signed_in? ||
         instructeur_signed_in? && administrateur_signed_in? ||
         user_signed_in? && administrateur_signed_in?
   end
 
-  helper_method :multiple_devise_profile_connect?
-
   def pundit_user
     {
       administrateur: current_administrateur,
@@ -60,6 +58,14 @@ class ApplicationController < ActionController::Base
     }.compact
   end
 
+  def current_instructeur
+    current_user&.instructeur
+  end
+
+  def instructeur_signed_in?
+    user_signed_in? && current_user&.instructeur.present?
+  end
+
   protected
 
   def authenticate_logged_user!
@@ -73,9 +79,7 @@ class ApplicationController < ActionController::Base
   end
 
   def authenticate_instructeur!
-    if instructeur_signed_in?
-      super
-    else
+    if !instructeur_signed_in?
       redirect_to new_user_session_path
     end
   end