thecore 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a42f1257e5672fb290d24c7027cbc14baebf612018d63b912d2db48cff759d9d
-  data.tar.gz: 8874f2abd2862b30887b1341ab0f17eb05b369ac2c01ad5ad2b98ab3917af14b
+  metadata.gz: 4ce48dbc0e595f1962f34e8ee821d692016f8660894a2005e842fb2c19edbfcf
+  data.tar.gz: b31674c73a91b29fdf531cd83b95ae98a19cdcc9352364297cb633eac82fcac6
 SHA512:
-  metadata.gz: 147f5fcfccfa0d13abdeb0253a2822827105ed31ab9e7daff29c4749cabde4be6fcfa4bbf3fe38e48b7a0a17dd263628293608160a3470897c41f873128b9fbb
-  data.tar.gz: 1487ecb62f3b73dabdac2c267a5eb1656411d259d04f0c7dc163665cb9ba33400a79925ab06743d8db764e8abf88eb9431d7cc8dfdb59b4549f088f1b85c7542
+  metadata.gz: 34e6022ac82ce72dc8582138c55118fbc5e6755807b074f49caa6949c7aad0f5c23fad1c4d41cd91a4d68e81b4e8abadb68305169b15089816627bcb9ad905a3
+  data.tar.gz: 1298ff9576a42d7e1bb089be3ce859b70f13c870c97513aef0139b7320c60d09a3e79c07d7ef2e84cc857f272d7e0381f251638bd943267485d69f173354981b

data/config/initializers/thecore_concern.rb

@@ -2,7 +2,7 @@ require 'active_support/concern'
 
 module ThecoreConcern
   extend ActiveSupport::Concern
-
+  
   included do
     # Prevent CSRF attacks by raising an exception.
     # For APIs, you may want to use :null_session instead.
@@ -13,18 +13,19 @@ module ThecoreConcern
     end
     include HttpAcceptLanguage::AutoLocale
     Rails.logger.debug "Selected Locale: #{I18n.locale}"
+    before_action :store_user_location!, if: :storable_location?
     before_action :configure_permitted_parameters, if: :devise_controller?
     before_action :reject_locked!, if: :devise_controller?
-
+    
     helper_method :reject_locked!
     helper_method :require_admin!
     helper_method :line_break
     helper_method :title
     helper_method :bootstrap_class_for
-
+    
     # Redirects on successful sign in
     def after_sign_in_path_for resource
-      Rails.logger.debug("SUCCESFULL SIGNIN, USER IS ADMIN? #{current_user.admin?}")
+      # Rails.logger.debug("SUCCESFULL SIGNIN, USER IS ADMIN? #{current_user.admin?}")
       #if current_user.admin?
       # GETTING JUST THE ROOT ACTIONS I (CURRENT_USER) CAN MANAGE
       root_actions = RailsAdmin::Config::Actions.all(:root).select {|action| can? action.action_name, :all }
@@ -33,20 +34,14 @@ module ThecoreConcern
       action = root_actions.collect(&:action_name).first
       # Rails.logger.debug "FIRST ACTION: #{action}"
       # REDIRECT TO THAT ACTION
-      rails_admin.send("#{action}_path").sub("#{ENV['RAILS_RELATIVE_URL_ROOT']}#{ENV['RAILS_RELATIVE_URL_ROOT']}", "#{ENV['RAILS_RELATIVE_URL_ROOT']}")
-      #rails_admin.dashboard_path.sub("#{ENV['RAILS_RELATIVE_URL_ROOT']}#{ENV['RAILS_RELATIVE_URL_ROOT']}", "#{ENV['RAILS_RELATIVE_URL_ROOT']}")
-      #elsif current_user.has_role? :workers
-      #  rails_admin.new_path('timetable').sub("#{ENV['RAILS_RELATIVE_URL_ROOT']}#{ENV['RAILS_RELATIVE_URL_ROOT']}", "#{ENV['RAILS_RELATIVE_URL_ROOT']}")
-      #else
-      #  inside_path
-      #end
+      stored_location_for(resource) || rails_admin.send("#{action}_path").sub("#{ENV['RAILS_RELATIVE_URL_ROOT']}#{ENV['RAILS_RELATIVE_URL_ROOT']}", "#{ENV['RAILS_RELATIVE_URL_ROOT']}")
     end
   end
-
+  
   def title value = "Thecore"
     @title = value
   end
-
+  
   def bootstrap_class_for flash_type
     case flash_type
     when 'success'
@@ -61,53 +56,68 @@ module ThecoreConcern
       flash_type.to_s
     end
   end
-
+  
   def line_break s
     s.gsub("\n", "<br/>")
   end
   # Devise permitted params
   def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_in) { |u| u.permit(
-      :username,
-      :password,
-      :password_confirmation,
-      :remember_me)
-    }
-    devise_parameter_sanitizer.permit(:sign_up) { |u| u.permit(
-      :username,
-      :password,
-      :password_confirmation)
-    }
-    devise_parameter_sanitizer.permit(:account_update) { |u| u.permit(
-      :username,
-      :password,
-      :password_confirmation,
-      :current_password
-      )
-    }
-  end
-
-  # Auto-sign out locked users
-  def reject_locked!
-    if current_user && current_user.locked?
-      sign_out current_user
-      user_session = nil
-      current_user = nil
-      flash[:alert] = "Your account is locked."
-      flash[:notice] = nil
-      redirect_to root_url
+    devise_parameter_sanitizer.permit(:sign_in) { 
+      |u| u.permit(
+        :username,
+        :password,
+        :password_confirmation,
+        :remember_me)
+      }
+      devise_parameter_sanitizer.permit(:sign_up) { |u| u.permit(
+        :username,
+        :password,
+        :password_confirmation)
+      }
+      devise_parameter_sanitizer.permit(:account_update) { |u| u.permit(
+        :username,
+        :password,
+        :password_confirmation,
+        :current_password)
+      }
     end
-  end
-
-  # Only permits admin users
-  def require_admin!
-    authenticate_user!
-
-    if current_user && !current_user.admin?
-      redirect_to inside_path
+    
+    # Auto-sign out locked users
+    def reject_locked!
+      if current_user && current_user.locked?
+        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
+    
+    # Only permits admin users
+    def require_admin!
+      authenticate_user!
+      
+      if current_user && !current_user.admin?
+        redirect_to inside_path
+      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
-
-# include the extension
-ActionController::Base.send(:include, ThecoreConcern)
+  
+  # include the extension
+  ActionController::Base.send(:include, ThecoreConcern)
+  

data/lib/thecore/version.rb

@@ -1,3 +1,3 @@
 module Thecore
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails