thecore_ui_commons 3.1.5 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7c120eedf4dca232e5d22b6b87d71f7eddad81af8e1611dd5f190f6339be78d
-  data.tar.gz: d567304745fff1ad9f6387104b0d74693eb6364ed55dd54d65085ecc49e835eb
+  metadata.gz: fd6232595aa3e317fbfe577e1e4abddcdac5692bf90d09cf1c71dea6ce5ef3b5
+  data.tar.gz: 06a943dbb148675096b94c9845ae15db2b78f012028e08ea2c7b95ecb46a0f7e
 SHA512:
-  metadata.gz: b1c795e77b22556c32f79aba53590601a0863ec37006c3f1e96ae82a57585f078bd26980c033ed93252005824cdc885044ebba44882dbd1ae9e679d2ac58bcff
-  data.tar.gz: 8b5ea7538e46a1103157149e6f48c62e7c58cae08e8ff230da8f575dbcaf8b0c4499c57e74037bb29520163421de0cbdb363c4f93bdeee56fa8b9652083efd16
+  metadata.gz: f5ee92273720eacc56372b96dd4ef1778b176a77fe7b2f6cb64d4bbc1eba98ad7a1b20dba50f7a940948130598795421591a01fee2ba100f6c442bd169b502fc
+  data.tar.gz: 5623c5a81ae20cfd042c8143cc58ca5239418620dd60e83c6c84a41daef38709fcf85481fcbe22e350af4b25b19192923dfd2783d30bb76e914d523de72805c1

data/config/initializers/after_initialize.rb

@@ -1,8 +1,7 @@
 Rails.application.configure do
     config.after_initialize do
         # Controllers
-        ApplicationController.send :include, ConcernApplicationController
-        RailsAdmin::ApplicationController.send :include, ConcernApplicationController
+        ApplicationController.send(:include, ConcernCommonApplicationController)
         User.send(:include, ThecoreUiCommonsUserConcern)
     end
 end

data/config/initializers/concern_common_application_controller.rb

@@ -0,0 +1,47 @@
+Rails.logger.debug "ApplicationController Concern from ThecoreUiCommons"
+require 'active_support/concern'
+
+module ConcernCommonApplicationController
+  extend ActiveSupport::Concern
+  
+  included do
+    # protect_from_forgery prepend: true
+    protect_from_forgery except: :sign_in,  prepend: true
+    
+    rescue_from CanCan::AccessDenied do |exception| 
+      redirect_to main_app.root_url, alert: exception.message 
+    end
+    
+    before_action :store_user_location!, if: :storable_location?
+    before_action :reject_locked!, if: :devise_controller?
+    
+    # Auto-sign out locked users
+    def reject_locked!
+      if !current_user.blank? && current_user.locked?
+        Rails.logger.debug " - Cleaning session"
+        sign_out current_user
+        user_session = nil
+        current_user = nil
+        flash[:alert] = "Your account is locked."
+        flash[:notice] = nil
+        redirect_to root_url
+      end
+    end
+    
+    # Its important that the location is NOT stored if:
+    # - The request method is not GET (non idempotent)
+    # - The request is handled by a Devise controller such as 
+    #     Devise::SessionsController as that could cause an 
+    #     infinite redirect loop.
+    # - The request is an Ajax request as this can lead to very unexpected 
+    #     behaviour.
+    def storable_location?
+      request.get? && is_navigational_format? && !devise_controller? && !request.xhr?
+    end
+    
+    def store_user_location!
+      # :user is the scope we are authenticating
+      store_location_for(:user, request.fullpath)
+    end
+  end
+end

data/lib/thecore_ui_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreUiCommons
-  VERSION = "3.1.5".freeze
+  VERSION = "3.1.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ui_commons
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.7
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons
@@ -131,7 +131,7 @@ files:
 - config/initializers/after_initialize.rb
 - config/initializers/application_config.rb
 - config/initializers/assets.rb
-- config/initializers/concern_application_controller.rb
+- config/initializers/concern_common_application_controller.rb
 - config/initializers/concern_user.rb
 - config/initializers/helper_charts.rb
 - config/locales/en.ra_settings.yml

data/config/initializers/concern_application_controller.rb

@@ -1,81 +0,0 @@
-puts "ApplicationController Concern from ThecoreUiCommons"
-require 'active_support/concern'
-
-module ConcernApplicationController
-  extend ActiveSupport::Concern
-  
-  included do
-    # protect_from_forgery prepend: true
-    protect_from_forgery except: :sign_in,  prepend: true
-    
-    rescue_from CanCan::AccessDenied do |exception| 
-      redirect_to main_app.root_url, alert: exception.message 
-    end
-    
-    before_action :store_user_location!, if: :storable_location?
-    before_action :reject_locked!, if: :devise_controller?
-    
-    # Redirects on successful sign in
-    def after_sign_in_path_for resource
-      root_actions = RailsAdmin::Config::Actions.all(:root).select {|action| can? action.action_name, :all }.collect(&:action_name)
-      
-      # Default root action as landing page: the first to which I have authorization to read
-      action = root_actions.first
-      puts "after_sign_in_path_for action: #{action}"
-      # Otherwise, if I set a Manual override for landing actions in config, I can test if I'm authorized to see it
-      override_landing_page = Settings.ns(:main).after_sign_in_redirect_to_root_action
-      action = override_landing_page.to_sym if !override_landing_page.blank? && root_actions.include?(override_landing_page.to_sym)
-      
-      # If I ask for a specific page, Let's try to go back there if I need to login or re-login
-      # This takes precedence on automatic computed action
-      stored_location = stored_location_for(resource)
-      puts "after_sign_in_path_for stored_location: #{stored_location}"
-      if !stored_location.blank? && can?(resource, :all)
-        # Go to the latest navigated page
-        puts "after_sign_in_path_for Redirect to stored_location"
-        return stored_location
-      elsif action
-        path = rails_admin.send("#{action}_path").sub("#{ENV['RAILS_RELATIVE_URL_ROOT']}#{ENV['RAILS_RELATIVE_URL_ROOT']}", "#{ENV['RAILS_RELATIVE_URL_ROOT']}")
-        puts "after_sign_in_path_for Redirect to action #{path}"
-        return path
-      else
-        puts "after_sign_in_path_for ERROR! Signing out user :-("
-        sign_out current_user
-        user_session = nil
-        current_user = nil
-        flash[:alert] = "Your user is not authorized to access any page."
-        flash[:notice] = nil
-        return root_path
-      end
-    end
-    
-    # Auto-sign out locked users
-    def reject_locked!
-      if !current_user.blank? && current_user.locked?
-        puts " - Cleaning session"
-        sign_out current_user
-        user_session = nil
-        current_user = nil
-        flash[:alert] = "Your account is locked."
-        flash[:notice] = nil
-        redirect_to root_url
-      end
-    end
-    
-    # Its important that the location is NOT stored if:
-    # - The request method is not GET (non idempotent)
-    # - The request is handled by a Devise controller such as 
-    #     Devise::SessionsController as that could cause an 
-    #     infinite redirect loop.
-    # - The request is an Ajax request as this can lead to very unexpected 
-    #     behaviour.
-    def storable_location?
-      request.get? && is_navigational_format? && !devise_controller? && !request.xhr?
-    end
-    
-    def store_user_location!
-      # :user is the scope we are authenticating
-      store_location_for(:user, request.fullpath)
-    end
-  end
-end