devise_masquerade 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99dc9de6d6af53393db0f0f0a8c8b80191bf203bad2ba604eb50dce7708aa314
-  data.tar.gz: a8a89851d08443baaf4e7106bec7267d7a0c8209f01da40431874672ff56d1c9
+  metadata.gz: b21015ee6b3b1561bcf507063f84e0eea7f0bd4db78bee58c2122b287628cc56
+  data.tar.gz: 6817e192073914e507c1ba3cf7b9bef3178e733b3b83314ff80914f827e612d6
 SHA512:
-  metadata.gz: 13133209d039b4f64ff124fc88935198e4cde0ee181abd6ce973b9d31f2618d6ed2512a27adf9c3f5d32be4fff16084f15135a6f95b97ff96b0a430ba4f9819a
-  data.tar.gz: 0b4455f0adfd73ea7a49794349d686010c47157e4e30a836ea9a811f05005f8533af55a1945401f2595845ccd82cc2a84f4b6aa392ef0dcc3bea5b423f9ef35a
+  metadata.gz: db0d98e2513d372a40896dfd4453359e5d04a3865300c0c96407582e1a6601d52528dced610830bb95b527ea416ea60b212d8de1a286a1b56706d6c4dbb41451
+  data.tar.gz: 70fdb0e0e55321832ce09c00613ca5c26faff9f2dc7587523b09d61cbcdcfc66fbf3e3368a898cc39564057cae97a1b96ad668c53812e8b5bfbc5e28749eafe2

data/Gemfile.lock

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

data/app/controllers/devise/masquerades_controller.rb

@@ -77,13 +77,15 @@ class Devise::MasqueradesController < DeviseController
   def find_owner_resource(masqueradable_resource)
     skey = session_key(masqueradable_resource, masquerading_guid)
 
-    data = if Devise.masquerade_storage_method_session?
-      session[skey]
+    if Devise.masquerade_storage_method_session?
+      resource_id = session[skey]
+
+      masqueraded_resource_class.find(resource_id)
     else
-      Rails.cache.read(skey)
-    end
+      data = Rails.cache.read(skey)
 
-    GlobalID::Locator.locate_signed(data, for: 'masquerade')
+      GlobalID::Locator.locate_signed(data, for: 'masquerade')
+    end
   end
 
   def go_back(user, path:)
@@ -96,24 +98,6 @@ class Devise::MasqueradesController < DeviseController
 
   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
@@ -161,13 +145,13 @@ class Devise::MasqueradesController < DeviseController
 
     skey = session_key(masqueradable_resource, guid)
 
-    resource_gid = send("current_#{masquerading_resource_name}").to_sgid(for: 'masquerade')
+    resource_obj = send("current_#{masquerading_resource_name}")
 
     if Devise.masquerade_storage_method_session?
-      session[skey] = resource_gid
+      session[skey] = resource_obj.to_param
     else
       # skip sharing owner id via session
-      Rails.cache.write(skey, resource_gid)
+      Rails.cache.write(skey, resource_obj.to_sgid(for: 'masquerade'))
 
       session[skey] = true
     end
@@ -191,18 +175,6 @@ class Devise::MasqueradesController < DeviseController
     "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

data/features/back.feature

@@ -11,6 +11,7 @@ Feature: Use back button for returning to the owner of the masquerade action.
     When I am on the users page
     And I login as one user
       Then I should be login as this user
+      And I should be masqueraded by owner user
 
     When I press back masquerade button
       Then I should be login as owner user
@@ -23,6 +24,7 @@ Feature: Use back button for returning to the owner of the masquerade action.
     When I am on the users page
     And I login as one user
       Then I should be login as this user
+      And I should be masqueraded by owner user
 
     When I press back masquerade button
       Then I should be login as owner user

data/features/expires_masquerade.feature

@@ -13,6 +13,7 @@ Feature: Use back button for returning to the owner despite on expiration time.
     When I am on the users page
     And I login as one user
       Then I should be login as this user
+      And I should be masqueraded by owner user
       And I waited for 2 seconds
 
     When I press back masquerade button
@@ -28,6 +29,7 @@ Feature: Use back button for returning to the owner despite on expiration time.
     When I am on the users page
     And I login as one user
       Then I should be login as this user
+      And I should be masqueraded by owner user
       And I waited for 2 seconds
 
     When I press back masquerade button

data/features/step_definitions/back_steps.rb

@@ -14,6 +14,10 @@ Then /^I should be login as this user$/ do
   find('.current_user').should have_content(@user_mask.email)
 end
 
+Then /^I should be masqueraded by owner user$/ do
+  find('.owner_user').should have_content(@user.email)
+end
+
 When /^I press back masquerade button$/ do
   click_on "Back masquerade"
 end

data/lib/devise_masquerade/controllers/helpers.rb

@@ -53,13 +53,15 @@ module DeviseMasquerade
           def #{name}_masquerade_owner
             return unless send(:#{name}_masquerade?)
 
-            sgid = if Devise.masquerade_storage_method_session?
-              session[#{name}_helper_session_key]
+            if Devise.masquerade_storage_method_session?
+              resource_id = session[#{name}_helper_session_key]
+
+              masqueraded_resource_class.find(resource_id)
             else
-              ::Rails.cache.read(#{name}_helper_session_key)
-            end
+              sgid = ::Rails.cache.read(#{name}_helper_session_key)
 
-            GlobalID::Locator.locate_signed(sgid, for: 'masquerade')
+              GlobalID::Locator.locate_signed(sgid, for: 'masquerade')
+            end
           end
 
           private
@@ -83,12 +85,48 @@ module DeviseMasquerade
               sign_in(resource)
             end
           end
+
+          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 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
+
         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

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.2'.freeze
 end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -17,6 +17,8 @@
       <% end %>
 
       <% if user_masquerade? %>
+        <h1 class='owner_user'><%= user_masquerade_owner.email %></h1>
+
         <%= link_to "Back masquerade", back_masquerade_path(User.new) %>
       <% end %>
     <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler