devise_masquerade 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e76954d314e996519b2fd5d764bdca52f0b41113
-  data.tar.gz: 335ebe4c5f2a43e78b5c12d3e1f49ebc2ad8148d
+  metadata.gz: bf92dd8ac9972b55c63ff7b7b45527dc6dbedecc
+  data.tar.gz: c844f06c0b9124705dff331aea2bae877b342587
 SHA512:
-  metadata.gz: a11811add0e0af01eaf6a04dc0672e75362be284a4f00599002eeff51582065c7e4e0cac8d342453b31eeb4683f3563ae4fe0354e68ac77e7f1ec96a3fe7e697
-  data.tar.gz: b1d1e49cd4847944c0efb59d2d65c894871387ceb332c26d5413fdc957efaa59a419d6882f7ef03187d15b2d9edd53dedc92634e52a7da9c5aba971ed49748a9
+  metadata.gz: bbc8724e293c172038bd0ef62bcff064b9f206bf65f410f99cf49826a8d99d863c9098d87e1b0d1330a63bfe45ba626fa63fba3e627472e31bd0fd779b6b8a0b
+  data.tar.gz: 002b0d76daac1a263bf64d8d7512059475612e2df0e37e52a29b2a297760a2df62c33c54712289e262edeaebee1664a0d8fab1c4030f263538495284fb2ce776

data/Makefile

@@ -0,0 +1,14 @@
+setup:
+	cd spec/dummy && \
+	RAILS_ENV=test rake db:setup
+.PHONY: setup
+
+rspec:
+	bundle exec rspec
+.PHONY: rspec
+
+cucumber:
+	bundle exec cucumber
+.PHONY: cucumber
+
+test: setup rspec cucumber

data/app/controllers/devise/masquerades_controller.rb

@@ -18,9 +18,12 @@ class Devise::MasqueradesController < DeviseController
   end
 
   def show
-    self.resource = resource_class.to_adapter.find_first(:id => params[:id])
+    self.resource = masqueraded_resource_class.to_adapter.find_first(:id => params[:id])
 
-    redirect_to(new_user_session_path) and return unless self.resource
+    unless self.resource
+      flash[:error] = "#{masqueraded_resource_class} not found."
+      redirect_to(new_user_session_path) and return
+    end
 
     self.resource.masquerade!
     request.env["devise.skip_trackable"] = "1"
@@ -48,11 +51,15 @@ class Devise::MasqueradesController < DeviseController
     user_id = session[session_key]
 
     owner_user = if user_id.present?
-                   resource_class.to_adapter.find_first(:id => user_id)
+                   masquerading_resource_class.to_adapter.find_first(:id => user_id)
                  else
-                   send(:"current_#{resource_name}")
+                   send(:"current_#{masquerading_resource_name}")
                  end
 
+    if masquerading_resource_class != masqueraded_resource_class
+      sign_out(send("current_#{masqueraded_resource_name}"))
+    end
+
     if Devise.masquerade_bypass_warden_callback
       if respond_to?(:bypass_sign_in)
         bypass_sign_in(owner_user)
@@ -86,8 +93,24 @@ class Devise::MasqueradesController < DeviseController
 
   private
 
+  def masqueraded_resource_class
+    Devise.masqueraded_resource_class || resource_class
+  end
+
+  def masqueraded_resource_name
+    Devise.masqueraded_resource_name || resource_name
+  end
+
+  def masquerading_resource_class
+    Devise.masquerading_resource_class || resource_class
+  end
+
+  def masquerading_resource_name
+    Devise.masquerading_resource_name || resource_name
+  end
+
   def authenticate_scope!
-    send(:"authenticate_#{resource_name}!", :force => true)
+    send(:"authenticate_#{masquerading_resource_name}!", :force => true)
   end
 
   def after_masquerade_path_for(resource)
@@ -103,7 +126,7 @@ class Devise::MasqueradesController < DeviseController
   end
 
   def save_masquerade_owner_session
-    session[session_key] = send("current_#{resource_name}").id unless session.key? session_key
+    session[session_key] = send("current_#{masquerading_resource_name}").id unless session.key? session_key
   end
 
   def cleanup_masquerade_owner_session
@@ -111,6 +134,6 @@ class Devise::MasqueradesController < DeviseController
   end
 
   def session_key
-    "devise_masquerade_#{resource_name}".to_sym
+    "devise_masquerade_#{masqueraded_resource_name}".to_sym
   end
 end

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/devise_masquerade.rb

@@ -27,6 +27,16 @@ module Devise
   mattr_accessor :masquerade_routes_back
   @@masquerade_routes_back = false
 
+  mattr_accessor :masqueraded_resource_class
+
+  mattr_accessor :masqueraded_resource_name
+  @@masqueraded_resource_name = :user
+
+  mattr_accessor :masquerading_resource_class
+
+  mattr_accessor :masquerading_resource_name
+  @@masquerading_resource_name = :user
+
   @@helpers << DeviseMasquerade::Controllers::Helpers
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - Gemfile
 - Guardfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - app/controllers/devise/masquerades_controller.rb