Rubocop fixes (#1204)

* Rubocop fixes

* More rubo

Author: farhatahmad

Gemfile

@@ -34,8 +34,8 @@ gem 'tabulo', '~> 2.8.1'
 
 gem 'jwt', '~> 2.7.0'
 
-gem 'aws-sdk-s3', '~> 1'
 gem 'aws-sdk-cloudfront', '~> 1'
+gem 'aws-sdk-s3', '~> 1'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

app/controllers/playback_controller.rb

@@ -98,7 +98,7 @@ def deliver_resource
 
       prefix = @recording.published? ? "published" : "unpublished"
       page   = "index.html"
-      cf_url = "#{ENV.fetch("CLOUDFRONT_URL")}/#{prefix}/#{@playback_format.format}/#{@recording.record_id}/#{page}"
+      cf_url = "#{ENV.fetch('CLOUDFRONT_URL')}/#{prefix}/#{@playback_format.format}/#{@recording.record_id}/#{page}"
 
       redirect_to cf_url, allow_other_host: true, status: :temporary_redirect
     else
@@ -114,27 +114,26 @@ def recording_not_found
     render "errors/recording_not_found", status: :not_found, formats: [:html]
   end
 
-  private
   def set_cf_signed_cookies!(format:, record_id:, published:, ttl: 5.minutes)
     base_prefix = published ? "published" : "unpublished"
     path_scope  = "/#{base_prefix}/#{format}/#{record_id}/*"
 
     cf_origin   = ENV.fetch("CLOUDFRONT_URL")
 
-    pem = Base64.decode64(ENV["CF_PRIVATE_KEY_B64"])
+    pem = Base64.decode64(ENV.fetch("CF_PRIVATE_KEY_B64", nil))
 
     signer = Aws::CloudFront::CookieSigner.new(
       key_pair_id: ENV.fetch("CF_KEY_PAIR_ID"),
       private_key: OpenSSL::PKey::RSA.new(pem)
     )
 
-    expires_at = Time.now + (ttl.is_a?(Numeric) ? ttl : ttl.to_i)
+    expires_at = Time.zone.now + (ttl.is_a?(Numeric) ? ttl : ttl.to_i)
 
     policy_json = JSON.generate({
                                   "Statement" => [{
-                                                    "Resource"  => "#{cf_origin}#{path_scope}",
+                                    "Resource" => "#{cf_origin}#{path_scope}",
                                                     "Condition" => { "DateLessThan" => { "AWS:EpochTime" => expires_at.to_i } }
-                                                  }]
+                                  }]
                                 })
 
     cf_cookies = signer.signed_cookie(nil, policy: policy_json)

lib/recording_importer.rb

@@ -50,7 +50,8 @@ def self.import(filename, aws_client = nil)
               files = Dir.glob("#{directory}/**/*").select { |f| File.file?(f) }
               files.each do |file|
                 content_type = Rack::Mime.mime_type(File.extname(file), "application/octet-stream")
-                content_disposition = %w[.pdf .ogg].include?(File.extname(file)) ? "attachment" : nil
+                attachment_file_types = %w[.pdf .ogg]
+                content_disposition = attachment_file_types.include?(File.extname(file)) ? "attachment" : nil
 
                 object = Aws::S3::Object.new(ENV.fetch('S3_BUCKET_NAME'), "#{key}#{file}", client: aws_client)
                 object.upload_file(file, content_type: content_type, content_disposition: content_disposition)