From 312c9f7194e9d8d5e55c9aad0d9f5d82e2ce098f Mon Sep 17 00:00:00 2001 From: joshuamsager Date: Wed, 15 Mar 2023 15:23:45 -0400 Subject: [PATCH] Use helper method to access fog_provider --- lib/carrierwave/storage/fog.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/carrierwave/storage/fog.rb b/lib/carrierwave/storage/fog.rb index bc12e532c..437123d72 100644 --- a/lib/carrierwave/storage/fog.rb +++ b/lib/carrierwave/storage/fog.rb @@ -198,12 +198,12 @@ def attributes # [NilClass] no authenticated url available # def authenticated_url(options = {}) - if ['AWS', 'Google', 'Rackspace', 'OpenStack', 'AzureRM', 'Aliyun', 'backblaze'].include?(@uploader.fog_credentials[:provider]) + if ['AWS', 'Google', 'Rackspace', 'OpenStack', 'AzureRM', 'Aliyun', 'backblaze'].include?(fog_provider) # avoid a get by using local references local_directory = connection.directories.new(:key => @uploader.fog_directory) local_file = local_directory.files.new(:key => path) expire_at = options[:expire_at] || ::Fog::Time.now.since(@uploader.fog_authenticated_url_expiration.to_i) - case @uploader.fog_credentials[:provider] + case fog_provider when 'AWS', 'Google' # Older versions of fog-google do not support options as a parameter if url_options_supported?(local_file)