Skip to content

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

FIX: Update avatar when regenerating username (#43536)

Keegan George3f2bd9cd6037
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2b1d4b0f17b..a6d482cc8ab 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -658,7 +658,16 @@ class UsersController < ApplicationController
)
end
- render json: { username: }
+ # Keep a chosen avatar intact. Otherwise return the avatar derived from the
+ # suggestion so account-setup screens can update their preview immediately.
+ avatar_template =
+ if current_user&.uploaded_avatar_id
+ current_user.avatar_template
+ else
+ User.default_template(username)
+ end
+
+ render json: { username:, avatar_template: }
end
def check_email
diff --git a/frontend/discourse/app/components/code-login-form.gjs b/frontend/discourse/app/components/code-login-form.gjs
index 5cde2f1f645..b86d6df99e3 100644
--- a/frontend/discourse/app/components/code-login-form.gjs
+++ b/frontend/discourse/app/components/code-login-form.gjs
@@ -435,6 +435,7 @@ export default class CodeLoginForm extends Component {
}
this.username = result.username;
+ this.avatarTemplate = result.avatar_template;
this.usernameError = null;
this.usernameAvailable = false;
await this.checkUsernameAvailability();
diff --git a/frontend/discourse/tests/integration/components/code-login-form-test.gjs b/frontend/discourse/tests/integration/components/code-login-form-test.gjs
index 74b710b87f4..3463345a30e 100644
--- a/frontend/discourse/tests/integration/components/code-login-form-test.gjs
+++ b/frontend/discourse/tests/integration/components/code-login-form-test.gjs
@@ -372,17 +372,24 @@ module("Integration | Component | CodeLoginForm", function (hooks) {
})
);
pretender.get("/u/random-username.json", () =>
- response({ username: "QuietFalcon" })
+ response({
+ username: "QuietFalcon",
+ avatar_template: "/letter/q.png",
+ })
);
await goToCodeStep();
await fillIn(".d-otp-input", "123456");
assert.dom("#code-login-username").hasValue("jane");
+ assert.dom(".code-login-form__avatar img").hasAttribute("src", /letter\/j/);
await click(".code-login-form__username-regen");
assert.dom("#code-login-username").hasValue("QuietFalcon");
+ assert
+ .dom(".code-login-form__avatar img")
+ .hasAttribute("src", /letter\/q/, "the avatar follows the new username");
assert.dom(".code-login-form__continue-to-site").isEnabled();
});
@@ -399,7 +406,7 @@ module("Integration | Component | CodeLoginForm", function (hooks) {
// The default pretender handler reports the username "taken" as
// unavailable with the suggestion "nottaken".
pretender.get("/u/random-username.json", () =>
- response({ username: "taken" })
+ response({ username: "taken", avatar_template: "/letter/t.png" })
);
await goToCodeStep();
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 90f74c287e5..13209903150 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -2413,7 +2413,21 @@ RSpec.describe UsersController do
get "/u/random-username.json"
expect(response.status).to eq(200)
- expect(response.parsed_body["username"]).to match(/\A[A-Z][a-z]+[A-Z][a-z]+\d+\z/)
+ username = response.parsed_body["username"]
+ expect(username).to match(/\A[A-Z][a-z]+[A-Z][a-z]+\d+\z/)
+ expect(response.parsed_body["avatar_template"]).to eq(User.default_template(username))
+ end
+
+ it "keeps an uploaded avatar when generating a username" do
+ user = Fabricate(:user)
+ upload = Fabricate(:upload, user:)
+ user.update!(uploaded_avatar_id: upload.id)
+ sign_in(user)
+
+ get "/u/random-username.json"
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["avatar_template"]).to eq(user.avatar_template)
end
it "rate limits requests per IP" do