Update classes to use S3

This updates the base carrierwave config, plus the two image upload classes, to start to use AWS S3. We're doing this to replace our old SFTP server

Author: jonodrew

app/uploaders/avatar_uploader.rb

@@ -1,14 +1,18 @@
 # encoding: utf-8
 
 class AvatarUploader < CarrierWave::Uploader::Base
-  storage :sftp if Rails.env.production?
+  storage :s3 if Rails.env.production?
 
   include CarrierWave::MiniMagick
 
+  def content_type_allowlist
+    [/image\//]
+  end
+
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    "uploads/#{model.class.to_s.underscore}/#{model.id}"
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:

app/uploaders/image_uploader.rb

@@ -1,5 +1,5 @@
 class ImageUploader < CarrierWave::Uploader::Base
-  storage :sftp if Rails.env.production?
+  storage :s3 if Rails.env.production?
 
   # Include RMagick or MiniMagick support:
   include CarrierWave::MiniMagick

config/initializers/carrier_wave.rb

@@ -4,15 +4,14 @@
   if Rails.env.development?
     config.storage = :file
   elsif Rails.env.production?
-    config.cache_dir = "#{Rails.root}/tmp/uploads"
-    config.root = Rails.root.join('tmp')
-    config.sftp_host = ENV['UPLOADER_ASSET_HOST']
-    config.sftp_user = ENV['UPLOADER_USER']
-    config.sftp_folder = ENV['UPLOADER_FOLDER']
-    config.sftp_url = ENV['UPLOADER_URL']
-    config.sftp_options = {
-      password: ENV['UPLOADER_PASSW'],
-      port: 22
+    config.storage    = :aws
+    config.aws_bucket = ENV.fetch('S3_BUCKET_NAME', 'prod-sponsor-logos')
+    config.aws_acl    = 'public-read'  
+    config.aws_authenticated_url_expiration = 60 * 60 * 24 * 7  
+    config.aws_credentials = {
+      access_key_id:     ENV.fetch('AWS_ACCESS_KEY'),
+      secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
+      region:            ENV.fetch('AWS_REGION', 'eu-north-1') # Required
     }
   end
 end