clean up duplicates

oivoodoo · Oct 25, 2022 · 4e36f54 · 4e36f54
1 parent f5f6bb8
commit 4e36f54
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 32 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -52,7 +52,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_masquerade (2.0.1)
+    devise_masquerade (2.0.2)
       devise (>= 4.7.0)
       globalid (>= 0.3.6)
       railties (>= 5.2.0)

diff --git a/app/controllers/devise/masquerades_controller.rb b/app/controllers/devise/masquerades_controller.rb
@@ -98,24 +98,6 @@ def go_back(user, path:)
 
   private
 
-  def masqueraded_resource_class
-    @masqueraded_resource_class ||= begin
-      unless params[:masqueraded_resource_class].blank?
-        params[:masqueraded_resource_class].constantize
-      else
-        unless session[session_key_masqueraded_resource_class].blank?
-          session[session_key_masquerading_resource_class].constantize
-        else
-          if Devise.masqueraded_resource_class_name.present?
-            Devise.masqueraded_resource_class_name.constantize
-          else
-            Devise.masqueraded_resource_class || resource_class
-          end
-        end
-      end
-    end
-  end
-
   def masqueraded_resource_name
     Devise.masqueraded_resource_name || masqueraded_resource_class.model_name.param_key
   end
@@ -193,18 +175,6 @@ def session_key(masqueradable_resource, guid)
     "devise_masquerade_#{masqueraded_resource_name}_#{masqueradable_resource.to_param}_#{guid}".to_sym
   end
 
-  def session_key_masqueraded_resource_class
-    "devise_masquerade_masqueraded_resource_class"
-  end
-
-  def session_key_masquerading_resource_class
-    "devise_masquerade_masquerading_resource_class"
-  end
-
-  def session_key_masquerading_resource_guid
-    "devise_masquerade_masquerading_resource_guid"
-  end
-
   def masquerading_current_user
     send("current_#{masquerading_resource_name}")
   end

diff --git a/lib/devise_masquerade/controllers/helpers.rb b/lib/devise_masquerade/controllers/helpers.rb
@@ -112,12 +112,21 @@ def session_key_masquerading_resource_class
             "devise_masquerade_masquerading_resource_class"
           end
 
+          def session_key_masquerading_resource_guid
+            "devise_masquerade_masquerading_resource_guid"
+          end
+
         METHODS
 
         ActiveSupport.on_load(:action_controller) do
           if respond_to?(:helper_method)
             helper_method "#{name}_masquerade?"
             helper_method "#{name}_masquerade_owner"
+
+            helper_method :masqueraded_resource_class
+            helper_method :session_key_masqueraded_resource_class
+            helper_method :session_key_masquerading_resource_class
+            helper_method :session_key_masquerading_resource_guid
           end
         end
       end

diff --git a/lib/devise_masquerade/version.rb b/lib/devise_masquerade/version.rb
@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.2'.freeze
 end