From 395cf7fb8d11af3498bc7353077bb92d1c361b12 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 9 Jun 2023 17:48:55 +0100
Subject: [PATCH] Use direct image URLs for enterprise logos

---
 app/models/enterprise.rb | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index 10441b45a6..a2eefa6ac5 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -295,21 +295,15 @@ class Enterprise < ApplicationRecord
   end
 
   def logo_url(name)
-    return unless logo.variable?
-
-    url_for(logo.variant(name))
+    image_url_for(logo, name)
   end
 
   def promo_image_url(name)
-    return unless promo_image.variable?
-
-    url_for(promo_image.variant(name))
+    image_url_for(promo_image, name)
   end
 
   def white_label_logo_url(name = :default)
-    return unless white_label_logo.variable?
-
-    url_for(white_label_logo.variant(name))
+    image_url_for(white_label_logo, name)
   end
 
   def website
@@ -461,6 +455,17 @@ class Enterprise < ApplicationRecord
     errors.add(:white_label_logo_link, I18n.t(:invalid_url))
   end
 
+  def image_url_for(image, name)
+    return unless image.variable?
+    return image.variant(name).processed.url if image.attachment.service.name == :amazon_public
+
+    url_for(image.variant(name))
+  rescue ActiveStorage::Error => e
+    Rails.logger.error(e.message)
+
+    nil
+  end
+
   def current_exchange_variants
     ExchangeVariant.joins(exchange: :order_cycle)
       .merge(Exchange.outgoing)