devise_masquerade 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e7178dc0f54d070a2f4e839f320f65c5506b215a902cc2180b8e357d1a9f62d
-  data.tar.gz: 5466190dbaae779ca45abaa8e65f526e1b99805a493019c8dc67572d387b8022
+  metadata.gz: 4c0668fdf45d72f5919bd9ca487fe2b664948fc9399029832cc426500c030daa
+  data.tar.gz: f61869c2877366a03922b6f0a8aecce6d9adea6a48f1f006a6311d97a2b83d2a
 SHA512:
-  metadata.gz: f2b85a5241c5aef644ca6139f89807631b6e93ebcbc2fc77f0b88f74e43bd411a056bb49c3340ae63322e22cf13a5ca4185208d7c8c778e124d04fa37bb19cbd
-  data.tar.gz: 374dacc212988505fca5cfea9188a7fcdce44d174b54b3cd980363b37c377bb92713ab8467858eefa62d23568783e09929bcdace08efa344bf5610f382e32f31
+  metadata.gz: d98eefe89ce90e177bffdf7d81bdcb7904351d4a8e2de9b519c91e9a81b998398339bdfbbf922146c177b739f22a140b450b5cda5afa4f578d254e02f443f0f7
+  data.tar.gz: f2120c2b253f5f306589abd2b259607e3959e6910e7a8d5cf9661198a5b36a7d0372391995ef8b633a50cc6109e90f500a4dac3603950000eff1419b509cd9ac

data/Gemfile.lock

@@ -52,7 +52,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_masquerade (2.0.1)
+    devise_masquerade (2.0.3)
       devise (>= 4.7.0)
       globalid (>= 0.3.6)
       railties (>= 5.2.0)
@@ -104,22 +104,23 @@ GEM
       bson (~> 1.12.5)
     builder (3.2.3)
     byebug (11.0.1)
-    capybara (3.29.0)
+    capybara (3.37.1)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     childprocess (3.0.0)
     chromedriver-helper (2.1.1)
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.1.5)
     crass (1.0.6)
-    cucumber (3.1.2)
+    cucumber (3.2.0)
       builder (>= 2.1.2)
       cucumber-core (~> 3.2.0)
       cucumber-expressions (~> 6.0.1)
@@ -148,7 +149,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     erubi (1.9.0)
     factory_bot (5.1.1)
       activesupport (>= 4.2.0)
@@ -160,7 +161,7 @@ GEM
     gherkin (5.1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    guard (2.15.1)
+    guard (2.17.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -169,8 +170,8 @@ GEM
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-bundler (2.2.1)
-      bundler (>= 1.3.0, < 3)
+    guard-bundler (3.0.0)
+      bundler (>= 2.1, < 3)
       guard (~> 2.2)
       guard-compat (~> 1.1)
     guard-compat (1.2.1)
@@ -184,10 +185,10 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    io-like (0.3.0)
+    io-like (0.3.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    listen (3.2.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.18.0)
@@ -196,17 +197,18 @@ GEM
     lumberjack (1.0.13)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    matrix (0.4.2)
     method_source (0.9.2)
     mime-types (3.3)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
     mini_mime (1.0.2)
     mini_portile2 (2.8.0)
-    minitest (5.12.2)
+    minitest (5.16.3)
     multi_json (1.14.1)
     multi_test (0.1.2)
     nenv (0.3.0)
-    nokogiri (1.13.6)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -217,14 +219,14 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.6)
     racc (1.6.0)
     rack (2.2.3.1)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -240,7 +242,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    regexp_parser (1.6.0)
+    regexp_parser (2.6.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -255,7 +257,8 @@ GEM
     shoulda-context (1.2.2)
     shoulda-matchers (3.1.3)
       activesupport (>= 4.0.0)
-    sqlite3 (1.4.1)
+    sqlite3 (1.5.3)
+      mini_portile2 (~> 2.8.0)
     test-unit (3.3.4)
       power_assert
     thor (0.20.3)
@@ -266,7 +269,7 @@ GEM
       rack (>= 2.0.9)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.2.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   ruby

data/app/controllers/devise/masquerades_controller.rb

@@ -80,7 +80,7 @@ class Devise::MasqueradesController < DeviseController
     if Devise.masquerade_storage_method_session?
       resource_id = session[skey]
 
-      masqueraded_resource_class.find(resource_id)
+      masquerading_resource_class.find(resource_id)
     else
       data = Rails.cache.read(skey)
 
@@ -98,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
@@ -193,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.1'.freeze
+  VERSION = '2.0.3'.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.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler