devise_masquerade 1.3.6 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 289316079ab661599906ee251d276b9151b6d7b43a47131ea3683d4305cb198a
-  data.tar.gz: fce111853661fbfe07cab2058aefa0ceb2bf1cd15830a3740dc9f293a2126a42
+  metadata.gz: 3f3c384ee31658834131c95ec34bc376340a9f7d8b7d237ed97316f6e61eb5ee
+  data.tar.gz: 78f66fc23c43a3db4eef66c98e15447decfea5627b2900c2ee827785a3b0cdd2
 SHA512:
-  metadata.gz: 6d812afb79fc6e55780d5fff58432c6070bd23b5ec57d88d8706b1ee09eaf4a314bb68803a6924e731866594ba8cf4caeade6d6050c7ba888af6bebfc2058cd9
-  data.tar.gz: f9002c0ba65f8a347f9ba3b4b2abc7aa363784e60c3b9c7e9d6071ca131fd5484c7aac664e7b5566030792243f093793702e6d26ee620117c8126bb3316f60b0
+  metadata.gz: a6b318f8d335a53524a94d24b5c1bc78c41bc308200a0eed543fabdfb891e63a1d119efee269282f9f2e4e1d1a7dd27161076ed9465c3ac55b188f2127dce429
+  data.tar.gz: 0d39bbd0099a4d70496ece49d3db3e955eadbcb14bc20accfcc9fcc90c070b9e7aa5b697ce91367c7d20590a218d182fe99b7d0c37b220fd4bbb59ee1f6c5bde

data/Gemfile.lock

@@ -52,7 +52,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_masquerade (1.3.6)
+    devise_masquerade (1.3.8)
       devise (>= 4.7.0)
       globalid (>= 0.3.6)
       railties (>= 5.2.0)

data/app/controllers/devise/masquerades_controller.rb

@@ -10,41 +10,52 @@ class Devise::MasqueradesController < DeviseController
   prepend_before_action :masquerade_authorize!
 
   def show
-    masqueradable_resource = find_masqueradable_resource
+    if send("#{masqueraded_resource_name}_masquerade?")
+      resource = send("current_#{masquerading_resource_name}")
 
-    save_masquerade_owner_session(masqueradable_resource)
+      go_back(resource, path: after_masquerade_full_path_for(resource))
+    else
+      masqueradable_resource = find_masqueradable_resource
 
-    self.resource = masqueradable_resource
-    sign_out(send("current_#{masquerading_resource_name}"))
+      save_masquerade_owner_session(masqueradable_resource)
 
-    unless resource
-      flash[:error] = "#{masqueraded_resource_class} not found."
-      redirect_to(new_user_session_path) and return
-    end
+      resource = masqueradable_resource
+      sign_out(send("current_#{masquerading_resource_name}"))
 
-    request.env['devise.skip_trackable'] = '1'
+      unless resource
+        flash[:error] = "#{masqueraded_resource_class} not found."
+        redirect_to(new_user_session_path) and return
+      end
 
-    masquerade_sign_in(resource)
+      request.env['devise.skip_trackable'] = '1'
 
-    go_back(resource, path: after_masquerade_full_path_for(resource))
+      masquerade_sign_in(resource)
+
+      go_back(resource, path: after_masquerade_full_path_for(resource))
+    end
   end
 
   def back
-    masqueradable_resource = send("current_#{masqueraded_resource_name}")
+    unless send("#{masqueraded_resource_name}_masquerade?")
+      resource = send("current_#{masqueraded_resource_name}")
+      go_back(resource, path: after_back_masquerade_path_for(resource))
+    else
+      masqueradable_resource = send("current_#{masqueraded_resource_name}")
 
-    unless send("#{masqueraded_resource_name}_signed_in?")
-      head(401) and return
-    end
+      unless send("#{masqueraded_resource_name}_signed_in?")
+        head(401) and return
+      end
 
-    self.resource = find_owner_resource(masqueradable_resource)
-    sign_out(send("current_#{masqueraded_resource_name}"))
+      resource = find_owner_resource(masqueradable_resource)
+      sign_out(send("current_#{masqueraded_resource_name}"))
 
-    masquerade_sign_in(resource)
-    request.env['devise.skip_trackable'] = nil
+      sign_in(resource)
+      request.env['devise.skip_trackable'] = nil
 
-    go_back(resource, path: after_back_masquerade_path_for(resource))
+      go_back(resource, path: after_back_masquerade_path_for(resource))
 
-    cleanup_masquerade_owner_session(masqueradable_resource)
+      cleanup_masquerade_owner_session(masqueradable_resource)
+    end
   end
 
   protected

data/lib/devise_masquerade/controllers/helpers.rb

@@ -50,7 +50,8 @@ module DeviseMasquerade
             return unless send(:#{name}_masquerade?)
 
             key = "devise_masquerade_#{name}_" + current_#{name}.to_param
-            GlobalID::Locator.locate_signed(::Rails.cache.read(key.to_sym, for: 'masquerade'))
+            sgid = ::Rails.cache.read(key.to_sym)
+            GlobalID::Locator.locate_signed(sgid, for: 'masquerade')
           end
 
           private

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = '1.3.6'.freeze
+  VERSION = '1.3.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.8
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler