A platform for community discussion. Free, open, simple.
FIX: enforce `full_name_requirement` on Discourse ID signups (#39831)
Keegan Georgec4c9e1bc05e9
diff --git a/frontend/discourse/app/instance-initializers/auth-complete.js b/frontend/discourse/app/instance-initializers/auth-complete.jsindex 5c57b79a766..89da35b071f 100644--- a/frontend/discourse/app/instance-initializers/auth-complete.js+++ b/frontend/discourse/app/instance-initializers/auth-complete.js@@ -96,13 +96,20 @@ export default {}next(() => {+ const site = owner.lookup("service:site");+ const hasRequiredName =+ !site.full_name_required_for_signup ||+ options.name_from_provider;+const props = {accountEmail: options.email,accountUsername: options.username,accountName: options.name,authOptions: EmberObject.create(options),skipConfirmation:- siteSettings.auth_skip_create_confirm && options.username,+ siteSettings.auth_skip_create_confirm &&+ options.username &&+ hasRequiredName,};router.transitionTo("signup").then(() => {diff --git a/frontend/discourse/tests/acceptance/create-account-external-test.js b/frontend/discourse/tests/acceptance/create-account-external-test.jsindex c85db41a146..fd0de7c358d 100644--- a/frontend/discourse/tests/acceptance/create-account-external-test.js+++ b/frontend/discourse/tests/acceptance/create-account-external-test.js@@ -73,6 +73,52 @@ acceptance(});+acceptance(+ "Create Account - external auth with full name required but not from provider",+ function (needs) {+ needs.hooks.beforeEach(function () {+ setupAuthData({ name: "Testuser", name_from_provider: false });+ });+ needs.hooks.afterEach(function () {+ document.getElementById("data-authentication").remove();+ });++ needs.site({ full_name_required_for_signup: true });++ test("when skip is enabled but name is required and not from provider, shows form", async function (assert) {+ this.siteSettings.auth_skip_create_confirm = true;+ await visit("/");++ assert.dom(".signup-fullpage").exists("it shows the signup page");+ assert.dom("#new-account-name").exists("it shows the name field");+ });+ }+);++acceptance(+ "Create Account - external auth with full name required and from provider",+ function (needs) {+ needs.hooks.beforeEach(function () {+ setupAuthData({ name: "John Doe", name_from_provider: true });+ });+ needs.hooks.afterEach(function () {+ document.getElementById("data-authentication").remove();+ });++ needs.site({ full_name_required_for_signup: true });++ test("when skip is enabled and name is from provider, skips form", async function (assert) {+ this.siteSettings.auth_skip_create_confirm = true;+ await visit("/");++ assert.dom(".signup-fullpage").exists("it shows the signup page");+ assert+ .dom("#new-account-username")+ .doesNotExist("it does not show the fields");+ });+ }+);+acceptance("Create account - with associate link", function (needs) {needs.hooks.beforeEach(function () {setupAuthData({ associate_url: "/associate/abcde" });diff --git a/lib/auth/discourse_id_authenticator.rb b/lib/auth/discourse_id_authenticator.rbindex d9f3d3dfecb..21837673bf6 100644--- a/lib/auth/discourse_id_authenticator.rb+++ b/lib/auth/discourse_id_authenticator.rb@@ -24,6 +24,7 @@ class Auth::DiscourseIdAuthenticator < Auth::ManagedAuthenticatorinfo do{nickname: access_token.params["info"]["username"],+ name: access_token.params["info"]["name"],email: access_token.params["info"]["email"],image: access_token.params["info"]["image"],}diff --git a/lib/auth/result.rb b/lib/auth/result.rbindex 716e2dd4440..d113ecc91b0 100644--- a/lib/auth/result.rb+++ b/lib/auth/result.rb@@ -172,6 +172,7 @@ class Auth::Resultif SiteSetting.enable_names?result[:name] = name.presence+ result[:name_from_provider] = name.present?result[:name] ||= User.suggest_name(username || email) if can_edit_nameenddiff --git a/spec/lib/auth/discourse_id_authenticator_spec.rb b/spec/lib/auth/discourse_id_authenticator_spec.rbindex d11273e862b..eddfe72634f 100644--- a/spec/lib/auth/discourse_id_authenticator_spec.rb+++ b/spec/lib/auth/discourse_id_authenticator_spec.rb@@ -146,6 +146,7 @@ describe Auth::DiscourseIdAuthenticator doprovider: "discourse_id",info: {"nickname" => "test_user",+ "name" => "Test User","email" => user.email,"image" => "http://example.com/avatar.png","uuid" => "12345",@@ -155,12 +156,13 @@ describe Auth::DiscourseIdAuthenticator doenddescribe "after_authenticate" do- it "works and syncs username, email, avatar" do+ it "works and syncs username, email, name, avatar" doresult = authenticator.after_authenticate(hash)expect(result.user).to eq(user)expect(result.failed).to eq(false)expect(result.username).to eq("test_user")+ expect(result.name).to eq("Test User")expect(result.email).to eq(user.email)associated_record =@@ -169,5 +171,25 @@ describe Auth::DiscourseIdAuthenticator doexpect(associated_record[:info]["image"]).to eq("http://example.com/avatar.png")expect(associated_record[:info]["uuid"]).to eq("12345")end++ context "when name is not provided by the provider" do+ let(:hash_without_name) do+ OmniAuth::AuthHash.new(+ provider: "discourse_id",+ info: {+ "nickname" => "test_user",+ "email" => user.email,+ "image" => "http://example.com/avatar.png",+ "uuid" => "12345",+ },+ uid: "99",+ )+ end++ it "result name is nil" do+ result = authenticator.after_authenticate(hash_without_name)+ expect(result.name).to be_nil+ end+ endendenddiff --git a/spec/system/discourse_id_spec.rb b/spec/system/discourse_id_spec.rbindex 8a2ab4c4570..139d095a050 100644--- a/spec/system/discourse_id_spec.rb+++ b/spec/system/discourse_id_spec.rb@@ -43,6 +43,38 @@ describe "discourse login client auth" dosignup_form.open.click_social_button("discourse_id")expect(page).to have_css(".header-dropdown-toggle.current-user")end++ context "when full_name_requirement is required_at_signup" do+ before { SiteSetting.full_name_requirement = "required_at_signup" }++ it "shows the signup form when name is not provided by the provider" do+ visit("/")+ signup_form.open.click_social_button("discourse_id")+ expect(signup_form).to be_open+ expect(page).to have_css("#new-account-name")+ end++ context "when name is provided by the provider" do+ before do+ OmniAuth.config.mock_auth[:discourse_id] = OmniAuth::AuthHash.new(+ provider: "discourse_id",+ uid: OmniauthHelpers::UID,+ info:+ OmniAuth::AuthHash::InfoHash.new(+ email: OmniauthHelpers::EMAIL,+ nickname: OmniauthHelpers::USERNAME,+ name: "John Doe",+ ),+ )+ end++ it "skips the signup form and creates the account directly" do+ visit("/")+ signup_form.open.click_social_button("discourse_id")+ expect(page).to have_css(".header-dropdown-toggle.current-user")+ end+ end+ endendend