devise_masquerade 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7697f7796ae221a16c23706efcc051b1209a9e4d
-  data.tar.gz: 4c813e1baeda19e25d225bd1c35b56bae5689563
+  metadata.gz: 9a3bf4cda2161401cefd72da8332396859eec1ca
+  data.tar.gz: 159a457f4a68e3c6614af51760d85cd79330df9b
 SHA512:
-  metadata.gz: b7b250e0c7fa601ddb5620b761dcf6609c4fa8b941ec7852ca0a2bab15ee4277d909f370177f9480d92b3bcd07e04bf9bc3f8b042223c33c2220d47ea4a8751d
-  data.tar.gz: 11b1f301ff06051b7219b5ff446dedd54cf9f05b3e2cd2e8ee4697678e6ca6d5e4c5d13e224d7551e32001b3920ae7cc54b0483f4bfee240a42942bdd88deab3
+  metadata.gz: cfa6702b8501684ce1dbffbf32a151bc57ef0661289e1705664dbcdd53a6b8ce41c1c6be11ae48255913607a8b11209ed0577050513a2f3b4acb38dd2a553719
+  data.tar.gz: 709c35dcf2a70ac8adf8022d7d5878990c9aabd0f862819ad50a6bac4d903358334b841ab157644aa62790af78a9a1c61e8c396b79b261aeedda821e7b69dbd5

data/app/controllers/devise/masquerades_controller.rb

@@ -28,15 +28,7 @@ class Devise::MasqueradesController < DeviseController
     self.resource.masquerade!
     request.env["devise.skip_trackable"] = "1"
 
-    if Devise.masquerade_bypass_warden_callback
-      if respond_to?(:bypass_sign_in)
-        bypass_sign_in(self.resource)
-      else
-        sign_in(self.resource, :bypass => true)
-      end
-    else
-      sign_in(self.resource)
-    end
+    masquerade_sign_in(self.resource)
 
     if Devise.masquerade_routes_back && Rails::VERSION::MAJOR == 5
       redirect_back(fallback_location: "#{after_masquerade_param_for(self.resource)}?#{after_masquerade_param_for(resource)}")
@@ -60,15 +52,7 @@ class Devise::MasqueradesController < DeviseController
       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)
-      else
-        sign_in(owner_user, :bypass => true)
-      end
-    else
-      sign_in(owner_user)
-    end
+    masquerade_sign_in(owner_user)
     request.env["devise.skip_trackable"] = nil
 
     if Devise.masquerade_routes_back && Rails::VERSION::MAJOR == 5

data/lib/devise_masquerade/controllers/helpers.rb

@@ -12,15 +12,7 @@ module DeviseMasquerade
             #{name} = ::#{class_name}.find_by_masquerade_key(params["#{Devise.masquerade_param}"])
 
             if #{name}
-              if Devise.masquerade_bypass_warden_callback
-                if respond_to?(:bypass_sign_in)
-                  bypass_sign_in(#{name})
-                else
-                  sign_in(#{name}, :bypass => true)
-                end
-              else
-                sign_in(#{name})
-              end
+              masquerade_sign_in(#{name})
             end
           end
 
@@ -32,6 +24,20 @@ module DeviseMasquerade
             return nil unless send(:#{name}_masquerade?)
             ::#{class_name}.to_adapter.find_first(:id => session[:"devise_masquerade_#{name}"])
           end
+
+          private
+
+          def masquerade_sign_in(resource)
+            if Devise.masquerade_bypass_warden_callback
+              if respond_to?(:bypass_sign_in)
+                bypass_sign_in(resource)
+              else
+                sign_in(resource, :bypass => true)
+              end
+            else
+              sign_in(resource)
+            end
+          end
         METHODS
 
         ActiveSupport.on_load(:action_controller) do

data/lib/devise_masquerade/model.rb

@@ -13,7 +13,8 @@ module Devise
       module InstanceMethods
         def masquerade!
           @masquerade_key = SecureRandom.urlsafe_base64(Devise.masquerade_key_size)
-          Rails.cache.write("#{self.class.name.pluralize.underscore}:#{@masquerade_key}:masquerade", id, :expires_in => Devise.masquerade_expires_in)
+          cache_key = self.class.cache_masquerade_key_by(@masquerade_key)
+          Rails.cache.write(cache_key, id, :expires_in => Devise.masquerade_expires_in)
         end
       end
 

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler