effective_resources 2.4.5 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0127a6ec9440aaa16e5ef5014695cf2e451ce1eba63f1bb19f69c0fa476db3d
-  data.tar.gz: 3c3bf228895125edbc8388fea935b1db4a5a94b34fb59c1eeb037f3c4507ca91
+  metadata.gz: 59a393d33cfa210550260fe050c11b1eab54ff0b7f534391aad7bb2058a01ea0
+  data.tar.gz: 5edbfb9aa5538100895dc35e2fb4806a5915c730862d9e312f4900e858914b66
 SHA512:
-  metadata.gz: b8bb650504894ad4f635453436a0a2f4a685169be4e7da2b3a0715b7d13e3da60b1d5a57eb35e271983fa96addc35f75d34f9384114ad42dd7290932a58c0a0b
-  data.tar.gz: 850a9aa9c11faaaa176efb83aaa33e2728da4ae128b6d73ad1f1b818bf93735cdab814602f46b278f698fe63eff3b0868882bd1f6531144b7b33271e6947a87c
+  metadata.gz: bb45c37f2c5e2afef660925a218aceb7ee93f6ed7cc3e670c82e002edce9c9670e5a93604c677ea792999ecfa14ec93dfc25050de9ff0a66a151cf8ac9ebd568
+  data.tar.gz: cd3e71440f3693dcb12278dea707273c974beff4dbd6801546d199d618dc731877f4487726a8c4519f4beb1d3492c727f693dc5d5b9a706dfee6dc2e214d6b88

data/app/controllers/concerns/effective/impersonation_controller/destroy.rb

@@ -0,0 +1,25 @@
+module Effective
+  module ImpersonationController
+    module Destroy
+
+      def destroy
+        @user = current_user.class.find(session[:impersonation_user_id])
+        redirect_path = after_destroy_impersonate_path_for(@user)
+
+        # Reset impersonation
+        session[:impersonation_user_id] = nil
+        session[:impersonation_original_path] = nil
+
+        expire_data_after_sign_in!
+        warden.session_serializer.store(@user, Devise::Mapping.find_scope!(@user))
+
+        redirect_to(redirect_path)
+      end
+
+      def after_destroy_impersonate_path_for(user)
+        session[:impersonation_original_path].presence || '/admin/users'
+      end
+
+    end
+  end
+end

data/app/controllers/concerns/effective/impersonation_controller/impersonate.rb

@@ -0,0 +1,29 @@
+module Effective
+  module ImpersonationController
+    module Impersonate
+
+      def impersonate
+        @user = current_user.class.find(params[:id])
+        redirect_path = after_impersonate_path_for(@user)
+
+        authorize! :impersonate, @user
+
+        # Impersonate
+        session[:impersonation_user_id] = current_user.id
+        session[:impersonation_original_path] = request.referer.presence || '/admin/users'
+
+        expire_data_after_sign_in!
+        warden.session_serializer.store(@user, Devise::Mapping.find_scope!(@user))
+
+        @user.touch
+
+        redirect_to(redirect_path)
+      end
+
+      def after_impersonate_path_for(user)
+        try(:dashboard_path) || try(:root_path) || '/'
+      end
+
+    end
+  end
+end

data/app/models/concerns/has_many_purgable.rb

@@ -71,7 +71,7 @@ module HasManyPurgable
 
   def has_many_purgable_mark_for_destruction
     has_many_purgable_attachments.each do |name|
-      Array(public_send(name)).each { |attachment| attachment.mark_for_destruction }
+      Array(public_send(name)).each { |attachment| attachment.mark_for_destruction unless attachment.new_record? }
     end
 
     true
@@ -80,7 +80,7 @@ module HasManyPurgable
   def has_many_purgable_purge
     has_many_purgable_attachments.each do |name|
       Rails.logger.info "[has_many_purgable] Purging #{name} attachments"
-      Array(public_send(name)).each { |attachment| attachment.purge }
+      Array(public_send(name)).each { |attachment| attachment.purge if attachment.marked_for_destruction? }
     end
 
     true

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.4.5'.freeze
+  VERSION = '2.4.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,6 +143,8 @@ files:
 - app/controllers/concerns/effective/crud_controller/save.rb
 - app/controllers/concerns/effective/crud_controller/submits.rb
 - app/controllers/concerns/effective/flash_messages.rb
+- app/controllers/concerns/effective/impersonation_controller/destroy.rb
+- app/controllers/concerns/effective/impersonation_controller/impersonate.rb
 - app/controllers/concerns/effective/select2_ajax_controller.rb
 - app/controllers/concerns/effective/wizard_controller.rb
 - app/controllers/concerns/effective/wizard_controller/actions.rb