From 3e1b94c227458b4eb11002ea9323604b86a5732a Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Wed, 25 Nov 2020 10:53:44 +1100
Subject: [PATCH] PERF: avoid checking card background and user background when
 not supplied (#11299)

Previously we were performing a bunch of needless work when SSO failed
to supply profile and card backgrounds.
---
 app/models/discourse_single_sign_on.rb | 41 +++++++++++++++-----------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index ab43a49f79e..b28f04bd92b 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -305,27 +305,32 @@ class DiscourseSingleSignOn < SingleSignOn
       end
     end
 
-    profile_background_missing = user.user_profile.profile_background_upload.blank? || Upload.get_from_url(user.user_profile.profile_background_upload.url).blank?
-    if (profile_background_missing || SiteSetting.sso_overrides_profile_background) && profile_background_url.present?
-      profile_background_changed = sso_record.external_profile_background_url != profile_background_url
-      if profile_background_changed || profile_background_missing
-        Jobs.enqueue(:download_profile_background_from_url,
-            url: profile_background_url,
-            user_id: user.id,
-            is_card_background: false
-        )
+    if profile_background_url.present?
+      profile_background_missing = user.user_profile.profile_background_upload.blank? || Upload.get_from_url(user.user_profile.profile_background_upload.url).blank?
+
+      if profile_background_missing || SiteSetting.sso_overrides_profile_background
+        profile_background_changed = sso_record.external_profile_background_url != profile_background_url
+        if profile_background_changed || profile_background_missing
+          Jobs.enqueue(:download_profile_background_from_url,
+              url: profile_background_url,
+              user_id: user.id,
+              is_card_background: false
+          )
+        end
       end
     end
 
-    card_background_missing = user.user_profile.card_background_upload.blank? || Upload.get_from_url(user.user_profile.card_background_upload.url).blank?
-    if (card_background_missing || SiteSetting.sso_overrides_profile_background) && card_background_url.present?
-      card_background_changed = sso_record.external_card_background_url != card_background_url
-      if card_background_changed || card_background_missing
-        Jobs.enqueue(:download_profile_background_from_url,
-            url: card_background_url,
-            user_id: user.id,
-            is_card_background: true
-        )
+    if card_background_url.present?
+      card_background_missing = user.user_profile.card_background_upload.blank? || Upload.get_from_url(user.user_profile.card_background_upload.url).blank?
+      if card_background_missing || SiteSetting.sso_overrides_profile_background
+        card_background_changed = sso_record.external_card_background_url != card_background_url
+        if card_background_changed || card_background_missing
+          Jobs.enqueue(:download_profile_background_from_url,
+              url: card_background_url,
+              user_id: user.id,
+              is_card_background: true
+          )
+        end
       end
     end