Merge pull request #148 from hrtshu/move-mixin-include-to-bottom

Move the inclusion of mixin to the bottom of the controller for customizable error handling
RIPAGlobal · Oct 22, 2024 · f7bf0dd · f7bf0dd
2 parents cf6a159 + 2488878
commit f7bf0dd
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/app/controllers/scimitar/application_controller.rb b/app/controllers/scimitar/application_controller.rb
@@ -9,10 +9,6 @@ class ApplicationController < ActionController::Base
     before_action :add_mandatory_response_headers
     before_action :authenticate
 
-    if Scimitar.engine_configuration.application_controller_mixin
-      include Scimitar.engine_configuration.application_controller_mixin
-    end
-
     # =========================================================================
     # PROTECTED INSTANCE METHODS
     # =========================================================================
@@ -153,5 +149,8 @@ def authenticated?
         return result
       end
 
+    if Scimitar.engine_configuration.application_controller_mixin
+      include Scimitar.engine_configuration.application_controller_mixin
+    end
   end
 end