devise_masquerade 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f67548d3aa0703064adb7a9d093b34093209cff
-  data.tar.gz: cfa1a2e6612069894e9c386155934f56eb861ef9
+  metadata.gz: 417fd89c5319cada031d19c75351278a793d891f
+  data.tar.gz: 2beabc09bbe11a916c7cac22e58577c132feb7be
 SHA512:
-  metadata.gz: 8075eca25c920099eaa6d8e4fe6fe01d77967fa126558691bbeefe7c455beb64d919806bcfae3ebde9ee1597d39198cd1fe4f2a7d017e2f703272e89939f0e07
-  data.tar.gz: d50ecd6cbd1273b62684390fa6bb5b0bf30f394d9a5b9b0607afd31f83fafc78b7b6dac01949050eb64cc253e1d0b2ed2be0f28399a398c119ea75167215239b
+  metadata.gz: b9aca21064db3b097059eb20a91bb42c2699458eee8f21e88d2ad7db56be5d97dae9a743cfece7fb91f93d829aa2bfac02d881064f53ccd5664e31fea19e1b11
+  data.tar.gz: e010d497e12e9bc3b3c7d875e01c99209f329fbe48fcf3d04dd29b03641b81c17526af8e9d9ec9e8ee8ecfc0d6509652c4a16ec1c319a71e0dd67d333e6547ab

data/README.md

@@ -87,6 +87,7 @@ in `routes.rb`:
     Devise.masquerade_expires_in = 10.seconds
     Devise.masquerade_key_size = 16 # size of the generate by SecureRandom.urlsafe_base64
     Devise.masquerade_bypass_warden_callback = false
+    Devise.masquerade_routes_back = false # if true, route back to the page the user was on via redirect_back
 
 ## Demo project
 

data/app/controllers/devise/masquerades_controller.rb

@@ -35,7 +35,13 @@ class Devise::MasqueradesController < DeviseController
       sign_in(self.resource)
     end
 
-    redirect_to("#{after_masquerade_path_for(self.resource)}?#{after_masquerade_param_for(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)}")
+    elsif Devise.masquerade_routes_back && request.env['HTTP_REFERER'].present?
+      redirect_to :back
+    else
+      redirect_to("#{after_masquerade_path_for(self.resource)}?#{after_masquerade_param_for(resource)}")
+    end
   end
 
   def back
@@ -58,7 +64,14 @@ class Devise::MasqueradesController < DeviseController
     end
     request.env["devise.skip_trackable"] = nil
 
-    redirect_to after_back_masquerade_path_for(owner_user)
+    if Devise.masquerade_routes_back && Rails::VERSION::MAJOR == 5
+      # If using the masquerade_routes_back and Rails 5
+      redirect_back(fallback_location: after_back_masquerade_path_for(owner_user))
+    elsif Devise.masquerade_routes_back && request.env['HTTP_REFERER'].present?
+      redirect_to :back
+    else
+      redirect_to after_back_masquerade_path_for(owner_user)
+    end
   end
 
   private

data/lib/devise_masquerade.rb

@@ -24,6 +24,9 @@ module Devise
   mattr_accessor :masquerade_bypass_warden_callback
   @@masquerade_bypass_warden_callback = false
 
+  mattr_accessor :masquerade_routes_back
+  @@masquerade_routes_back = false
+
   @@helpers << DeviseMasquerade::Controllers::Helpers
 end
 

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/controllers/devise/masquerades_controller_spec.rb

@@ -26,6 +26,45 @@ describe Devise::MasqueradesController, type: :controller do
           it { expect(current_user.reload).to eq(@user) }
           it { expect(session.keys).not_to include('devise_masquerade_user') }
         end
+
+        # Configure masquerade_routes_back setting
+        describe 'config#masquerade_routes_back' do
+          before { Devise.setup {|c| c.masquerade_routes_back = true } }
+
+          context 'show' do
+            before { expect(SecureRandom).to receive(:urlsafe_base64) { "secure_key" } }
+
+            context '< Rails 5 version' do
+              before do
+                @request.env['HTTP_REFERER'] = 'previous_location'
+                get :show, id: mask.to_param
+              end # before
+
+              it { should redirect_to('previous_location') }
+            end # context
+
+            context '< Rails 5, fallback if http_referer not present' do
+              before { get :show, id: mask.to_param }
+
+              it { should redirect_to("/?masquerade=secure_key") }
+            end # context
+          end # context
+
+          context '< Rails 5, and back' do
+            before { get :back }
+
+            it { should redirect_to(masquerade_page) }
+          end # context
+
+          context '< Rails 5, and back fallback if http_referer not present' do
+            before do
+              @request.env['HTTP_REFERER'] = 'previous_location'
+              get :back
+            end
+
+            it { should redirect_to('previous_location') }
+          end # context
+        end # describe
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler