devise_masquerade 1.3.12 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b25ee25719baa23bf2db526506162a1209f87286c4ad951cbe1625207e518427
-  data.tar.gz: 5e1f66d3831659776e565b8e7e2dc8039db6040218f2c5fc808a5201e9cf8620
+  metadata.gz: 0e7178dc0f54d070a2f4e839f320f65c5506b215a902cc2180b8e357d1a9f62d
+  data.tar.gz: 5466190dbaae779ca45abaa8e65f526e1b99805a493019c8dc67572d387b8022
 SHA512:
-  metadata.gz: 27560df82bf3670a995bc155a0a6a5887fd51b9595e8596d7037e43945370013308ff7b66bd7e49336ccf411af9ff080812b08bb5b751cff9d649ce376040018
-  data.tar.gz: 99e88a1f2aa27ca855ae41094291507bb3a731a65a0c8d331ce2d76dca412eb6561b59d9c80c4489aed9d4d9208d37b20ecc7ddec485df3e98d40663c7337ebf
+  metadata.gz: f2b85a5241c5aef644ca6139f89807631b6e93ebcbc2fc77f0b88f74e43bd411a056bb49c3340ae63322e22cf13a5ca4185208d7c8c778e124d04fa37bb19cbd
+  data.tar.gz: 374dacc212988505fca5cfea9188a7fcdce44d174b54b3cd980363b37c377bb92713ab8467858eefa62d23568783e09929bcdace08efa344bf5610f382e32f31

data/Gemfile.lock

@@ -52,7 +52,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_masquerade (1.3.12)
+    devise_masquerade (2.0.1)
       devise (>= 4.7.0)
       globalid (>= 0.3.6)
       railties (>= 5.2.0)
@@ -260,7 +260,7 @@ GEM
       power_assert
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     warden (1.2.9)
       rack (>= 2.0.9)

data/README.md

@@ -177,6 +177,10 @@ in `routes.rb`:
 
     # optional, default: masqueraded_resource_class.model_name.param_key
     Devise.masqueraded_resource_name = :user
+
+    # optional, default: masquerade_storage_method = :session
+    # values: :session, :cache
+    Devise.masquerade_storage_method = :session
 ```
 
 ## Demo project

data/app/controllers/devise/masquerades_controller.rb

@@ -77,7 +77,15 @@ class Devise::MasqueradesController < DeviseController
   def find_owner_resource(masqueradable_resource)
     skey = session_key(masqueradable_resource, masquerading_guid)
 
-    GlobalID::Locator.locate_signed(Rails.cache.read(skey), for: 'masquerade')
+    if Devise.masquerade_storage_method_session?
+      resource_id = session[skey]
+
+      masqueraded_resource_class.find(resource_id)
+    else
+      data = Rails.cache.read(skey)
+
+      GlobalID::Locator.locate_signed(data, for: 'masquerade')
+    end
   end
 
   def go_back(user, path:)
@@ -155,11 +163,17 @@ 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_obj.to_param
+    else
+      # skip sharing owner id via session
+      Rails.cache.write(skey, resource_obj.to_sgid(for: 'masquerade'))
+
+      session[skey] = true
+    end
 
-    # skip sharing owner id via session
-    Rails.cache.write(skey, resource_gid)
-    session[skey] = true
     session[session_key_masquerading_resource_class] = masquerading_resource_class.name
     session[session_key_masqueraded_resource_class] = masqueraded_resource_class.name
     session[session_key_masquerading_resource_guid] = guid
@@ -168,8 +182,8 @@ class Devise::MasqueradesController < DeviseController
   def cleanup_masquerade_owner_session(masqueradable_resource)
     skey = session_key(masqueradable_resource, masquerading_guid)
 
-    Rails.cache.delete(skey)
-    session.delete(skey)
+    Rails.cache.delete(skey) if Devise.masquerade_storage_method_cache?
+
     session.delete(session_key_masqueraded_resource_class)
     session.delete(session_key_masquerading_resource_class)
     session.delete(session_key_masquerading_resource_guid)

data/features/back.feature

@@ -3,8 +3,21 @@ Feature: Use back button for returning to the owner of the masquerade action.
   As an masquerade user
   I want to be able to press a simple button on the page
 
-  Scenario: Use back button
+  Scenario: Use back button with cache
     Given I logged in
+    And devise masquerade configured to use cache
+    And I have a user for masquerade
+
+    When I am on the users page
+    And I login as one user
+      Then I should be login as this user
+
+    When I press back masquerade button
+      Then I should be login as owner user
+
+  Scenario: Use back button with session
+    Given I logged in
+    And devise masquerade configured to use session
     And I have a user for masquerade
 
     When I am on the users page

data/features/expires_masquerade.feature

@@ -3,8 +3,24 @@ Feature: Use back button for returning to the owner despite on expiration time.
   As an masquerade user
   I want to be able to press a simple button on the page
 
-  Scenario: Use back button
+  Scenario: Use back button with cache
     Given I logged in
+    And devise masquerade configured to use cache
+    And I have a user for masquerade
+
+    When I have devise masquerade expiration time in 1 second
+
+    When I am on the users page
+    And I login as one user
+      Then I should be login as this user
+      And I waited for 2 seconds
+
+    When I press back masquerade button
+      Then I should be login as owner user
+
+  Scenario: Use back button with session
+    Given I logged in
+    And devise masquerade configured to use session
     And I have a user for masquerade
 
     When I have devise masquerade expiration time in 1 second

data/features/step_definitions/auth_steps.rb

@@ -9,3 +9,10 @@ Given /^I logged in$/ do
   click_on 'Log in'
 end
 
+Given("devise masquerade configured to use cache") do
+  Devise.masquerade_storage_method = :cache
+end
+
+Given("devise masquerade configured to use session") do
+  Devise.masquerade_storage_method = :session
+end

data/lib/devise_masquerade/controllers/helpers.rb

@@ -43,13 +43,22 @@ module DeviseMasquerade
             return false if current_#{name}.blank?
             return false if session[#{name}_helper_session_key].blank?
 
-            ::Rails.cache.exist?(#{name}_helper_session_key).present?
+            if Devise.masquerade_storage_method_session?
+              session[#{name}_helper_session_key].present?
+            else
+              ::Rails.cache.exist?(#{name}_helper_session_key).present?
+            end
           end
 
           def #{name}_masquerade_owner
             return unless send(:#{name}_masquerade?)
 
-            sgid = ::Rails.cache.read(#{name}_helper_session_key)
+            sgid = if Devise.masquerade_storage_method_session?
+              session[#{name}_helper_session_key]
+            else
+              ::Rails.cache.read(#{name}_helper_session_key)
+            end
+
             GlobalID::Locator.locate_signed(sgid, for: 'masquerade')
           end
 

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = '1.3.12'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/lib/devise_masquerade.rb

@@ -39,6 +39,20 @@ module Devise
   # Example: Devise.masquerading_resource_name = :admin_user
   mattr_accessor :masquerading_resource_name
 
+  # Example: Devise.masquerade_storage_method = :session
+  # - session
+  # - cache
+  mattr_accessor :masquerade_storage_method
+  @@masquerade_storage_method = :session
+
+  def self.masquerade_storage_method_session?
+    Devise.masquerade_storage_method == :session
+  end
+
+  def self.masquerade_storage_method_cache?
+    Devise.masquerade_storage_method == :cache
+  end
+
   @@helpers << DeviseMasquerade::Controllers::Helpers
 end
 

data/spec/controllers/devise/masquerades_controller_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Devise::MasqueradesController, type: :controller do
+  before { Devise.masquerade_storage_method = :cache }
+  after { Devise.masquerade_storage_method = :session }
+
   context 'with configured devise app' do
     before { @request.env['devise.mapping'] = Devise.mappings[:user] }
 

data/spec/controllers/masquerades_tests_controller_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe MasqueradesTestsController, type: :controller do
+  before { Devise.masquerade_storage_method = :cache }
+  after { Devise.masquerade_storage_method = :session }
+
   before { @request.env['devise.mapping'] = Devise.mappings[:user] }
 
   context 'no access for masquerade' do

metadata

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