Switch to simpler signed_id for blob rather than full GlobalID

We don't need to lookup multiple different classes, so no need to use a globalid.

1 files changed, 8 insertions, 9 deletions

diff --git a/app/controllers/active_storage/variants_controller.rb b/app/controllers/active_storage/variants_controller.rb
index d5e97e63fa..a65d7d7571 100644
--- a/app/controllers/active_storage/variants_controller.rb
+++ b/app/controllers/active_storage/variants_controller.rb
@@ -1,22 +1,21 @@
+require "active_storage/variant"
+
 class ActiveStorage::VariantsController < ActionController::Base
   def show
-    if blob_key = decode_verified_blob_key
-      redirect_to processed_variant_for(blob_key).url(disposition: disposition_param)
+    if blob = find_signed_blob
+      redirect_to ActiveStorage::Variant.new(blob, decoded_variation).processed.url(disposition: disposition_param)
     else
       head :not_found
     end
   end
 
   private
-    def decode_verified_blob_key
-      ActiveStorage::VerifiedKeyWithExpiration.decode(params[:encoded_blob_key])
+    def find_signed_blob
+      ActiveStorage::Blob.find_signed(params[:signed_blob_id])
     end
 
-    def processed_variant_for(blob_key)
-      ActiveStorage::Variant.new(
-        ActiveStorage::Blob.find_by!(key: blob_key),
-        ActiveStorage::Variation.decode(params[:variation_key])
-      ).processed
+    def decoded_variation
+      ActiveStorage::Variation.decode(params[:variation_key])
     end
 
     def disposition_param