replace to_param -> id

oivoodoo · Dec 16, 2022 · 6dd5aa1 · 6dd5aa1
1 parent 1f0ab34
commit 6dd5aa1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/app/controllers/devise/masquerades_controller.rb b/app/controllers/devise/masquerades_controller.rb
@@ -148,7 +148,7 @@ def save_masquerade_owner_session(masqueradable_resource)
     resource_obj = send("current_#{masquerading_resource_name}")
 
     if Devise.masquerade_storage_method_session?
-      session[skey] = resource_obj.to_param
+      session[skey] = resource_obj.id
     else
       # skip sharing owner id via session
       Rails.cache.write(skey, resource_obj.to_sgid(for: 'masquerade'))
@@ -172,7 +172,7 @@ def cleanup_masquerade_owner_session(masqueradable_resource)
   end
 
   def session_key(masqueradable_resource, guid)
-    "devise_masquerade_#{masqueraded_resource_name}_#{masqueradable_resource.to_param}_#{guid}".to_sym
+    "devise_masquerade_#{masqueraded_resource_name}_#{masqueradable_resource.id}_#{guid}".to_sym
   end
 
   def masquerading_current_user

diff --git a/lib/devise_masquerade/controllers/helpers.rb b/lib/devise_masquerade/controllers/helpers.rb
@@ -67,7 +67,7 @@ def #{name}_masquerade_owner
           private
 
           def #{name}_helper_session_key
-            ["devise_masquerade_#{name}", current_#{name}.to_param, #{name}_helper_masquerading_resource_guid].join("_")
+            ["devise_masquerade_#{name}", current_#{name}.id, #{name}_helper_masquerading_resource_guid].join("_")
           end
 
           def #{name}_helper_masquerading_resource_guid

diff --git a/spec/controllers/devise/masquerades_controller_spec.rb b/spec/controllers/devise/masquerades_controller_spec.rb
@@ -14,7 +14,7 @@
         let(:mask) { create(:student) }
 
         before do
-          get :show, params: { id: mask.to_param, masqueraded_resource_class: mask.class.name, masquerade: mask.masquerade_key }
+          get :show, params: { id: mask.id, masqueraded_resource_class: mask.class.name, masquerade: mask.masquerade_key }
         end
 
         it { expect(cache_read(mask)).to be }
@@ -33,7 +33,7 @@
         let(:mask) { create(:user) }
 
         before do
-          get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key }
+          get :show, params: { id: mask.id, masquerade: mask.masquerade_key }
         end
 
         it { expect(cache_read(mask)).to be }
@@ -61,7 +61,7 @@
           context 'with http referrer' do
             before do
               @request.env['HTTP_REFERER'] = 'previous_location'
-              get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key }
+              get :show, params: { id: mask.id, masquerade: mask.masquerade_key }
             end # before
 
             it { should redirect_to('previous_location') }
@@ -73,15 +73,15 @@
                 receive(:after_masquerade_path_for).and_return("/dashboard?color=red"))
             end
 
-            before { get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key } }
+            before { get :show, params: { id: mask.id, masquerade: mask.masquerade_key } }
 
             it { should redirect_to("/dashboard?color=red") }
           end # context
         end # context
 
         context 'and back' do
           before do
-            get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key }
+            get :show, params: { id: mask.id, masquerade: mask.masquerade_key }
 
             get :back
           end
@@ -91,7 +91,7 @@
 
         context 'and back fallback if http_referer not present' do
           before do
-            get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key }
+            get :show, params: { id: mask.id, masquerade: mask.masquerade_key }
 
             @request.env['HTTP_REFERER'] = 'previous_location'
             get :back
@@ -123,6 +123,6 @@ def cache_read(user)
   end
 
   def cache_key(user)
-    "devise_masquerade_#{mask.class.name.downcase}_#{mask.to_param}_#{guid}"
+    "devise_masquerade_#{mask.class.name.downcase}_#{mask.id}_#{guid}"
   end
 end
diff --git a/spec/controllers/masquerades_tests_controller_spec.rb b/spec/controllers/masquerades_tests_controller_spec.rb
@@ -16,7 +16,7 @@
 
     let(:mask) { create(:user) }
 
-    before { get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key } }
+    before { get :show, params: { id: mask.id, masquerade: mask.masquerade_key } }
 
     it { expect(response.status).to eq(403) }
     it { expect(cache_read(mask)).not_to be }
@@ -34,7 +34,7 @@
     let(:mask) { create(:user) }
 
     before do
-      get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key }
+      get :show, params: { id: mask.id, masquerade: mask.masquerade_key }
     end
 
     it { expect(response.status).to eq(302) }
@@ -52,6 +52,6 @@ def cache_read(user)
   end
 
   def cache_key(user)
-    "devise_masquerade_#{mask.class.name.downcase}_#{mask.to_param}_#{guid}"
+    "devise_masquerade_#{mask.class.name.downcase}_#{mask.id}_#{guid}"
   end
 end