Skip to content

A platform for community discussion. Free, open, simple.

FEATURE: Retain connected account avatars for reselection

Régis Hanol2b6dd3686234
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 9282f7c6981..24d55e714e1 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -607,7 +607,7 @@ class Admin::UsersController < Admin::StaffController
previous_value:,
context: params[:context],
)
- @user.user_associated_accounts.delete_all
+ @user.user_associated_accounts.destroy_all
render json: success_json
end
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index 8716b8371e9..ed3a1abdd42 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -12,28 +12,18 @@ class UserAvatarsController < ApplicationController
def refresh_gravatar
user = User.find_by(username_lower: params[:username].downcase)
- guardian.ensure_can_edit!(user)
-
- if user
- hijack do
- user.create_user_avatar(user_id: user.id) unless user.user_avatar
- user.user_avatar.update_gravatar!
-
- gravatar =
- if user.user_avatar.gravatar_upload_id
- {
- gravatar_upload_id: user.user_avatar.gravatar_upload_id,
- gravatar_avatar_template:
- User.avatar_template(user.username, user.user_avatar.gravatar_upload_id),
- }
- else
- { gravatar_upload_id: nil, gravatar_avatar_template: nil }
- end
-
- render json: gravatar
- end
- else
- raise Discourse::NotFound
+ guardian.ensure_can_edit_avatar!(user)
+
+ hijack do
+ avatar = user.user_avatar || user.create_user_avatar
+ avatar.update_gravatar!
+ upload_id = avatar.gravatar_upload_id
+
+ render json: {
+ gravatar_upload_id: upload_id,
+ gravatar_avatar_template:
+ upload_id && User.avatar_template(user.username, upload_id),
+ }
end
end
@@ -124,8 +114,7 @@ class UserAvatarsController < ApplicationController
return redirect_to cdn_path(avatar_url), allow_other_host: true
end
- upload = Upload.find_by(id: upload_id) if user&.user_avatar&.contains_upload?(upload_id)
- upload ||= user.uploaded_avatar if user.uploaded_avatar_id == upload_id
+ upload = user.find_avatar_upload(upload_id)
if user.uploaded_avatar && !upload
avatar_url =
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 24fef563586..8d12b00952a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1408,54 +1408,38 @@ class UsersController < ApplicationController
render json: to_render
end
- AVATAR_TYPES_WITH_UPLOAD = %w[uploaded custom gravatar]
-
def pick_avatar
user = fetch_user_from_params
guardian.ensure_can_edit!(user)
- if SiteSetting.discourse_connect_overrides_avatar || SiteSetting.auth_overrides_avatar
- return render json: failed_json, status: :unprocessable_entity
- end
-
- type = params[:type]
-
- if type == "gravatar" && !SiteSetting.gravatar_enabled?
+ type = params[:type].presence || "system"
+ unless guardian.can_pick_avatar_source?(user, type)
return render json: failed_json, status: :unprocessable_entity
end
- invalid_type = type.present? && !AVATAR_TYPES_WITH_UPLOAD.include?(type) && type != "system"
- return render json: failed_json, status: :unprocessable_entity if invalid_type
-
- if type.blank? || type == "system"
- upload_id = nil
- elsif !user.in_any_groups?(SiteSetting.uploaded_avatars_allowed_groups_map) &&
- !user.is_system_user?
- return render json: failed_json, status: :unprocessable_entity
+ case type
+ when "associated_account"
+ picked = user.user_avatar&.pick_associated_account(params[:associated_account_id])
+ return render json: failed_json, status: :unprocessable_entity unless picked
+ when "system"
+ user.pick_avatar!(nil)
else
upload_id = params[:upload_id]
+ if type == "current" && upload_id.to_i != user.uploaded_avatar_id
+ return render json: failed_json, status: :unprocessable_entity
+ end
+
upload = Upload.find_by(id: upload_id)
return render_json_error I18n.t("avatar.missing") if upload.nil?
- # old safeguard
- user.create_user_avatar unless user.user_avatar
+ guardian.ensure_can_pick_avatar!(user.user_avatar || user.build_user_avatar, upload)
- guardian.ensure_can_pick_avatar!(user.user_avatar, upload)
-
- if type == "gravatar"
- user.user_avatar.gravatar_upload_id = upload_id
- else
- user.user_avatar.custom_upload_id = upload_id
- end
+ user.pick_avatar!(upload_id, type: type.to_sym)
end
SiteSetting.use_site_small_logo_as_system_avatar = false if user.is_system_user?
- user.uploaded_avatar_id = upload_id
- user.save!
- user.user_avatar.save!
-
render json: success_json
end
@@ -1463,39 +1447,29 @@ class UsersController < ApplicationController
user = fetch_user_from_params
guardian.ensure_can_edit!(user)
- url = params[:url]
-
- return render json: failed_json, status: :unprocessable_entity if url.blank?
-
- if SiteSetting.selectable_avatars_mode == "disabled"
+ unless guardian.can_edit_avatar?(user)
return render json: failed_json, status: :unprocessable_entity
end
- if SiteSetting.selectable_avatars.blank?
- return render json: failed_json, status: :unprocessable_entity
- end
+ url = params[:url]
- unless upload = Upload.get_from_url(url)
+ if url.blank? || SiteSetting.selectable_avatars_mode == "disabled" ||
+ SiteSetting.selectable_avatars.blank?
return render json: failed_json, status: :unprocessable_entity
end
- if SiteSetting.selectable_avatars.exclude?(upload)
+ upload = Upload.get_from_url(url)
+ unless upload && SiteSetting.selectable_avatars.include?(upload)
return render json: failed_json, status: :unprocessable_entity
end
- user.uploaded_avatar_id = upload.id
-
SiteSetting.use_site_small_logo_as_system_avatar = false if user.is_system_user?
- user.save!
-
- avatar = user.user_avatar || user.create_user_avatar
- avatar.custom_upload_id = upload.id
- avatar.save!
+ user.pick_avatar!(upload.id)
render json: {
avatar_template: user.avatar_template,
- custom_avatar_template: user.avatar_template,
+ custom_avatar_template: user.custom_avatar_template,
uploaded_avatar_id: upload.id,
}
end
diff --git a/app/jobs/regular/download_avatar_from_url.rb b/app/jobs/regular/download_avatar_from_url.rb
index 06ef524a25e..2c606415d46 100644
--- a/app/jobs/regular/download_avatar_from_url.rb
+++ b/app/jobs/regular/download_avatar_from_url.rb
@@ -14,7 +14,12 @@ module Jobs
return unless user = User.find_by(id: user_id)
begin
- UserAvatar.import_url_for_user(url, user, override_gravatar: args[:override_gravatar])
+ UserAvatar.import_url_for_user(
+ url,
+ user,
+ override_gravatar: args[:override_gravatar],
+ associated_account_id: args[:associated_account_id],
+ )
rescue Discourse::InvalidParameters => e
raise e unless e.message == "url"
end
diff --git a/app/jobs/regular/update_gravatar.rb b/app/jobs/regular/update_gravatar.rb
index 6133a92c0ed..efcb641b318 100644
--- a/app/jobs/regular/update_gravatar.rb
+++ b/app/jobs/regular/update_gravatar.rb
@@ -5,15 +5,10 @@ module Jobs
sidekiq_options queue: "low"
def execute(args)
- user = User.find_by(id: args[:user_id])
- avatar = UserAvatar.find_by(id: args[:avatar_id])
+ avatar = UserAvatar.find_by(id: args[:avatar_id], user_id: args[:user_id])
+ return if avatar&.user&.primary_email.blank?
- if user && avatar && avatar.user&.id == user.id && user.primary_email.present?
- avatar.update_gravatar!
- if !user.uploaded_avatar_id && avatar.gravatar_upload_id
- user.update_column(:uploaded_avatar_id, avatar.gravatar_upload_id)
- end
- end
+ avatar.update_gravatar!(selection: :if_missing)
end
end
end
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 3256086180a..50c11cd314f 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -57,11 +57,7 @@ class Upload < ActiveRecord::Base
)
end
- after_destroy do
- User.where(uploaded_avatar_id: id).update_all(uploaded_avatar_id: nil)
- UserAvatar.where(gravatar_upload_id: id).update_all(gravatar_upload_id: nil)
- UserAvatar.where(custom_upload_id: id).update_all(custom_upload_id: nil)
- end
+ after_destroy { UserAvatar.remove_upload(id) }
scope :by_users, -> { where("uploads.id > ?", SEEDED_ID_THRESHOLD) }
diff --git a/app/models/user.rb b/app/models/user.rb
index 6956fdf6785..c42c8e0b862 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1309,13 +1309,20 @@ class User < ActiveRecord::Base
end
end
- def remove_avatar!(actor)
- return if uploaded_avatar_id.blank?
+ def custom_avatar_template
+ user_avatar&.custom_avatar_template
+ end
- self.class.transaction do
- update!(uploaded_avatar_id: nil)
- user_avatar&.update!(custom_upload_id: nil, gravatar_upload_id: nil)
- end
+ def find_avatar_upload(upload_id)
+ UserAvatar.find_upload_for_user(self, upload_id)
+ end
+
+ def pick_avatar!(upload_id, type: :current)
+ UserAvatar.pick_for_user!(self, upload_id, type: type)
+ end
+
+ def remove_avatar!(actor)
+ return unless UserAvatar.remove_for_user!(self)
StaffActionLogger.new(actor).log_removed_avatar(self)
end
@@ -1656,17 +1663,7 @@ class User < ActiveRecord::Base
def refresh_avatar
return if @import_mode
- avatar = user_avatar || create_user_avatar
-
- if primary_email.present? && SiteSetting.automatically_download_gravatars? &&
- !avatar.last_gravatar_download_attempt
- Jobs.cancel_scheduled_job(:update_gravatar, user_id: id, avatar_id: avatar.id)
- Jobs.enqueue_in(1.second, :update_gravatar, user_id: id, avatar_id: avatar.id)
- end
-
- # mark all the user's quoted posts as "needing a rebake"
- # use background job to avoid blocking on large datasets
- Jobs.enqueue(:rebake_quoted_posts_for_user, user_id: id) if saved_change_to_uploaded_avatar_id?
+ UserAvatar.refresh_for_user(self)
end
def first_post_created_at
@@ -1781,13 +1778,7 @@ class User < ActiveRecord::Base
end
def set_random_avatar
- if SiteSetting.selectable_avatars_random_on_signup &&
- SiteSetting.selectable_avatars_mode != "disabled"
- if upload = SiteSetting.selectable_avatars.sample
- update_column(:uploaded_avatar_id, upload.id)
- UserAvatar.create!(user_id: id, custom_upload_id: upload.id)
- end
- end
+ UserAvatar.assign_random_to_user(self)
end
def anonymous?
diff --git a/app/models/user_associated_account.rb b/app/models/user_associated_account.rb
index 700bbe09fa7..86a3881e0f5 100644
--- a/app/models/user_associated_account.rb
+++ b/app/models/user_associated_account.rb
@@ -2,11 +2,29 @@
class UserAssociatedAccount < ActiveRecord::Base
belongs_to :user
+ belongs_to :avatar_upload, class_name: "Upload"
+ has_many :upload_references, as: :target, dependent: :destroy
+
+ after_save do
+ if saved_change_to_avatar_upload_id?
+ UploadReference.ensure_exist!(upload_ids: [avatar_upload_id], target: self)
+ end
+
+ if saved_change_to_user_id?
+ UserAvatar.clear_associated_account_selection(id, except_user_id: user_id)
+ end
+ end
+
+ after_destroy { UserAvatar.clear_associated_account_selection(id) }
+
+ def authenticator
+ Discourse.enabled_authenticators.find { |authenticator| authenticator.name == provider_name }
+ end
def self.cleanup!
# This happens when a user starts the registration flow, but doesn't complete it
# Keeping the rows doesn't cause any technical issue, but we shouldn't store PII unless it's attached to a user
- where("user_id IS NULL AND updated_at < ?", 1.day.ago).delete_all
+ where("user_id IS NULL AND updated_at < ?", 1.day.ago).find_each(&:destroy!)
end
end
@@ -14,19 +32,21 @@ end
#
# Table name: user_associated_accounts
#
-# id :bigint not null, primary key
-# credentials :jsonb not null
-# extra :jsonb not null
-# info :jsonb not null
-# last_used :datetime not null
-# provider_name :string not null
-# provider_uid :string not null
-# created_at :datetime not null
-# updated_at :datetime not null
-# user_id :integer
+# id :bigint not null, primary key
+# credentials :jsonb not null
+# extra :jsonb not null
+# info :jsonb not null
+# last_used :datetime not null
+# provider_name :string not null
+# provider_uid :string not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# avatar_upload_id :integer
+# user_id :integer
#
# Indexes
#
-# associated_accounts_provider_uid (provider_name,provider_uid) UNIQUE
-# associated_accounts_provider_user (provider_name,user_id) UNIQUE
+# associated_accounts_provider_uid (provider_name,provider_uid) UNIQUE
+# associated_accounts_provider_user (provider_name,user_id) UNIQUE
+# index_user_associated_accounts_on_avatar_upload_id (avatar_upload_id) WHERE (avatar_upload_id IS NOT NULL)
#
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index 6491f2465fe..b7101404078 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class UserAvatar < ActiveRecord::Base
+ UPLOAD_ID_COLUMNS = %i[gravatar_upload_id custom_upload_id].freeze
+
belongs_to :user
belongs_to :gravatar_upload, class_name: "Upload"
belongs_to :custom_upload, class_name: "Upload"
@@ -17,69 +19,159 @@ class UserAvatar < ActiveRecord::Base
Discourse::SYSTEM_USER_ID => User.email_hash("[email protected]"),
}
- def self.register_custom_user_gravatar_email_hash(user_id, email)
- @@custom_user_gravatar_email_hash[user_id] = User.email_hash(email)
- end
-
def contains_upload?(id)
gravatar_upload_id == id || custom_upload_id == id
end
- def update_gravatar!
+ def custom_avatar_template
+ return unless custom_upload_id
+
+ User.avatar_template(user.username, custom_upload_id)
+ end
+
+ def pick_associated_account(account_id)
+ user.with_lock do
+ account = user.user_associated_accounts.lock.find_by(id: account_id)
+ return false unless account&.avatar_upload && account.authenticator
+
+ reload
+ update!(selected_user_associated_account_id: account.id)
+ user.update!(uploaded_avatar_id: account.avatar_upload_id)
+ end
+
+ true
+ end
+
+ def update_gravatar!(selection: :preserve)
DistributedMutex.synchronize("update_gravatar_#{user_id}") do
update!(last_gravatar_download_attempt: Time.zone.now)
+ return if user&.primary_email.blank?
- max = Discourse.avatar_sizes.max
+ upload = download_gravatar!
- # The user could be deleted before this executes
- return if user.blank? || user.primary_email.blank?
+ user.with_lock do
+ reload
+ selected_gravatar = gravatar_upload_id && user.uploaded_avatar_id == gravatar_upload_id
+ select_if_missing = selection == :if_missing && !user.uploaded_avatar_id
+ update!(gravatar_upload: upload) if upload && gravatar_upload_id != upload.id
- email_hash = @@custom_user_gravatar_email_hash[user_id] || user.email_hash
- gravatar_url =
- "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404&reset_cache=#{SecureRandom.urlsafe_base64(5)}"
+ return if selected_user_associated_account_id || !gravatar_upload_id
+ return unless selected_gravatar || select_if_missing
+ return if user.uploaded_avatar_id == gravatar_upload_id
- if SiteSetting.verbose_upload_logging
- Rails.logger.warn("Verbose Upload Logging: Downloading gravatar from #{gravatar_url}")
+ user.update!(uploaded_avatar_id: gravatar_upload_id)
end
+ end
+ end
- # follow redirects in case gravatar change rules on us
- tempfile =
- FileHelper.download(
- gravatar_url,
- max_file_size: SiteSetting.max_image_size_kb.kilobytes,
- tmp_file_name: "gravatar",
- skip_rate_limit: true,
- verbose: false,
- follow_redirect: true,
- )
+ def self.register_custom_user_gravatar_email_hash(user_id, email)
+ @@custom_user_gravatar_email_hash[user_id] = User.email_hash(email)
+ end
+
+ def self.find_upload_for_user(user, upload_id)
+ return user.uploaded_avatar if user.uploaded_avatar_id == upload_id
+ return unless avatar = user.user_avatar
+ return Upload.find_by(id: upload_id) if avatar.contains_upload?(upload_id)
+
+ user.user_associated_accounts.find_by(avatar_upload_id: upload_id)&.avatar_upload
+ end
+
+ def self.pick_for_user!(user, upload_id, type: :current)
+ user.with_lock do
+ avatar = user.user_avatar || user.build_user_avatar
+ avatar.gravatar_upload_id = upload_id if type == :gravatar
+ avatar.custom_upload_id = upload_id if %i[uploaded custom].include?(type)
+ avatar.selected_user_associated_account_id = nil
+ avatar.save!
+ user.update!(uploaded_avatar_id: upload_id)
+ end
+ end
+
+ def self.remove_for_user!(user)
+ return false if user.uploaded_avatar_id.blank?
+
+ user.with_lock do
+ user.update!(uploaded_avatar_id: nil)
+ user.user_avatar&.update!(
+ custom_upload_id: nil,
+ gravatar_upload_id: nil,
+ selected_user_associated_account_id: nil,
+ )
+ user
+ .user_associated_accounts
+ .where.not(avatar_upload_id: nil)
+ .each { |account| account.update!(avatar_upload_id: nil) }
+ end
+
+ true
+ end
+
+ def self.assign_random_to_user(user)
+ return unless SiteSetting.selectable_avatars_random_on_signup
+ return if SiteSetting.selectable_avatars_mode == "disabled"
+ return unless upload = SiteSetting.selectable_avatars.sample
+
+ user.update_column(:uploaded_avatar_id, upload.id)
+ UploadReference.ensure_exist!(upload_ids: [upload.id], target: user)
+ end
+
+ def self.retrieve_for_associated_account(account, selection: :preserve)
+ user = account.user
+ url = account.info["image"]
+ return unless user && url.present?
- if tempfile
- ext = File.extname(tempfile)
- ext = ".png" if ext.blank?
-
- upload =
- UploadCreator.new(
- tempfile,
- "gravatar#{ext}",
- origin: gravatar_url,
- type: "avatar",
- for_gravatar: true,
- ).create_for(user_id)
-
- if gravatar_upload_id != upload.id
- User.transaction do
- if gravatar_upload_id && user.uploaded_avatar_id == gravatar_upload_id
- user.update!(uploaded_avatar_id: upload.id)
- end
-
- update!(gravatar_upload: upload)
- end
- end
+ user.with_lock do
+ avatar = user.user_avatar || user.create_user_avatar!
+ if SiteSetting.auth_overrides_avatar ||
+ (selection == :initial && user.uploaded_avatar_id.nil? && avatar.custom_upload_id.nil?)
+ avatar.update!(selected_user_associated_account_id: account.id)
end
- rescue OpenURI::HTTPError => e
- raise e if e.io&.status&.[](0).to_i != 404
- ensure
- tempfile&.close!
+ end
+
+ Jobs.enqueue(
+ :download_avatar_from_url,
+ url: url,
+ user_id: user.id,
+ associated_account_id: account.id,
+ )
+ end
+
+ def self.refresh_for_user(user)
+ avatar = user.user_avatar || user.create_user_avatar
+
+ if user.primary_email.present? && SiteSetting.automatically_download_gravatars? &&
+ !avatar.last_gravatar_download_attempt
+ Jobs.cancel_scheduled_job(:update_gravatar, user_id: user.id, avatar_id: avatar.id)
+ Jobs.enqueue_in(1.second, :update_gravatar, user_id: user.id, avatar_id: avatar.id)
+ end
+
+ if user.saved_change_to_uploaded_avatar_id?
+ Jobs.enqueue(:rebake_quoted_posts_for_user, user_id: user.id)
+ end
+ end
+
+ def self.import_url_for_user(avatar_url, user, options = nil)
+ if account_id = options&.[](:associated_account_id)
+ return import_associated_account_avatar(avatar_url, user, account_id)
+ end
+
+ upload = download_for_user(avatar_url, user, options)
+ return unless upload&.persisted?
+
+ user.with_lock do
+ avatar = user.user_avatar || user.build_user_avatar
+ cached_upload = avatar.contains_upload?(upload.id)
+ override_gravatar = !options || options[:override_gravatar]
+ return if cached_upload && !override_gravatar
+
+ avatar.custom_upload_id = upload.id unless cached_upload
+ replace_current =
+ !user.uploaded_avatar_id || !avatar.contains_upload?(user.uploaded_avatar_id) ||
+ override_gravatar
+ avatar.selected_user_associated_account_id = nil if replace_current
+ avatar.save!
+
+ user.update!(uploaded_avatar_id: upload.id) if replace_current
end
end
@@ -105,48 +197,19 @@ class UserAvatar < ActiveRecord::Base
"#{upload_id}_#{OptimizedImage::VERSION}"
end
- def self.import_url_for_user(avatar_url, user, options = nil)
- if SiteSetting.verbose_upload_logging
- Rails.logger.warn("Verbose Upload Logging: Downloading sso-avatar from #{avatar_url}")
- end
-
- tempfile =
- FileHelper.download(
- avatar_url,
- max_file_size: SiteSetting.max_image_size_kb.kilobytes,
- tmp_file_name: "sso-avatar",
- follow_redirect: true,
- skip_rate_limit: !!options&.fetch(:skip_rate_limit, false),
- )
-
- return unless tempfile
-
- ext = FastImage.type(tempfile).to_s
- tempfile.rewind
-
- upload =
- UploadCreator.new(
- tempfile,
- "external-avatar." + ext,
- origin: avatar_url,
- type: "avatar",
- ).create_for(user.id)
-
- user.create_user_avatar! unless user.user_avatar
+ def self.clear_associated_account_selection(account_ids, except_user_id: nil)
+ where(selected_user_associated_account_id: account_ids)
+ .where.not(user_id: except_user_id)
+ .update_all(selected_user_associated_account_id: nil)
+ end
- if !user.user_avatar.contains_upload?(upload.id)
- user.user_avatar.update!(custom_upload_id: upload.id)
- override_gravatar = !options || options[:override_gravatar]
+ def self.remove_upload(upload_id)
+ User.where(uploaded_avatar_id: upload_id).update_all(uploaded_avatar_id: nil)
+ UPLOAD_ID_COLUMNS.each { |column| where(column => upload_id).update_all(column => nil) }
- if user.uploaded_avatar_id.nil? ||
- !user.user_avatar.contains_upload?(user.uploaded_avatar_id) || override_gravatar
- user.update!(uploaded_avatar_id: upload.id)
- end
- end
- rescue Net::ReadTimeout, OpenURI::HTTPError, FinalDestination::SSRFError
- # Skip saving. We are not connected to the net, or SSRF checks failed.
- ensure
- tempfile.close! if tempfile && tempfile.respond_to?(:close!)
+ accounts = UserAssociatedAccount.where(avatar_upload_id: upload_id)
+ clear_associated_account_selection(accounts.select(:id))
+ accounts.update_all(avatar_upload_id: nil)
end
def self.ensure_consistency!(max_optimized_avatars_to_remove: 20_000)
@@ -157,29 +220,15 @@ class UserAvatar < ActiveRecord::Base
WHERE user_avatars.id = ua.id AND u.id IS NULL
SQL
- DB.exec <<~SQL
- UPDATE user_avatars
- SET gravatar_upload_id = NULL
- WHERE gravatar_upload_id IN (
- SELECT u1.gravatar_upload_id FROM user_avatars u1
- LEFT JOIN uploads up
- ON u1.gravatar_upload_id = up.id
- WHERE u1.gravatar_upload_id IS NOT NULL AND
- up.id IS NULL
- )
- SQL
-
- DB.exec <<~SQL
- UPDATE user_avatars
- SET custom_upload_id = NULL
- WHERE custom_upload_id IN (
- SELECT u1.custom_upload_id FROM user_avatars u1
- LEFT JOIN uploads up
- ON u1.custom_upload_id = up.id
- WHERE u1.custom_upload_id IS NOT NULL AND
- up.id IS NULL
- )
- SQL
+ UPLOAD_ID_COLUMNS.each { |column| DB.exec <<~SQL }
+ UPDATE user_avatars
+ SET #{column} = NULL
+ WHERE #{column} IN (
+ SELECT ua.#{column} FROM user_avatars ua
+ LEFT JOIN uploads up ON ua.#{column} = up.id
+ WHERE ua.#{column} IS NOT NULL AND up.id IS NULL
+ )
+ SQL
ids =
DB.query_single(<<~SQL, sizes: Discourse.avatar_sizes, limit: max_optimized_avatars_to_remove)
@@ -206,23 +255,116 @@ class UserAvatar < ActiveRecord::Base
end
end
end
+
+ def self.import_associated_account_avatar(url, user, account_id)
+ account = user.user_associated_accounts.find_by(id: account_id)
+ return unless account && account.info["image"] == url
+
+ upload = download_for_user(url, user)
+ return unless upload&.persisted?
+
+ user.with_lock do
+ account = user.user_associated_accounts.lock.find_by(id: account_id)
+ return unless account && account.info["image"] == url
+
+ account.update!(avatar_upload: upload)
+
+ if user.user_avatar&.selected_user_associated_account_id == account.id &&
+ account.authenticator
+ user.update!(uploaded_avatar_id: upload.id)
+ end
+ end
+ end
+ private_class_method :import_associated_account_avatar
+
+ def self.download_for_user(avatar_url, user, options = nil)
+ if SiteSetting.verbose_upload_logging
+ Rails.logger.warn("Verbose Upload Logging: Downloading sso-avatar from #{avatar_url}")
+ end
+
+ tempfile =
+ FileHelper.download(
+ avatar_url,
+ max_file_size: SiteSetting.max_image_size_kb.kilobytes,
+ tmp_file_name: "sso-avatar",
+ follow_redirect: true,
+ skip_rate_limit: !!options&.fetch(:skip_rate_limit, false),
+ )
+
+ return unless tempfile
+
+ ext = FastImage.type(tempfile).to_s
+ tempfile.rewind
+
+ UploadCreator.new(
+ tempfile,
+ "external-avatar." + ext,
+ origin: avatar_url,
+ type: "avatar",
+ ).create_for(user.id)
+ rescue Net::ReadTimeout, OpenURI::HTTPError, FinalDestination::SSRFError
+ # Skip saving. We are not connected to the net, or SSRF checks failed.
+ ensure
+ tempfile.close! if tempfile && tempfile.respond_to?(:close!)
+ end
+ private_class_method :download_for_user
+
+ private
+
+ def download_gravatar!
+ max = Discourse.avatar_sizes.max
+ email_hash = @@custom_user_gravatar_email_hash[user_id] || user.email_hash
+ gravatar_url =
+ "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404&reset_cache=#{SecureRandom.urlsafe_base64(5)}"
+
+ if SiteSetting.verbose_upload_logging
+ Rails.logger.warn("Verbose Upload Logging: Downloading gravatar from #{gravatar_url}")
+ end
+
+ tempfile =
+ FileHelper.download(
+ gravatar_url,
+ max_file_size: SiteSetting.max_image_size_kb.kilobytes,
+ tmp_file_name: "gravatar",
+ skip_rate_limit: true,
+ verbose: false,
+ follow_redirect: true,
+ )
+
+ return unless tempfile
+
+ ext = File.extname(tempfile).presence || ".png"
+ UploadCreator.new(
+ tempfile,
+ "gravatar#{ext}",
+ origin: gravatar_url,
+ type: "avatar",
+ for_gravatar: true,
+ ).create_for(user_id)
+ rescue OpenURI::HTTPError => e
+ raise e if e.io&.status&.[](0).to_i != 404
+ ensure
+ tempfile&.close!
+ end
end
# == Schema Information
#
# Table name: user_avatars
#
-# id :integer not null, primary key
-# last_gravatar_download_attempt :datetime
-# created_at :datetime not null
-# updated_at :datetime not null
-# custom_upload_id :integer
-# gravatar_upload_id :integer
-# user_id :integer not null
+# id :integer not null, primary key
+# last_gravatar_download_attempt :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
+# custom_upload_id :integer
+# gravatar_upload_id :integer
+# selected_user_associated_account_id :bigint
+# user_id :integer not null
#
# Indexes
#
-# index_user_avatars_on_custom_upload_id (custom_upload_id)
-# index_user_avatars_on_gravatar_upload_id (gravatar_upload_id)
-# index_user_avatars_on_user_id (user_id)
+# index_user_avatars_on_custom_upload_id (custom_upload_id)
+# index_user_avatars_on_gravatar_upload_id (gravatar_upload_id)
+# index_user_avatars_on_selected_user_associated_account_id (selected_user_associated_account_id) WHERE (selected_user_associated_account_id IS NOT NULL)
+# index_user_avatars_on_user_id (user_id)
#
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index c635a854c9b..8b1edb59e91 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -7,6 +7,8 @@ class UserSerializer < UserCardSerializer
attributes :bio_raw,
:bio_cooked,
:can_edit,
+ :can_edit_avatar,
+ :can_upload_avatar,
:can_edit_username,
:can_edit_email,
:can_edit_name,
@@ -51,6 +53,8 @@ class UserSerializer < UserCardSerializer
:gravatar_avatar_template,
:custom_avatar_upload_id,
:custom_avatar_template,
+ :associated_account_avatars,
+ :selected_user_associated_account_id,
:has_title_badges,
:muted_usernames,
:can_mute_users,
@@ -213,6 +217,14 @@ class UserSerializer < UserCardSerializer
scope.can_edit?(object)
end
+ def can_edit_avatar
+ scope.can_edit_avatar?(object)
+ end
+
+ def can_upload_avatar
+ !scope.is_anonymous? && scope.can_pick_avatar_source?(object, "custom")
+ end
+
def can_edit_username
scope.can_edit_username?(object)
end
@@ -301,7 +313,7 @@ class UserSerializer < UserCardSerializer
end
def system_avatar_template
- User.system_avatar_template(object.username)
+ User.default_template(object.username)
end
def include_gravatar_avatar_upload_id?
@@ -332,8 +344,23 @@ class UserSerializer < UserCardSerializer
include_custom_avatar_upload_id?
end
- def custom_avatar_template
- User.avatar_template(object.username, object.user_avatar.custom_upload_id)
+ def associated_account_avatars
+ object
+ .user_associated_accounts
+ .joins(:avatar_upload)
+ .where(provider_name: Discourse.enabled_authenticators.map(&:name))
+ .map do |account|
+ {
+ id: account.id,
+ name: account.provider_name,
+ upload_id: account.avatar_upload_id,
+ avatar_template: User.avatar_template(object.username, account.avatar_upload_id),
+ }
+ end
+ end
+
+ def selected_user_associated_account_id
+ object.user_avatar&.selected_user_associated_account_id
end
def has_title_badges
diff --git a/app/serializers/web_hook_user_serializer.rb b/app/serializers/web_hook_user_serializer.rb
index 9b4b8d0c5c4..e6d7559cbe7 100644
--- a/app/serializers/web_hook_user_serializer.rb
+++ b/app/serializers/web_hook_user_serializer.rb
@@ -10,6 +10,8 @@ class WebHookUserSerializer < UserSerializer
%i[
unconfirmed_emails
can_edit
+ can_edit_avatar
+ can_upload_avatar
can_edit_username
can_edit_email
can_edit_name
@@ -27,6 +29,8 @@ class WebHookUserSerializer < UserSerializer
system_avatar_upload_id
gravatar_avatar_upload_id
custom_avatar_upload_id
+ associated_account_avatars
+ selected_user_associated_account_id
can_change_bio
can_change_location
can_change_website
diff --git a/db/migrate/20260918062145_add_associated_account_avatars.rb b/db/migrate/20260918062145_add_associated_account_avatars.rb
new file mode 100644
index 00000000000..0519f2d70cc
--- /dev/null
+++ b/db/migrate/20260918062145_add_associated_account_avatars.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class AddAssociatedAccountAvatars < ActiveRecord::Migration[8.0]
+ def change
+ add_column :user_associated_accounts, :avatar_upload_id, :integer
+ add_column :user_avatars, :selected_user_associated_account_id, :bigint
+ end
+end
diff --git a/db/migrate/20260918062827_add_indexes_for_associated_account_avatars.rb b/db/migrate/20260918062827_add_indexes_for_associated_account_avatars.rb
new file mode 100644
index 00000000000..71669945832
--- /dev/null
+++ b/db/migrate/20260918062827_add_indexes_for_associated_account_avatars.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+class AddIndexesForAssociatedAccountAvatars < ActiveRecord::Migration[8.0]
+ disable_ddl_transaction!
+
+ def change
+ remove_index :user_associated_accounts,
+ :avatar_upload_id,
+ if_exists: true,
+ algorithm: :concurrently
+ add_index :user_associated_accounts,
+ :avatar_upload_id,
+ where: "avatar_upload_id IS NOT NULL",
+ algorithm: :concurrently
+
+ remove_index :user_avatars,
+ :selected_user_associated_account_id,
+ if_exists: true,
+ algorithm: :concurrently
+ add_index :user_avatars,
+ :selected_user_associated_account_id,
+ where: "selected_user_associated_account_id IS NOT NULL",
+ algorithm: :concurrently
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 00a213e60b7..8fb8a32ab0b 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -12112,7 +12112,8 @@ CREATE TABLE public.user_associated_accounts (
credentials jsonb DEFAULT '{}'::jsonb NOT NULL,
extra jsonb DEFAULT '{}'::jsonb NOT NULL,
created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ updated_at timestamp without time zone NOT NULL,
+ avatar_upload_id integer
);
@@ -12257,7 +12258,8 @@ CREATE TABLE public.user_avatars (
gravatar_upload_id integer,
last_gravatar_download_attempt timestamp without time zone,
created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ updated_at timestamp without time zone NOT NULL,
+ selected_user_associated_account_id bigint
);
@@ -24428,6 +24430,13 @@ CREATE INDEX index_user_api_keys_on_user_id ON public.user_api_keys USING btree
CREATE UNIQUE INDEX index_user_archived_messages_on_user_id_and_topic_id ON public.user_archived_messages USING btree (user_id, topic_id);
+--
+-- Name: index_user_associated_accounts_on_avatar_upload_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_user_associated_accounts_on_avatar_upload_id ON public.user_associated_accounts USING btree (avatar_upload_id) WHERE (avatar_upload_id IS NOT NULL);
+
+
--
-- Name: index_user_associated_groups; Type: INDEX; Schema: public; Owner: -
--
@@ -24498,6 +24507,13 @@ CREATE INDEX index_user_avatars_on_custom_upload_id ON public.user_avatars USING
CREATE INDEX index_user_avatars_on_gravatar_upload_id ON public.user_avatars USING btree (gravatar_upload_id);
+--
+-- Name: index_user_avatars_on_selected_user_associated_account_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_user_avatars_on_selected_user_associated_account_id ON public.user_avatars USING btree (selected_user_associated_account_id) WHERE (selected_user_associated_account_id IS NOT NULL);
+
+
--
-- Name: index_user_avatars_on_user_id; Type: INDEX; Schema: public; Owner: -
--
@@ -25556,6 +25572,8 @@ INSERT INTO "schema_migrations" (version) VALUES
('20260921081150'),
('20260921074918'),
('20260921015711'),
+('20260918062827'),
+('20260918062145'),
('20260918061735'),
('20260917145657'),
('20260915204557'),
diff --git a/docs/developer-guides/docs/03-code-internals/17-authentication-method.md b/docs/developer-guides/docs/03-code-internals/17-authentication-method.md
index 92ce92fbaf8..5c52398236e 100644
--- a/docs/developer-guides/docs/03-code-internals/17-authentication-method.md
+++ b/docs/developer-guides/docs/03-code-internals/17-authentication-method.md
@@ -40,6 +40,16 @@ https://github.com/discourse/discourse/blob/b46b6e72d1906ca31e29855bda71f3498c8e
Data is stored in the `user_associated_accounts` database table. `provider_uid`, `info`, `credentials` and `extra` are all taken directly from the data returned by omniauth.
+Provider images are downloaded from `info.image` on authentication and retained in each account's `avatar_upload_id`. They remain separate from the user's uploaded picture and selectable presets. The avatar picker offers cached images from enabled providers under the existing avatar permissions.
+
+`UserAvatar` owns avatar imports, selection, refreshes, and cleanup. Authentication schedules provider retrieval through `UserAvatar.retrieve_for_associated_account`; download jobs and importers use `UserAvatar.import_url_for_user`, passing `associated_account_id` for provider images. User convenience methods and account/upload lifecycle callbacks delegate avatar changes to `UserAvatar`; permissions remain in Guardian.
+
+`user_avatars.selected_user_associated_account_id` records an explicitly selected provider. Subsequent downloads update the displayed avatar only while that provider remains selected. New accounts initially select their provider when no avatar was assigned; `auth_overrides_avatar` continues to enforce provider selection. Existing avatars retain their appearance and are not assigned a provider automatically. Existing linked accounts populate their provider choices on their next login.
+
+Choosing another avatar clears provider selection. Disconnecting an account preserves its currently displayed image as a local snapshot and preserves any separate uploaded picture. Failed downloads retain the previous image. Queued downloads are discarded if the account was disconnected, moved to another user, or now supplies a different image URL.
+
+Gravatar selection still uses upload-ID matching. A custom or preset picture identical to the cached Gravatar can therefore follow subsequent Gravatar updates.
+
https://github.com/discourse/discourse/blob/b46b6e72d1906ca31e29855bda71f3498c8e203f/app/models/user_associated_account.rb#L13-L24
Once an `Authenticator` class has been defined, it needs to be registered. This must happen early in the application's lifecycle, and can **not** happen within a plugin's `after_initialize` method. The minimum registration can simply contain a reference to the authenticator. In a plugin, registration can be done using the `auth_provider` function. For example:
diff --git a/lib/auth/managed_authenticator.rb b/lib/auth/managed_authenticator.rb
index 99b30fa6306..992238621d5 100644
--- a/lib/auth/managed_authenticator.rb
+++ b/lib/auth/managed_authenticator.rb
@@ -92,7 +92,7 @@ class Auth::ManagedAuthenticator < Auth::Authenticator
association.save!
# Update avatar/profile
- retrieve_avatar(association.user, association.info["image"])
+ UserAvatar.retrieve_for_associated_account(association)
retrieve_profile(association.user, association.info)
# Build the Auth::Result object
@@ -122,7 +122,7 @@ class Auth::ManagedAuthenticator < Auth::Authenticator
association.user = user
association.save!
- retrieve_avatar(user, association.info["image"])
+ UserAvatar.retrieve_for_associated_account(association, selection: :initial)
retrieve_profile(user, association.info)
auth_result.apply_associated_attributes!
@@ -138,12 +138,6 @@ class Auth::ManagedAuthenticator < Auth::Authenticator
User.find_by_username(username) if username
end
- def retrieve_avatar(user, url)
- return unless user && url.present?
- return if user.user_avatar.try(:custom_upload_id).present? && !SiteSetting.auth_overrides_avatar
- Jobs.enqueue(:download_avatar_from_url, url: url, user_id: user.id, override_gravatar: false)
- end
-
def retrieve_profile(user, info)
return unless user
diff --git a/lib/discourse_dev/user.rb b/lib/discourse_dev/user.rb
index 3b2c6915f36..74ad7e6a2b6 100644
--- a/lib/discourse_dev/user.rb
+++ b/lib/discourse_dev/user.rb
@@ -69,9 +69,7 @@ module DiscourseDev
upload = UploadCreator.new(tempfile, filename, type: "avatar").create_for(user.id)
if upload.present? && upload.persisted?
- user.create_user_avatar
- user.user_avatar.update(custom_upload_id: upload.id)
- user.update(uploaded_avatar_id: upload.id)
+ user.pick_avatar!(upload.id, type: :custom)
else
STDERR.puts "Failed to upload avatar for user #{user.username}: #{avatar_path}"
STDERR.puts upload.errors.inspect if upload
diff --git a/lib/discourse_mcp/tools/users.rb b/lib/discourse_mcp/tools/users.rb
index 4022597aad3..a1be71e0277 100644
--- a/lib/discourse_mcp/tools/users.rb
+++ b/lib/discourse_mcp/tools/users.rb
@@ -380,7 +380,7 @@ module DiscourseMcp
User.transaction do
updated = UserUpdater.new(request_context.user, user).update(attributes)
raise ToolError, user.errors.full_messages.join(", ") if !updated
- update_avatar!(user, upload) if upload
+ user.pick_avatar!(upload.id, type: :custom) if upload
end
user.reload
@@ -429,12 +429,6 @@ module DiscourseMcp
end
end
private_class_method :validate_background_uploads!
-
- def self.update_avatar!(user, upload)
- (user.user_avatar || user.build_user_avatar).update!(custom_upload_id: upload.id)
- user.update!(uploaded_avatar_id: upload.id)
- end
- private_class_method :update_avatar!
end
class SetUserStatus
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 9c0cdf385bf..a036a0442ed 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -2,6 +2,45 @@
# mixin for all Guardian methods dealing with user permissions
module UserGuardian
+ AVATAR_TYPES_WITH_UPLOAD = %w[uploaded custom gravatar current]
+
+ def can_edit_avatar?(target_user)
+ can_edit?(target_user) && !SiteSetting.auth_overrides_avatar &&
+ !SiteSetting.discourse_connect_overrides_avatar
+ end
+
+ def can_pick_avatar_source?(target_user, type)
+ return false unless can_edit_avatar?(target_user)
+
+ case type
+ when "system"
+ return true
+ when *AVATAR_TYPES_WITH_UPLOAD
+ return false if type == "gravatar" && !SiteSetting.gravatar_enabled?
+
+ return true if target_user.is_system_user?
+
+ return target_user.in_any_groups?(SiteSetting.uploaded_avatars_allowed_groups_map)
+ when "associated_account"
+ unless target_user.in_any_groups?(SiteSetting.uploaded_avatars_allowed_groups_map)
+ return false
+ end
+ else
+ return false
+ end
+
+ case SiteSetting.selectable_avatars_mode
+ when "no_one"
+ false
+ when "staff"
+ target_user.staff?
+ when /\Atl([1-4])\z/
+ target_user.staff? || target_user.trust_level >= Regexp.last_match(1).to_i
+ else
+ true
+ end
+ end
+
def can_claim_reviewable_topic?(topic, automatic = false)
(SiteSetting.reviewable_claiming != "disabled" || automatic) && can_review_topic?(topic)
end
@@ -11,6 +50,7 @@ module UserGuardian
return true if is_admin?
# can always pick blank avatar
return true if !upload
+ return true if user_avatar.user.uploaded_avatar_id == upload.id
return true if user_avatar.contains_upload?(upload.id)
return true if upload.user_id == user_avatar.user_id || is_my_own?(upload)
diff --git a/lib/tasks/avatars.rake b/lib/tasks/avatars.rake
index 55409b5b10a..dfee8371d29 100644
--- a/lib/tasks/avatars.rake
+++ b/lib/tasks/avatars.rake
@@ -31,6 +31,7 @@ task "avatars:clean" => :environment do
OptimizedImage.where(
"upload_id IN (SELECT custom_upload_id FROM user_avatars) OR
upload_id IN (SELECT gravatar_upload_id FROM user_avatars) OR
+ upload_id IN (SELECT avatar_upload_id FROM user_associated_accounts) OR
upload_id IN (SELECT uploaded_avatar_id FROM users)",
).pluck(:id)
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 8d40ad1515d..de815ca98b7 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -301,6 +301,9 @@ def regenerate_missing_optimized
missing_uploads = Set.new
avatar_upload_ids = UserAvatar.all.pluck(:custom_upload_id, :gravatar_upload_id).flatten.compact
+ avatar_upload_ids.concat(
+ UserAssociatedAccount.where.not(avatar_upload_id: nil).pluck(:avatar_upload_id),
+ )
default_scope = OptimizedImage.includes(:upload)
diff --git a/lib/upload_security.rb b/lib/upload_security.rb
index a0c87e5a901..0e79fc16c39 100644
--- a/lib/upload_security.rb
+++ b/lib/upload_security.rb
@@ -48,6 +48,7 @@ class UploadSecurity
SiteSetting
ThemeField
User
+ UserAssociatedAccount
UserAvatar
UserProfile
]
diff --git a/plugins/discourse-oauth2-basic/spec/plugin_spec.rb b/plugins/discourse-oauth2-basic/spec/plugin_spec.rb
index 05f2d1e5c03..3f9d469e471 100644
--- a/plugins/discourse-oauth2-basic/spec/plugin_spec.rb
+++ b/plugins/discourse-oauth2-basic/spec/plugin_spec.rb
@@ -327,19 +327,6 @@ describe OAuth2BasicAuthenticator do
let(:job_klass) { Jobs::DownloadAvatarFromUrl }
- before do
- png =
- Base64.decode64(
- "R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==",
- )
- stub_request(:get, "http://avatar.example.com/avatar.png").to_return(
- body: png,
- headers: {
- "Content-Type" => "image/png",
- },
- )
- end
-
it "enqueues a download_avatar_from_url job for existing user" do
authenticator.expects(:fetch_user_details).returns(
email: user.email,
@@ -351,7 +338,7 @@ describe OAuth2BasicAuthenticator do
expect(job_args["url"]).to eq("http://avatar.example.com/avatar.png")
expect(job_args["user_id"]).to eq(user.id)
- expect(job_args["override_gravatar"]).to eq(false)
+ expect(job_args["associated_account_id"]).to eq(user.user_associated_accounts.first.id)
end
it "enqueues a download_avatar_from_url job for new user" do
@@ -373,7 +360,7 @@ describe OAuth2BasicAuthenticator do
expect(job_args["url"]).to eq("http://avatar.example.com/avatar.png")
expect(job_args["user_id"]).to eq(user.id)
- expect(job_args["override_gravatar"]).to eq(false)
+ expect(job_args["associated_account_id"]).to eq(user.user_associated_accounts.first.id)
end
end
end
diff --git a/spec/jobs/download_avatar_from_url_spec.rb b/spec/jobs/download_avatar_from_url_spec.rb
index 5ec1ba9b5b0..d42257717eb 100644
--- a/spec/jobs/download_avatar_from_url_spec.rb
+++ b/spec/jobs/download_avatar_from_url_spec.rb
@@ -3,11 +3,102 @@
RSpec.describe Jobs::DownloadAvatarFromUrl do
fab!(:user)
- describe "when url is invalid" do
- it "does not raise an error" do
- expect do
- described_class.new.execute(url: "/assets/something/nice.jpg", user_id: user.id)
- end.to_not raise_error
+ context "with an associated account avatar" do
+ let(:url) { "https://avatars.example.com/avatar.png" }
+ let(:account) do
+ Fabricate(
+ :user_associated_account,
+ user: user,
+ provider_name: "google_oauth2",
+ info: {
+ image: url,
+ },
+ )
end
+ let(:upload) { Fabricate(:upload, user: user) }
+
+ before do
+ SiteSetting.google_oauth2_client_id = "client"
+ SiteSetting.google_oauth2_client_secret = "secret"
+ SiteSetting.enable_google_oauth2_logins = true
+ stub_request(:get, url).to_return(body: file_from_fixtures("logo.png"))
+ user.user_avatar.update!(custom_upload: upload)
+ user.update!(uploaded_avatar_id: upload.id)
+ end
+
+ it "retains the provider image separately without changing the chosen upload" do
+ described_class.new.execute(url: url, user_id: user.id, associated_account_id: account.id)
+
+ expect(user.reload.uploaded_avatar_id).to eq(upload.id)
+ expect(user.user_avatar.reload.custom_upload_id).to eq(upload.id)
+ expect(account.reload.avatar_upload_id).to be_present
+ expect(UploadReference.where(target: account).pluck(:upload_id)).to eq(
+ [account.avatar_upload_id],
+ )
+ end
+
+ it "updates the selected provider without replacing the custom upload" do
+ user.user_avatar.update!(selected_user_associated_account_id: account.id)
+
+ described_class.new.execute(url: url, user_id: user.id, associated_account_id: account.id)
+
+ expect(user.reload.uploaded_avatar_id).to eq(account.reload.avatar_upload_id)
+ expect(user.user_avatar.reload.custom_upload_id).to eq(upload.id)
+ end
+
+ it "ignores downloads queued before an account was disconnected" do
+ account_id = account.id
+ account.destroy!
+
+ expect {
+ described_class.new.execute(url: url, user_id: user.id, associated_account_id: account_id)
+ }.not_to change(Upload, :count)
+ expect(user.reload.uploaded_avatar_id).to eq(upload.id)
+ end
+
+ it "ignores downloads queued for a previous image URL or another user" do
+ account.update!(info: { image: "https://avatars.example.com/new.png" })
+
+ expect {
+ described_class.new.execute(url: url, user_id: user.id, associated_account_id: account.id)
+ }.not_to change(Upload, :count)
+
+ account.update!(info: { image: url }, user: Fabricate(:user))
+
+ expect {
+ described_class.new.execute(url: url, user_id: user.id, associated_account_id: account.id)
+ }.not_to change(Upload, :count)
+ end
+
+ it "keeps the previous provider image when downloading fails" do
+ account.update!(avatar_upload: upload)
+ user.user_avatar.update!(selected_user_associated_account_id: account.id)
+ stub_request(:get, url).to_return(status: Rack::Utils::SYMBOL_TO_STATUS_CODE[:not_found])
+
+ described_class.new.execute(url: url, user_id: user.id, associated_account_id: account.id)
+
+ expect(account.reload.avatar_upload_id).to eq(upload.id)
+ expect(user.reload.uploaded_avatar_id).to eq(upload.id)
+ end
+
+ it "preserves a choice made while the provider image is downloading" do
+ user.user_avatar.update!(selected_user_associated_account_id: account.id)
+ stub_request(:get, url).to_return do
+ user.user_avatar.update!(selected_user_associated_account_id: nil)
+ { body: File.binread(file_from_fixtures("logo.png")) }
+ end
+
+ described_class.new.execute(url: url, user_id: user.id, associated_account_id: account.id)
+
+ expect(account.reload.avatar_upload_id).to be_present
+ expect(user.reload.uploaded_avatar_id).to eq(upload.id)
+ expect(user.user_avatar.selected_user_associated_account_id).to be_nil
+ end
+ end
+
+ it "ignores non-HTTP avatar URLs" do
+ expect do
+ described_class.new.execute(url: "/assets/something/nice.jpg", user_id: user.id)
+ end.to_not raise_error
end
end
diff --git a/spec/jobs/update_gravatar_spec.rb b/spec/jobs/update_gravatar_spec.rb
index ff8e286cef0..4d596caf94f 100644
--- a/spec/jobs/update_gravatar_spec.rb
+++ b/spec/jobs/update_gravatar_spec.rb
@@ -2,20 +2,23 @@
RSpec.describe Jobs::UpdateGravatar do
fab!(:user)
- let(:temp) { Tempfile.new("test") }
- fab!(:upload) { Fabricate(:upload, user: user) }
- let(:avatar) { user.create_user_avatar! }
-
- it "picks gravatar if system avatar is picked and gravatar was just downloaded" do
- temp.binmode
- # tiny valid png
- temp.write(
- Base64.decode64(
- "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
- ),
+
+ it "preserves a picture chosen while Gravatar is downloading" do
+ upload = Fabricate(:upload, user: user)
+ stub_request(:get, %r{https://www.gravatar.com/avatar/}).to_return do
+ user.update!(uploaded_avatar_id: upload.id)
+ { body: File.binread(file_from_fixtures("logo.png")) }
+ end
+
+ described_class.new.execute(user_id: user.id, avatar_id: user.user_avatar.id)
+
+ expect(user.reload.uploaded_avatar_id).to eq(upload.id)
+ end
+
+ it "selects a downloaded or cached Gravatar when the system avatar is selected" do
+ stub_request(:get, %r{https://www.gravatar.com/avatar/}).to_return(
+ body: File.binread(file_from_fixtures("logo.png")),
)
- temp.rewind
- FileHelper.expects(:download).returns(temp)
Jobs.run_immediately!
@@ -30,22 +33,14 @@ RSpec.describe Jobs::UpdateGravatar do
expect(user.uploaded_avatar_id).to_not eq(nil)
expect(user.uploaded_avatar_id).to eq(user.user_avatar.gravatar_upload_id)
- temp.unlink
- end
-
- it "does not enqueue a job when user is missing their email" do
- user.primary_email.destroy
- user.reload
-
- expect(user.uploaded_avatar_id).to eq(nil)
- expect(user.user_avatar.gravatar_upload_id).to eq(nil)
-
- SiteSetting.automatically_download_gravatars = true
+ cached_gravatar_id = user.user_avatar.gravatar_upload_id
+ user.update!(uploaded_avatar_id: nil)
+ stub_request(:get, %r{https://www.gravatar.com/avatar/}).to_return(
+ status: Rack::Utils::SYMBOL_TO_STATUS_CODE[:not_found],
+ )
- expect { user.refresh_avatar }.not_to change { Jobs::UpdateGravatar.jobs.count }
- user.reload
+ described_class.new.execute(user_id: user.id, avatar_id: user.user_avatar.id)
- expect(user.uploaded_avatar_id).to eq(nil)
- expect(user.user_avatar.gravatar_upload_id).to eq(nil)
+ expect(user.reload.uploaded_avatar_id).to eq(cached_gravatar_id)
end
end
diff --git a/spec/lib/auth/github_authenticator_spec.rb b/spec/lib/auth/github_authenticator_spec.rb
index 0f313c8680e..74dd28ee372 100644
--- a/spec/lib/auth/github_authenticator_spec.rb
+++ b/spec/lib/auth/github_authenticator_spec.rb
@@ -262,32 +262,18 @@ RSpec.describe Auth::GithubAuthenticator do
end
describe "avatar retrieval" do
- let(:job_klass) { Jobs::DownloadAvatarFromUrl }
+ it "queues the GitHub picture for its associated account" do
+ expect { authenticator.after_authenticate(auth_token_for(user)) }.to change {
+ Jobs::DownloadAvatarFromUrl.jobs.size
+ }.by(1)
- context "when user has a custom avatar" do
- fab!(:user_avatar) { Fabricate(:user_avatar, custom_upload: Fabricate(:upload)) }
- fab!(:user_with_custom_avatar) { Fabricate(:user, user_avatar: user_avatar) }
+ account = user.user_associated_accounts.find_by!(provider_name: "github")
- it "does not enqueue a download_avatar_from_url job" do
- expect {
- authenticator.after_authenticate(auth_token_for(user_with_custom_avatar))
- }.to_not change(job_klass.jobs, :size)
- end
- end
-
- context "when user does not have a custom avatar" do
- it "enqueues a download_avatar_from_url job" do
- expect { authenticator.after_authenticate(auth_token_for(user)) }.to change(
- job_klass.jobs,
- :size,
- ).by(1)
-
- job_args = job_klass.jobs.last["args"].first
-
- expect(job_args["url"]).to eq("https://avatars3.githubusercontent.com/u/#{user.username}")
- expect(job_args["user_id"]).to eq(user.id)
- expect(job_args["override_gravatar"]).to eq(false)
- end
+ expect(Jobs::DownloadAvatarFromUrl.jobs.last["args"].first).to include(
+ "url" => "https://avatars3.githubusercontent.com/u/#{user.username}",
+ "user_id" => user.id,
+ "associated_account_id" => account.id,
+ )
end
end
end
diff --git a/spec/lib/auth/managed_authenticator_spec.rb b/spec/lib/auth/managed_authenticator_spec.rb
index aa6592472d8..947f37920d2 100644
--- a/spec/lib/auth/managed_authenticator_spec.rb
+++ b/spec/lib/auth/managed_authenticator_spec.rb
@@ -219,40 +219,42 @@ RSpec.describe Auth::ManagedAuthenticator do
UserAssociatedAccount.create!(user: user, provider_name: "myauth", provider_uid: "1234")
end
- it "schedules the job upon update correctly" do
- # No image supplied, do not schedule
+ it "downloads provided images without changing the selected source" do
expect { authenticator.after_authenticate(hash) }.not_to change {
Jobs::DownloadAvatarFromUrl.jobs.count
}
- # Image supplied, schedule
expect {
authenticator.after_authenticate(
hash.deep_merge(info: { image: "https://some.domain/image.jpg" }),
)
}.to change { Jobs::DownloadAvatarFromUrl.jobs.count }.by(1)
- # User already has profile picture, don't schedule
- user.user_avatar = Fabricate(:user_avatar, custom_upload: Fabricate(:upload))
- user.save!
+ user.user_avatar.update!(custom_upload: Fabricate(:upload))
+
expect {
authenticator.after_authenticate(
hash.deep_merge(info: { image: "https://some.domain/image.jpg" }),
)
- }.not_to change { Jobs::DownloadAvatarFromUrl.jobs.count }
+ }.to change { Jobs::DownloadAvatarFromUrl.jobs.count }.by(1)
+
+ expect(Jobs::DownloadAvatarFromUrl.jobs.last["args"].first["associated_account_id"]).to eq(
+ associated.id,
+ )
+ expect(user.user_avatar.reload.selected_user_associated_account_id).to be_nil
end
- it "ensures avatar is overriden when using auth_overrides_avatar" do
- # User already has profile picture and settings dictate we must override it, schedule
+ it "selects the provider when auth_overrides_avatar is enabled" do
SiteSetting.auth_overrides_avatar = true
+ user.user_avatar.update!(custom_upload: Fabricate(:upload))
- user.user_avatar = Fabricate(:user_avatar, custom_upload: Fabricate(:upload))
- user.save!
expect {
authenticator.after_authenticate(
hash.deep_merge(info: { image: "https://some.domain/image.jpg" }),
)
}.to change { Jobs::DownloadAvatarFromUrl.jobs.count }.by(1)
+
+ expect(user.user_avatar.reload.selected_user_associated_account_id).to eq(associated.id)
end
end
@@ -297,28 +299,24 @@ RSpec.describe Auth::ManagedAuthenticator do
UserAssociatedAccount.create!(provider_name: "myauth", provider_uid: "1234")
end
- it "doesn't schedule with no image" do
- expect {
- result =
- authenticator.after_create_account(user, create_auth_result(extra_data: create_hash))
- }.not_to change { Jobs::DownloadAvatarFromUrl.jobs.count }
- end
+ it "does not schedule without an image" do
+ [nil, ""].each do |image|
+ association.update!(info: { image: image })
- it "does not schedule if image is empty" do
- association.info["image"] = ""
- association.save!
- expect {
- authenticator.after_create_account(user, create_auth_result(extra_data: create_hash))
- }.not_to change { Jobs::DownloadAvatarFromUrl.jobs.count }
+ expect {
+ authenticator.after_create_account(user, create_auth_result(extra_data: create_hash))
+ }.not_to change { Jobs::DownloadAvatarFromUrl.jobs.count }
+ end
end
it "schedules with image" do
- association.info["image"] = "https://some.domain/image.jpg"
- association.save!
+ association.update!(info: { image: "https://some.domain/image.jpg" })
+
expect {
- result =
- authenticator.after_create_account(user, create_auth_result(extra_data: create_hash))
+ authenticator.after_create_account(user, create_auth_result(extra_data: create_hash))
}.to change { Jobs::DownloadAvatarFromUrl.jobs.count }.by(1)
+
+ expect(user.user_avatar.reload.selected_user_associated_account_id).to eq(association.id)
end
end
diff --git a/spec/lib/upload_security_spec.rb b/spec/lib/upload_security_spec.rb
index 658d4997ad1..e9b869cf748 100644
--- a/spec/lib/upload_security_spec.rb
+++ b/spec/lib/upload_security_spec.rb
@@ -325,6 +325,14 @@ RSpec.describe UploadSecurity do
expect(security.should_be_secure?).to eq(false)
end
end
+
+ describe "when the upload is first used for a UserAssociatedAccount avatar" do
+ it "returns false" do
+ Fabricate(:user_associated_account, avatar_upload: upload)
+ create_secure_post_reference
+ expect(security.should_be_secure?).to eq(false)
+ end
+ end
end
end
diff --git a/spec/models/user_associated_account_spec.rb b/spec/models/user_associated_account_spec.rb
new file mode 100644
index 00000000000..7cbd7f4b947
--- /dev/null
+++ b/spec/models/user_associated_account_spec.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+RSpec.describe UserAssociatedAccount do
+ fab!(:user)
+ fab!(:provider_upload) { Fabricate(:upload, user: user) }
+ fab!(:account) do
+ Fabricate(:user_associated_account, user: user, avatar_upload_id: provider_upload.id)
+ end
+
+ describe "#destroy!" do
+ it "keeps the current picture and custom upload while removing the selected provider" do
+ custom_upload = Fabricate(:upload, user: user)
+ user.update!(uploaded_avatar_id: provider_upload.id)
+ user.user_avatar.update!(
+ custom_upload_id: custom_upload.id,
+ selected_user_associated_account_id: account.id,
+ )
+
+ account.destroy!
+
+ expect(user.reload.uploaded_avatar_id).to eq(provider_upload.id)
+ expect(user.user_avatar.custom_upload_id).to eq(custom_upload.id)
+ expect(user.user_avatar.selected_user_associated_account_id).to eq(nil)
+ expect(
+ UploadReference.where(upload_id: provider_upload.id).pluck(:target_type, :target_id),
+ ).to eq([["User", user.id]])
+ end
+ end
+
+ it "clears the provider source when its uploaded image is deleted" do
+ user.update!(uploaded_avatar_id: provider_upload.id)
+ user.user_avatar.update!(selected_user_associated_account_id: account.id)
+
+ provider_upload.destroy!
+
+ expect(account.reload.avatar_upload_id).to be_nil
+ expect(user.reload.uploaded_avatar_id).to be_nil
+ expect(user.user_avatar.selected_user_associated_account_id).to be_nil
+ expect(UploadReference.where(target: account)).not_to exist
+ end
+
+ describe "#update!" do
+ it "stops following the provider when the account moves to another user" do
+ new_user = Fabricate(:user)
+ user.update!(uploaded_avatar_id: provider_upload.id)
+ user.user_avatar.update!(selected_user_associated_account_id: account.id)
+
+ account.update!(user: new_user)
+
+ expect(user.reload.uploaded_avatar_id).to eq(provider_upload.id)
+ expect(user.user_avatar.selected_user_associated_account_id).to eq(nil)
+ expect(new_user.reload.uploaded_avatar_id).to eq(nil)
+ expect(UploadReference.where(target: account).pluck(:upload_id)).to eq([provider_upload.id])
+ end
+ end
+
+ describe ".cleanup!" do
+ it "removes orphaned account image references while preserving connected accounts" do
+ orphaned_account =
+ Fabricate(:user_associated_account, avatar_upload_id: Fabricate(:upload).id)
+ orphaned_account.update_columns(user_id: nil, updated_at: 2.days.ago)
+
+ described_class.cleanup!
+
+ expect(described_class.exists?(orphaned_account.id)).to eq(false)
+ expect(UploadReference.where(target: orphaned_account)).to be_empty
+ expect(described_class.exists?(account.id)).to eq(true)
+ expect(UploadReference.where(target: account).pluck(:upload_id)).to eq([provider_upload.id])
+ end
+ end
+end
diff --git a/spec/models/user_avatar_spec.rb b/spec/models/user_avatar_spec.rb
index fd3eef5db9f..77539d3eab4 100644
--- a/spec/models/user_avatar_spec.rb
+++ b/spec/models/user_avatar_spec.rb
@@ -2,76 +2,65 @@
RSpec.describe UserAvatar do
fab!(:user)
- let(:avatar) { user.create_user_avatar! }
+ let(:avatar) { user.user_avatar }
describe "#update_gravatar!" do
- let(:temp) { Tempfile.new("test") }
-
fab!(:upload) { Fabricate(:upload, user: user) }
describe "when working" do
before do
- temp.binmode
- # tiny valid png
- temp.write(
- Base64.decode64(
- "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
- ),
+ stub_request(:get, %r{https://www.gravatar.com/avatar/}).to_return(
+ body: File.binread(file_from_fixtures("logo.png")),
)
- temp.rewind
- FileHelper.expects(:download).returns(temp)
end
- after { temp.unlink }
-
- it "can update gravatars" do
+ it "downloads and retains Gravatar when uploads are disabled" do
+ SiteSetting.authorized_extensions = ""
freeze_time
expect { avatar.update_gravatar! }.to change { Upload.count }.by(1)
expect(avatar.gravatar_upload).to eq(Upload.last)
- expect(avatar.last_gravatar_download_attempt).to eq(Time.now)
+ expect(avatar.reload.last_gravatar_download_attempt).to eq_time(Time.now)
expect(user.reload.uploaded_avatar).to eq(nil)
expect do avatar.destroy end.to_not change { Upload.count }
end
- it "updates gravatars even if uploads have been disabled" do
- SiteSetting.authorized_extensions = ""
+ it "preserves the selected provider when its picture also matches Gravatar" do
+ account = Fabricate(:user_associated_account, user: user, avatar_upload_id: upload.id)
+ user.update!(uploaded_avatar: upload)
+ avatar.update!(gravatar_upload: upload, selected_user_associated_account_id: account.id)
- expect { avatar.update_gravatar! }.to change { Upload.count }.by(1)
- expect(avatar.gravatar_upload).to eq(Upload.last)
+ avatar.update_gravatar!
+
+ expect(user.reload.uploaded_avatar_id).to eq(upload.id)
+ expect(avatar.reload.gravatar_upload).to eq(Upload.last)
end
- describe "when user has an existing custom upload" do
- it "does not change the user's uploaded avatar" do
- user.update!(uploaded_avatar: upload)
+ it "preserves the user's custom upload" do
+ user.update!(uploaded_avatar: upload)
- avatar.update!(custom_upload: upload, gravatar_upload: Fabricate(:upload, user: user))
+ avatar.update!(custom_upload: upload, gravatar_upload: Fabricate(:upload, user: user))
- avatar.update_gravatar!
+ avatar.update_gravatar!
- expect(upload.reload).to eq(upload)
- expect(user.reload.uploaded_avatar).to eq(upload)
- expect(avatar.reload.custom_upload).to eq(upload)
- expect(avatar.gravatar_upload).to eq(Upload.last)
- end
+ expect(user.reload.uploaded_avatar).to eq(upload)
+ expect(avatar.reload.custom_upload).to eq(upload)
+ expect(avatar.gravatar_upload).to eq(Upload.last)
end
- describe "when user has an existing gravatar" do
- it "updates the user's uploaded avatar" do
- user.update!(uploaded_avatar: upload)
- avatar.update!(gravatar_upload: upload)
+ it "updates the user's selected Gravatar" do
+ user.update!(uploaded_avatar: upload)
+ avatar.update!(gravatar_upload: upload)
- avatar.update_gravatar!
+ avatar.update_gravatar!
- # old upload to be cleaned up via clean_up_uploads
- expect(Upload.find_by(id: upload.id)).not_to eq(nil)
+ expect(Upload.find_by(id: upload.id)).not_to eq(nil)
- new_upload = Upload.last
+ new_upload = Upload.last
- expect(user.reload.uploaded_avatar).to eq(new_upload)
- expect(avatar.reload.gravatar_upload).to eq(new_upload)
- end
+ expect(user.reload.uploaded_avatar).to eq(new_upload)
+ expect(avatar.reload.gravatar_upload).to eq(new_upload)
end
end
@@ -85,7 +74,7 @@ RSpec.describe UserAvatar do
Upload.count
}
- expect(avatar.last_gravatar_download_attempt).to eq(Time.now)
+ expect(avatar.reload.last_gravatar_download_attempt).to eq_time(Time.now)
end
end
@@ -101,7 +90,7 @@ RSpec.describe UserAvatar do
expect do avatar.update_gravatar! end.to_not change { Upload.count }
- expect(avatar.last_gravatar_download_attempt).to eq(Time.now)
+ expect(avatar.reload.last_gravatar_download_attempt).to eq_time(Time.now)
end
end
@@ -115,6 +104,67 @@ RSpec.describe UserAvatar do
end
describe ".import_url_for_user" do
+ it "clears provider selection when a forced import reuses a cached upload" do
+ url = "https://example.com/avatar.png"
+ stub_request(:get, url).to_return(body: File.binread(file_from_fixtures("logo.png")))
+ described_class.import_url_for_user(url, user)
+
+ account =
+ Fabricate(:user_associated_account, user: user, avatar_upload_id: user.uploaded_avatar_id)
+ avatar.update!(selected_user_associated_account_id: account.id)
+
+ described_class.import_url_for_user(url, user, override_gravatar: false)
+
+ expect(avatar.reload.selected_user_associated_account_id).to eq(account.id)
+
+ described_class.import_url_for_user(url, user, override_gravatar: true)
+
+ expect(avatar.reload.selected_user_associated_account_id).to be_nil
+ expect(user.reload.uploaded_avatar_id).to eq(account.avatar_upload_id)
+ expect(avatar.custom_upload_id).to eq(account.avatar_upload_id)
+
+ custom_upload = Fabricate(:upload, user: user)
+ avatar.update!(
+ custom_upload: custom_upload,
+ gravatar_upload_id: account.avatar_upload_id,
+ selected_user_associated_account_id: account.id,
+ )
+
+ described_class.import_url_for_user(url, user, override_gravatar: true)
+
+ expect(avatar.reload.selected_user_associated_account_id).to be_nil
+ expect(avatar.custom_upload_id).to eq(custom_upload.id)
+ expect(user.reload.uploaded_avatar_id).to eq(account.avatar_upload_id)
+ end
+
+ it "ignores a download when the account moves to another user before it completes" do
+ new_user = Fabricate(:user)
+ provider_upload = Fabricate(:upload, user: user)
+ url = "https://example.com/avatar.png"
+ account =
+ Fabricate(
+ :user_associated_account,
+ user: user,
+ avatar_upload: provider_upload,
+ info: {
+ image: url,
+ },
+ )
+ user.update!(uploaded_avatar_id: provider_upload.id)
+ avatar.update!(selected_user_associated_account_id: account.id)
+ stub_request(:get, url).to_return do
+ account.update!(user: new_user)
+ { body: File.binread(file_from_fixtures("cropped.png")) }
+ end
+
+ described_class.import_url_for_user(url, user, associated_account_id: account.id)
+
+ expect(user.reload.uploaded_avatar_id).to eq(provider_upload.id)
+ expect(user.user_avatar.selected_user_associated_account_id).to eq(nil)
+ expect(new_user.reload.uploaded_avatar_id).to eq(nil)
+ expect(account.reload.avatar_upload_id).to eq(provider_upload.id)
+ end
+
it "creates user_avatar record if missing" do
user = Fabricate(:user)
user.user_avatar.destroy
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 636ae6a8093..c0af60f3361 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2004,13 +2004,21 @@ RSpec.describe User do
it "drops the stored uploads so the image cannot be re-selected" do
user = Fabricate(:user, uploaded_avatar_id: avatar.id)
- user.user_avatar.update!(custom_upload_id: avatar.id, gravatar_upload_id: gravatar.id)
+ account = Fabricate(:user_associated_account, user: user, avatar_upload: avatar)
+ user.user_avatar.update!(
+ custom_upload_id: avatar.id,
+ gravatar_upload_id: gravatar.id,
+ selected_user_associated_account_id: account.id,
+ )
user.remove_avatar!(actor)
expect(user.reload.uploaded_avatar_id).to be_nil
expect(user.user_avatar.reload.custom_upload_id).to be_nil
expect(user.user_avatar.gravatar_upload_id).to be_nil
+ expect(user.user_avatar.selected_user_associated_account_id).to be_nil
+ expect(account.reload.avatar_upload_id).to be_nil
+ expect(UploadReference.where(target: account)).not_to exist
expect(
UserHistory.exists?(action: UserHistory.actions[:removed_avatar], target_user_id: user.id),
).to eq(true)
@@ -2150,7 +2158,7 @@ RSpec.describe User do
end
describe "refresh_avatar" do
- it "enqueues the update_gravatar job when automatically downloading gravatars" do
+ it "enqueues automatic Gravatar downloads only when the user has an email" do
SiteSetting.automatically_download_gravatars = true
user = Fabricate(:user)
@@ -2158,6 +2166,11 @@ RSpec.describe User do
expect_enqueued_with(job: :update_gravatar, args: { user_id: user.id }) do
user.refresh_avatar
end
+
+ user.primary_email.destroy!
+ user.reload
+
+ expect { user.refresh_avatar }.not_to change { Jobs::UpdateGravatar.jobs.count }
end
it "enqueues rebake job instead of blocking when avatar is updated" do
@@ -3159,9 +3172,10 @@ RSpec.describe User do
SiteSetting.selectable_avatars_mode = "no_one"
user = Fabricate(:user)
- expect(user.uploaded_avatar_id).not_to be(nil)
+
expect([avatar1.id, avatar2.id]).to include(user.uploaded_avatar_id)
- expect(user.user_avatar.custom_upload_id).to eq(user.uploaded_avatar_id)
+ expect(user.user_avatar.custom_upload_id).to be_nil
+ expect(UploadReference.where(target: user, upload_id: user.uploaded_avatar_id)).to exist
end
it "does not set a random avatar when selectable avatar assignment on signup is disabled" do
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index f011c8daf46..17169841157 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -3311,10 +3311,16 @@ RSpec.describe Admin::UsersController do
before { sign_in(admin) }
it "deletes the record and logs the deletion" do
+ upload = Fabricate(:upload)
+ user_associated_accounts.update!(avatar_upload_id: upload.id)
+ user.user_avatar.update!(selected_user_associated_account_id: user_associated_accounts.id)
+
put "/admin/users/#{user.id}/delete_associated_accounts.json"
expect(response.status).to eq(200)
expect(user.user_associated_accounts).to eq([])
+ expect(user.user_avatar.reload.selected_user_associated_account_id).to be_nil
+ expect(UploadReference.where(target: user_associated_accounts)).not_to exist
expect(UserHistory.last).to have_attributes(
acting_user_id: admin.id,
target_user_id: user.id,
diff --git a/spec/requests/api/schemas/json/user_get_response.json b/spec/requests/api/schemas/json/user_get_response.json
index 4b4049aafbb..1e510a72b91 100644
--- a/spec/requests/api/schemas/json/user_get_response.json
+++ b/spec/requests/api/schemas/json/user_get_response.json
@@ -193,6 +193,12 @@
"can_edit": {
"type": "boolean"
},
+ "can_edit_avatar": {
+ "type": "boolean"
+ },
+ "can_upload_avatar": {
+ "type": "boolean"
+ },
"can_edit_username": {
"type": "boolean"
},
@@ -310,6 +316,31 @@
"system_avatar_template": {
"type": "string"
},
+ "associated_account_avatars": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
+ },
+ "upload_id": {
+ "type": "integer"
+ },
+ "avatar_template": {
+ "type": "string"
+ }
+ },
+ "required": ["id", "name", "upload_id", "avatar_template"]
+ }
+ },
+ "selected_user_associated_account_id": {
+ "type": ["integer", "null"]
+ },
"muted_usernames": {
"type": "array",
"items": {
@@ -949,6 +980,8 @@
"featured_topic",
"staged",
"can_edit",
+ "can_edit_avatar",
+ "can_upload_avatar",
"can_edit_username",
"can_edit_email",
"can_edit_name",
@@ -975,6 +1008,8 @@
"watched_first_post_category_ids",
"system_avatar_upload_id",
"system_avatar_template",
+ "associated_account_avatars",
+ "selected_user_associated_account_id",
"muted_usernames",
"ignored_usernames",
"allowed_pm_usernames",
diff --git a/spec/requests/api/schemas/json/user_update_avatar_request.json b/spec/requests/api/schemas/json/user_update_avatar_request.json
index db3b8919bf0..1da6ddb3974 100644
--- a/spec/requests/api/schemas/json/user_update_avatar_request.json
+++ b/spec/requests/api/schemas/json/user_update_avatar_request.json
@@ -4,18 +4,39 @@
"upload_id": {
"type": "integer"
},
+ "associated_account_id": {
+ "type": "integer"
+ },
"type": {
- "type": "string",
- "enum": [
- "uploaded",
- "custom",
- "gravatar",
- "system"
- ]
+ "type": "string"
}
},
"required": [
- "upload_id",
"type"
+ ],
+ "oneOf": [
+ {
+ "properties": {
+ "type": {
+ "enum": ["uploaded", "custom", "gravatar", "current"]
+ }
+ },
+ "required": ["upload_id"]
+ },
+ {
+ "properties": {
+ "type": {
+ "enum": ["associated_account"]
+ }
+ },
+ "required": ["associated_account_id"]
+ },
+ {
+ "properties": {
+ "type": {
+ "enum": ["system"]
+ }
+ }
+ }
]
}
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index e7aefd2f36b..c65dde98886 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -180,11 +180,15 @@ RSpec.describe "users" do
before do
enable_auth_provider(:google_oauth2)
- UserAssociatedAccount.create!(
- user: user,
- provider_uid: "myuid",
- provider_name: "google_oauth2",
- )
+ account =
+ UserAssociatedAccount.create!(
+ user: user,
+ provider_uid: "myuid",
+ provider_name: "google_oauth2",
+ avatar_upload: Fabricate(:upload, user: user),
+ )
+
+ user.user_avatar.update!(selected_user_associated_account_id: account.id)
end
it_behaves_like "a JSON endpoint", 200 do
@@ -220,6 +224,25 @@ RSpec.describe "users" do
let(:expected_response_schema) { expected_response_schema }
let(:expected_request_schema) { expected_request_schema }
end
+
+ context "with an associated account avatar" do
+ let(:account) do
+ Fabricate(
+ :user_associated_account,
+ user: user,
+ provider_name: "google_oauth2",
+ avatar_upload: upload,
+ )
+ end
+ let(:params) { { "associated_account_id" => account.id, "type" => "associated_account" } }
+
+ before { enable_auth_provider(:google_oauth2) }
+
+ it_behaves_like "a JSON endpoint", Rack::Utils::SYMBOL_TO_STATUS_CODE[:ok] do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
end
end
end
diff --git a/spec/requests/user_avatars_controller_spec.rb b/spec/requests/user_avatars_controller_spec.rb
index 65533f3ca90..d0830873569 100644
--- a/spec/requests/user_avatars_controller_spec.rb
+++ b/spec/requests/user_avatars_controller_spec.rb
@@ -1,6 +1,31 @@
# frozen_string_literal: true
RSpec.describe UserAvatarsController do
+ describe "#refresh_gravatar" do
+ fab!(:user)
+ fab!(:upload) { Fabricate(:upload, user: user) }
+
+ before do
+ sign_in(user)
+ user.update!(uploaded_avatar: upload)
+ user.user_avatar.update!(gravatar_upload: upload)
+ stub_request(:get, %r{https://www.gravatar.com/avatar/}).to_return(
+ body: File.binread(file_from_fixtures("logo.png")),
+ )
+ end
+
+ %i[auth_overrides_avatar discourse_connect_overrides_avatar].each do |setting|
+ it "rejects refreshing the selected Gravatar when #{setting} is enabled" do
+ SiteSetting.public_send("#{setting}=", true)
+
+ post "/user_avatar/#{user.username}/refresh_gravatar.json"
+
+ expect(response).to be_forbidden
+ expect(user.reload.uploaded_avatar_id).to eq(upload.id)
+ end
+ end
+ end
+
describe "#show_proxy_letter" do
it "returns not found if external avatar is set somewhere else" do
SiteSetting.external_system_avatars_url = "https://somewhere.else.com/avatar.png"
@@ -86,6 +111,34 @@ RSpec.describe UserAvatarsController do
end
describe "#show" do
+ it "serves a retained associated account picture when another avatar is selected" do
+ user = Fabricate(:user, uploaded_avatar: Fabricate(:upload))
+ upload =
+ File.open(file_from_fixtures("cropped.png")) do |file|
+ UploadCreator.new(file, "provider-avatar.png", type: "avatar").create_for(user.id)
+ end
+ Fabricate(:user_associated_account, user: user, avatar_upload_id: upload.id)
+
+ get "/user_avatar/default/#{user.username}/50/#{upload.id}.png"
+
+ expect(response).to be_successful
+ expect(response.media_type).to eq("image/png")
+ expect(OptimizedImage.exists?(upload_id: upload.id, width: 50, height: 50)).to eq(true)
+ end
+
+ it "redirects requests for another user's retained provider picture to the current avatar" do
+ current_upload = Fabricate(:upload)
+ user = Fabricate(:user, uploaded_avatar: current_upload)
+ provider_upload = Fabricate(:upload)
+ Fabricate(:user_associated_account, avatar_upload_id: provider_upload.id)
+
+ get "/user_avatar/default/#{user.username}/50/#{provider_upload.id}.png"
+
+ expect(response).to redirect_to(
+ UserAvatar.local_avatar_url("default", user.username_lower, current_upload.id, 50),
+ )
+ end
+
shared_examples "avatar extension correction" do
after { FileUtils.rm(Discourse.store.path_for(upload)) }
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 3aef6ab74ce..8baf021637f 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -4086,6 +4086,125 @@ RSpec.describe UsersController do
end
describe "#pick_avatar" do
+ context "with an associated account avatar" do
+ subject(:pick_associated_avatar) do
+ put "/u/#{user1.username}/preferences/avatar/pick.json",
+ params: {
+ type: "associated_account",
+ associated_account_id: account.id,
+ }
+ end
+
+ fab!(:custom_upload) { Fabricate(:upload, user: user1) }
+ fab!(:provider_upload) { Fabricate(:upload, user: user1) }
+ fab!(:account) do
+ Fabricate(
+ :user_associated_account,
+ user: user1,
+ provider_name: "google_oauth2",
+ avatar_upload_id: provider_upload.id,
+ )
+ end
+
+ before do
+ SiteSetting.google_oauth2_client_id = "client-id"
+ SiteSetting.google_oauth2_client_secret = "client-secret"
+ SiteSetting.enable_google_oauth2_logins = true
+ user1.user_avatar.update!(custom_upload_id: custom_upload.id)
+ user1.update!(uploaded_avatar_id: custom_upload.id)
+ sign_in(user1)
+ end
+
+ it "selects the associated account without replacing the uploaded picture" do
+ pick_associated_avatar
+
+ expect(response).to be_successful
+ expect(user1.reload.uploaded_avatar_id).to eq(provider_upload.id)
+ expect(user1.user_avatar.reload.custom_upload_id).to eq(custom_upload.id)
+ expect(user1.user_avatar.selected_user_associated_account_id).to eq(account.id)
+ end
+
+ it "rejects another user's associated account" do
+ account.update!(user: another_user)
+
+ pick_associated_avatar
+
+ expect(response).to be_unprocessable
+ expect(user1.reload.uploaded_avatar_id).to eq(custom_upload.id)
+ end
+
+ it "rejects an associated account without a cached avatar" do
+ account.update!(avatar_upload_id: nil)
+
+ pick_associated_avatar
+
+ expect(response).to be_unprocessable
+ expect(user1.reload.uploaded_avatar_id).to eq(custom_upload.id)
+ end
+
+ it "rejects an associated account when its provider is disabled" do
+ SiteSetting.enable_google_oauth2_logins = false
+
+ pick_associated_avatar
+
+ expect(response).to be_unprocessable
+ expect(user1.reload.uploaded_avatar_id).to eq(custom_upload.id)
+ end
+
+ it "rejects associated account selection when uploads are restricted" do
+ SiteSetting.uploaded_avatars_allowed_groups = ""
+
+ pick_associated_avatar
+
+ expect(response).to be_unprocessable
+ expect(user1.reload.uploaded_avatar_id).to eq(custom_upload.id)
+ end
+
+ it "rejects associated account selection when only presets are permitted" do
+ SiteSetting.selectable_avatars = [custom_upload, provider_upload]
+ SiteSetting.selectable_avatars_mode = "no_one"
+
+ pick_associated_avatar
+
+ expect(response).to be_unprocessable
+ expect(user1.reload.uploaded_avatar_id).to eq(custom_upload.id)
+ end
+
+ it "stops following the provider when selecting another source" do
+ {
+ system: nil,
+ custom: custom_upload.id,
+ gravatar: custom_upload.id,
+ current: provider_upload.id,
+ }.each do |type, upload_id|
+ user1.user_avatar.update!(selected_user_associated_account_id: account.id)
+ user1.update!(uploaded_avatar_id: provider_upload.id)
+
+ put "/u/#{user1.username}/preferences/avatar/pick.json",
+ params: {
+ type: type,
+ upload_id: upload_id,
+ }
+
+ expect(response).to be_successful
+ expect(user1.reload.uploaded_avatar_id).to eq(upload_id)
+ expect(user1.user_avatar.reload.custom_upload_id).to eq(custom_upload.id)
+ expect(user1.user_avatar.selected_user_associated_account_id).to be_nil
+ end
+ end
+
+ it "rejects a current picture that is no longer selected" do
+ put "/u/#{user1.username}/preferences/avatar/pick.json",
+ params: {
+ type: "current",
+ upload_id: provider_upload.id,
+ }
+
+ expect(response).to be_unprocessable
+ expect(user1.reload.uploaded_avatar_id).to eq(custom_upload.id)
+ end
+ end
+
it "raises an error when not logged in" do
put "/u/asdf/preferences/avatar/pick.json", params: { avatar_id: 1, type: "custom" }
expect(response.status).to eq(403)
@@ -4304,88 +4423,95 @@ RSpec.describe UsersController do
describe "#select_avatar" do
it "raises an error when not logged in" do
put "/u/asdf/preferences/avatar/select.json", params: { url: "https://meta.discourse.org" }
- expect(response.status).to eq(403)
+ expect(response).to be_forbidden
end
context "while logged in" do
- before { sign_in(user1) }
-
fab!(:avatar1, :upload)
fab!(:avatar2, :upload)
- let(:url) { "https://www.discourse.org" }
+
+ before do
+ sign_in(user1)
+ SiteSetting.selectable_avatars = [avatar1, avatar2]
+ SiteSetting.selectable_avatars_mode = "no_one"
+ end
+
+ %i[auth_overrides_avatar discourse_connect_overrides_avatar].each do |setting|
+ it "rejects preset selection when #{setting} is enabled" do
+ SiteSetting.public_send("#{setting}=", true)
+ user1.update!(uploaded_avatar_id: avatar2.id)
+
+ put "/u/#{user1.username}/preferences/avatar/select.json", params: { url: avatar1.url }
+
+ expect(response).to be_unprocessable
+ expect(user1.reload.uploaded_avatar_id).to eq(avatar2.id)
+ end
+ end
it "raises an error when url is blank" do
put "/u/#{user1.username}/preferences/avatar/select.json", params: { url: "" }
- expect(response.status).to eq(422)
+ expect(response).to be_unprocessable
end
it "raises an error when selectable avatars is disabled" do
- put "/u/#{user1.username}/preferences/avatar/select.json", params: { url: url }
- expect(response.status).to eq(422)
+ SiteSetting.selectable_avatars_mode = "disabled"
+
+ put "/u/#{user1.username}/preferences/avatar/select.json", params: { url: avatar1.url }
+ expect(response).to be_unprocessable
end
- context "when selectable avatars is enabled" do
- before do
- SiteSetting.selectable_avatars = [avatar1, avatar2]
- SiteSetting.selectable_avatars_mode = "no_one"
- end
+ it "raises an error when selectable avatars is empty" do
+ SiteSetting.selectable_avatars = ""
- it "raises an error when selectable avatars is empty" do
- SiteSetting.selectable_avatars = ""
- put "/u/#{user1.username}/preferences/avatar/select.json", params: { url: url }
- expect(response.status).to eq(422)
- end
+ put "/u/#{user1.username}/preferences/avatar/select.json", params: { url: avatar1.url }
+ expect(response).to be_unprocessable
+ end
- context "when selectable avatars is properly setup" do
- it "raises an error when url is not in selectable avatars list" do
- put "/u/#{user1.username}/preferences/avatar/select.json", params: { url: url }
- expect(response.status).to eq(422)
- end
+ it "raises an error when url is not in selectable avatars list" do
+ put "/u/#{user1.username}/preferences/avatar/select.json",
+ params: {
+ url: Fabricate(:upload).url,
+ }
+ expect(response).to be_unprocessable
+ end
- it "can successfully select an avatar" do
- events =
- DiscourseEvent.track_events do
- put "/u/#{user1.username}/preferences/avatar/select.json",
- params: {
- url: avatar1.url,
- }
- end
+ it "selects raw and cooked preset URLs without replacing the uploaded picture" do
+ custom_upload = Fabricate(:upload, user: user1)
+ account = Fabricate(:user_associated_account, user: user1)
+ user1.user_avatar.update!(custom_upload_id: custom_upload.id)
- expect(events.map { |event| event[:event_name] }).to include(:user_updated)
- expect(response.status).to eq(200)
- expect(user1.reload.uploaded_avatar_id).to eq(avatar1.id)
- expect(user1.user_avatar.reload.custom_upload_id).to eq(avatar1.id)
- end
+ { avatar1 => avatar1.url, avatar2 => UrlHelper.cook_url(avatar2.url) }.each do |avatar, url|
+ user1.user_avatar.update!(selected_user_associated_account_id: account.id)
- it "can successfully select an avatar using a cooked URL" do
- events =
- DiscourseEvent.track_events do
- put "/u/#{user1.username}/preferences/avatar/select.json",
- params: {
- url: UrlHelper.cook_url(avatar1.url),
- }
- end
+ events =
+ DiscourseEvent.track_events do
+ put "/u/#{user1.username}/preferences/avatar/select.json", params: { url: url }
+ end
- expect(events.map { |event| event[:event_name] }).to include(:user_updated)
- expect(response.status).to eq(200)
- expect(user1.reload.uploaded_avatar_id).to eq(avatar1.id)
- expect(user1.user_avatar.reload.custom_upload_id).to eq(avatar1.id)
- end
+ expect(events.map { |event| event[:event_name] }).to include(:user_updated)
+ expect(response).to be_successful
+ expect(user1.reload.uploaded_avatar_id).to eq(avatar.id)
+ expect(user1.user_avatar.reload.custom_upload_id).to eq(custom_upload.id)
+ expect(user1.user_avatar.selected_user_associated_account_id).to be_nil
+ expect(response.parsed_body["custom_avatar_template"]).to eq(
+ User.avatar_template(user1.username, custom_upload.id),
+ )
+ end
+ end
- it "disables the use_site_small_logo_as_system_avatar setting when picking an avatar for the system user" do
- system_user = Discourse.system_user
- SiteSetting.use_site_small_logo_as_system_avatar = true
- sign_in(system_user)
+ it "disables the use_site_small_logo_as_system_avatar setting when picking an avatar for the system user" do
+ system_user = Discourse.system_user
+ SiteSetting.use_site_small_logo_as_system_avatar = true
+ sign_in(system_user)
- put "/u/#{system_user.username}/preferences/avatar/select.json",
- params: {
- url: UrlHelper.cook_url(avatar1.url),
- }
+ put "/u/#{system_user.username}/preferences/avatar/select.json",
+ params: {
+ url: UrlHelper.cook_url(avatar1.url),
+ }
- expect(response.status).to eq(200)
- expect(SiteSetting.use_site_small_logo_as_system_avatar).to eq(false)
- end
- end
+ expect(response).to be_successful
+ expect(system_user.user_avatar.reload.custom_upload_id).to be_nil
+ expect(SiteSetting.use_site_small_logo_as_system_avatar).to eq(false)
end
end
end
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index 97c5913ebd1..ace8a5d6c94 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -5,6 +5,65 @@ RSpec.describe UserSerializer do
before { user.user_stat.update!(post_count: 1, topic_count: 2) }
+ context "with associated account avatars" do
+ fab!(:upload)
+ fab!(:account) do
+ Fabricate(
+ :user_associated_account,
+ user: user,
+ provider_name: "google_oauth2",
+ avatar_upload_id: upload.id,
+ )
+ end
+
+ before do
+ SiteSetting.google_oauth2_client_id = "client-id"
+ SiteSetting.google_oauth2_client_secret = "client-secret"
+ SiteSetting.enable_google_oauth2_logins = true
+ user.user_avatar.update!(selected_user_associated_account_id: account.id)
+ end
+
+ it "includes the retained provider picture and selected source for its owner" do
+ json = described_class.new(user, scope: user.guardian, root: false).as_json
+
+ expect(json[:associated_account_avatars]).to eq(
+ [
+ {
+ id: account.id,
+ name: account.provider_name,
+ upload_id: upload.id,
+ avatar_template: User.avatar_template(user.username, upload.id),
+ },
+ ],
+ )
+ expect(json[:selected_user_associated_account_id]).to eq(account.id)
+ end
+
+ it "excludes disabled providers and accounts without a retained picture" do
+ account.update!(avatar_upload_id: nil)
+
+ json = described_class.new(user, scope: user.guardian, root: false).as_json
+
+ expect(json[:associated_account_avatars]).to eq([])
+
+ account.update!(avatar_upload_id: upload.id)
+ SiteSetting.enable_google_oauth2_logins = false
+
+ json = described_class.new(user, scope: user.guardian, root: false).as_json
+
+ expect(json[:associated_account_avatars]).to eq([])
+ end
+
+ it "keeps provider choices and selection private" do
+ [Guardian.new, Fabricate(:user).guardian].each do |scope|
+ json = described_class.new(user, scope: scope, root: false).as_json
+
+ expect(json).not_to have_key(:associated_account_avatars)
+ expect(json).not_to have_key(:selected_user_associated_account_id)
+ end
+ end
+ end
+
context "with a TL0 user seen as anonymous" do
let(:serializer) { UserSerializer.new(user, scope: Guardian.new, root: false) }
let(:json) { serializer.as_json }
@@ -42,6 +101,30 @@ RSpec.describe UserSerializer do
end
context "as current user" do
+ it "allows admins, but not anonymous users, to upload an anonymous user's avatar" do
+ SiteSetting.allow_anonymous_mode = true
+ anonymous_user = Fabricate(:anonymous, refresh_auto_groups: true)
+
+ json =
+ described_class.new(anonymous_user, scope: anonymous_user.guardian, root: false).as_json
+
+ expect(json[:can_upload_avatar]).to eq(false)
+
+ json =
+ described_class.new(anonymous_user, scope: Fabricate(:admin).guardian, root: false).as_json
+
+ expect(json[:can_upload_avatar]).to eq(true)
+ end
+
+ it "previews the configured default for the system avatar choice" do
+ default_avatar_template = "https://example.com/default-avatar/{size}.png"
+ SiteSetting.default_avatars = default_avatar_template
+
+ json = described_class.new(user, scope: user.guardian, root: false).as_json
+
+ expect(json[:system_avatar_template]).to eq(default_avatar_template)
+ end
+
it "serializes options correctly" do
# so we serialize more stuff
SiteSetting.default_other_auto_track_topics_after_msecs = 0