Skip to content

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

FIX: Allow random usernames in email code signup on login-required sites (#45238)

Keegan George7ef2f0ec1375
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 4a62aa5912c..67d09ed0e85 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -39,6 +39,7 @@ class SessionController < ApplicationController
ACTIVATE_USER_KEY = "activate_user"
FORGOT_PASSWORD_EMAIL_LIMIT_PER_DAY = 6
LOGIN_CODE_SIGNUP_KEY_PREFIX = "login-code-signup-"
+ LOGIN_CODE_USERNAME_STEP_KEY = "login-code-username-step"
GENERATED_USERNAME_SIGNUP_KEY_PREFIX = "login-code-generated-username-"
GENERATED_USERNAME_SIGNUP_INDEX_KEY = "login-code-generated-username-ids"
GENERATED_USERNAME_ATTEMPTS = 5
@@ -1313,6 +1314,7 @@ class SessionController < ApplicationController
if generated_username
store_generated_username_signup(login_code, email, username, signup_context)
end
+ store_login_code_username_step(login_code) if login_code
trust_level = invite ? SiteSetting.default_invitee_trust_level : SiteSetting.default_trust_level
group_ids =
@@ -1396,6 +1398,15 @@ class SessionController < ApplicationController
server_session.set(GENERATED_USERNAME_SIGNUP_INDEX_KEY, ids, expires: ServerSession.expiry)
end
+ # Lets the username step roll random usernames on login-required sites. Only
+ # reached once the code has matched, so the visitor owns the email.
+ def store_login_code_username_step(login_code)
+ expires_in = (login_code.expires_at - Time.zone.now).ceil
+ return if expires_in <= 0
+
+ server_session.set(LOGIN_CODE_USERNAME_STEP_KEY, true, expires: expires_in)
+ end
+
def generated_username_signup_key(login_code_id)
"#{GENERATED_USERNAME_SIGNUP_KEY_PREFIX}#{login_code_id}"
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 95a4dac5898..7b8b5bda585 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2132,6 +2132,7 @@ class UsersController < ApplicationController
raise Discourse::NotFound if !SiteSetting.enable_random_usernames
return redirect_to_login_if_required if current_user
return if !SiteSetting.login_required?
+ return if server_session[SessionController::LOGIN_CODE_USERNAME_STEP_KEY] == true
signup_token = request.headers["X-Discourse-Signup-Token"].to_s
signup_proof =
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index f11721922e2..7f783cfa94d 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -2584,6 +2584,61 @@ RSpec.describe UsersController do
expect(User.find_by_email(login_code.email)).to be_nil
expect(session[:current_user_id]).to be_nil
end
+
+ it "allows a verified email code signup that is choosing a username" do
+ SiteSetting.enable_local_logins_via_code = true
+ login_code = EmailLoginCode.generate!(email: "[email protected]")
+
+ post "/session/login-code/verify.json",
+ params: {
+ email: login_code.email,
+ code: login_code.code,
+ }
+ expect(response.parsed_body["username_required"]).to eq(true)
+
+ get "/u/random-username.json"
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["username"]).to be_present
+ expect(User.find_by_email(login_code.email)).to be_nil
+ expect(session[:current_user_id]).to be_nil
+ end
+
+ it "allows a verified invite code signup that is choosing a username" do
+ SiteSetting.enable_local_logins_via_code = true
+ invite = Fabricate(:invite, email: "[email protected]")
+ login_code = EmailLoginCode.generate!(email: invite.email)
+
+ post "/session/login-code/verify.json",
+ params: {
+ invite_key: invite.invite_key,
+ code: login_code.code,
+ }
+ expect(response.parsed_body["username_required"]).to eq(true)
+
+ get "/u/random-username.json"
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["username"]).to be_present
+ expect(invite.reload).not_to be_redeemed
+ end
+
+ it "rejects an email code signup that entered the wrong code" do
+ SiteSetting.enable_local_logins_via_code = true
+ login_code = EmailLoginCode.generate!(email: "[email protected]")
+ wrong_code = login_code.code == "000000" ? "000001" : "000000"
+
+ post "/session/login-code/verify.json",
+ params: {
+ email: login_code.email,
+ code: wrong_code,
+ }
+ expect(response.parsed_body["username_required"]).to be_nil
+
+ get "/u/random-username.json"
+
+ expect(response.status).to eq(403)
+ end
end
it "keeps an uploaded avatar when generating a username" do
diff --git a/spec/system/code_signup_spec.rb b/spec/system/code_signup_spec.rb
index 263ae05438c..8498fff0689 100644
--- a/spec/system/code_signup_spec.rb
+++ b/spec/system/code_signup_spec.rb
@@ -72,6 +72,23 @@ describe "Sign up via email code" do
expect(user.user_password).to be_nil
end
+ it "rolls a new random username on a login-required site" do
+ SiteSetting.enable_random_usernames = true
+ SiteSetting.login_required = true
+
+ open_code_signup
+ submit_email("[email protected]")
+ fill_code(latest_emailed_code("[email protected]"))
+
+ expect(page).to have_css(".code-login-form__signup-details-step")
+ generated = find("#code-login-username").value
+
+ find(".code-login-form__username-regen").click
+
+ expect(page).to have_no_field("code-login-username", with: generated)
+ expect(page).to have_no_css(".dialog-container")
+ end
+
it "shows a single heading that is replaced as the flow advances" do
open_code_signup