+
<%= admin_config_label :feed_style, model: Settings::UserExperience %>
<%= admin_config_description Constants::Settings::UserExperience.details[:feed_style][:description] %>
<%= select_tag "settings_user_experience[feed_style]",
diff --git a/config/locales/lib/en.yml b/config/locales/lib/en.yml
index 1a607f6c0..08dca1668 100644
--- a/config/locales/lib/en.yml
+++ b/config/locales/lib/en.yml
@@ -37,6 +37,9 @@ en:
description: The "Client Secret" portion of the OAuth 2.0 page on the Google Cloud Platform portal
invite_only:
description: Only users invited by email can join this community.
+ new_user_status:
+ description: What status do you want to apply to new users?
+ placeholder: Good standing
providers:
description: How can users sign in?
recaptcha_secret:
diff --git a/config/locales/lib/fr.yml b/config/locales/lib/fr.yml
index 7f58957ab..b43fc64ed 100644
--- a/config/locales/lib/fr.yml
+++ b/config/locales/lib/fr.yml
@@ -37,6 +37,9 @@ fr:
description: The "Client Secret" portion of the OAuth 2.0 page on the Google Cloud Platform portal
invite_only:
description: Only users invited by email can join this community.
+ new_user_status:
+ description: What status do you want to apply to new users?
+ placeholder: Good standing
providers:
description: How can users sign in?
recaptcha_secret:
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index b04bfe6ea..fb89f40b8 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -663,6 +663,69 @@ RSpec.describe User do
end
end
+ describe "#set_initial_roles!" do
+ it "adds creator roles if waiting on first user" do
+ allow(Settings::General).to receive(:waiting_on_first_user).and_return(true)
+
+ user = create(:user)
+ user.set_initial_roles!
+
+ expect(user).to be_creator
+ expect(user).to be_super_admin
+ expect(user).to be_trusted
+ expect(user).not_to be_limited
+ end
+
+ it "does not add any roles if not waiting on first user" do
+ user = create(:user)
+ user.set_initial_roles!
+
+ expect(user).not_to be_creator
+ expect(user).not_to be_super_admin
+ expect(user).not_to be_trusted
+ expect(user).not_to be_limited
+ end
+
+ it "adds the limited role to a new user if the new user status setting is limited" do
+ allow(Settings::Authentication).to receive(:new_user_status).and_return("limited")
+
+ user = create(:user)
+ user.set_initial_roles!
+
+ expect(user).not_to be_creator
+ expect(user).not_to be_super_admin
+ expect(user).not_to be_trusted
+ expect(user).to be_limited
+ end
+
+ it "does not change any roles if the user is not a new user" do
+ create(:user, :trusted, email: "trusted-user@forem.test")
+
+ # Now considered an already existing record to ActiveRecord
+ user = described_class.find_by(email: "trusted-user@forem.test")
+ expect(UserRole.count).to eq(1)
+
+ expect { user.set_initial_roles! }.not_to change(UserRole, :count)
+ expect(user).to be_trusted
+ end
+
+ it "does not change any roles if the user is not valid" do
+ user = create(:user, :tag_moderator)
+ expect(UserRole.count).to eq(1)
+
+ user.username = ""
+ expect { user.set_initial_roles! }.not_to change(UserRole, :count)
+ expect(user).to be_tag_moderator
+ end
+
+ it "does nothing if the user has not been persisted" do
+ user = build(:user)
+ expect(UserRole.count).to eq(0)
+
+ expect { user.set_initial_roles! }.not_to change(UserRole, :count)
+ end
+ end
+
describe "#calculate_score" do
it "calculates a score" do
user.update_column(:badge_achievements_count, 3)
diff --git a/spec/requests/registrations_spec.rb b/spec/requests/registrations_spec.rb
index 9935ab8a9..7662a38a3 100644
--- a/spec/requests/registrations_spec.rb
+++ b/spec/requests/registrations_spec.rb
@@ -232,15 +232,46 @@ RSpec.describe "Registrations" do
expect(User.all.size).to be 1
end
- it "marks as registered" do
+ it "registers a user in good standing" do
post "/users", params:
{ user: { name: "test #{rand(10)}",
username: "haha_#{rand(10)}",
email: "yoooo#{rand(100)}@yo.co",
password: "PaSSw0rd_yo000",
password_confirmation: "PaSSw0rd_yo000" } }
- expect(User.last.registered).to be true
- expect(User.last.registered_at).not_to be_nil
+
+ new_user = User.last
+ expect(new_user.registered).to be true
+ expect(new_user.registered_at).not_to be_nil
+ expect(new_user).not_to be_limited
+ end
+
+ it "limits the user if the admins have set new user status to limited" do
+ allow(Settings::Authentication).to receive(:new_user_status).and_return("limited")
+
+ user = build(:user)
+ user_attributes = user.slice(:name, :username, :email)
+
+ post "/users", params:
+ { user: { **user_attributes, password: "Passw0rd!", password_confirmation: "Passw0rd!" } }
+
+ new_user = User.last
+ expect(new_user.registered).to be true
+ expect(new_user.registered_at).not_to be_nil
+ expect(new_user).to be_limited
+ end
+
+ it "logs in user and redirects to the root path" do
+ user = build(:user)
+ user_attributes = user.slice(:name, :username, :email)
+
+ post "/users", params:
+ { user: { **user_attributes, password: "Passw0rd!", password_confirmation: "Passw0rd!" } }
+
+ new_user = User.last
+ expect(new_user).to have_attributes(user_attributes)
+ expect(controller.current_user).to eq(new_user)
+ expect(response).to redirect_to(root_path)
end
it "does not create user with password confirmation mismatch" do
@@ -264,6 +295,44 @@ RSpec.describe "Registrations" do
end
end
+ context "when email registration is allowed and confirmation is required" do
+ before do
+ allow(Settings::Authentication).to receive(:allow_email_password_registration).and_return(true)
+ allow(ForemInstance).to receive(:smtp_enabled?).and_return(true)
+ allow_any_instance_of(ProfileImageUploader).to receive(:download!)
+ end
+
+ it "registers the user but does not log them in" do
+ user = build(:user)
+ user_attributes = user.slice(:name, :username, :email)
+
+ post "/users", params:
+ { user: { **user_attributes, password: "Passw0rd!", password_confirmation: "Passw0rd!" } }
+
+ new_user = User.last
+ expect(new_user.registered).to be true
+ expect(new_user.registered_at).not_to be_nil
+ expect(new_user).not_to be_limited
+ expect(controller.current_user).to be_nil
+ expect(response).to redirect_to(confirm_email_path(email: user.email))
+ end
+
+ it "also limits the user first if the admins have set new user status to limited" do
+ allow(Settings::Authentication).to receive(:new_user_status).and_return("limited")
+
+ user = build(:user)
+ user_attributes = user.slice(:name, :username, :email)
+
+ post "/users", params:
+ { user: { **user_attributes, password: "Passw0rd!", password_confirmation: "Passw0rd!" } }
+
+ new_user = User.last
+ expect(new_user).to be_limited
+ expect(controller.current_user).to be_nil
+ expect(response).to redirect_to(confirm_email_path(email: user.email))
+ end
+ end
+
context "when email registration allowed and email allow list empty" do
before do
allow_any_instance_of(ProfileImageUploader).to receive(:download!)
@@ -379,6 +448,20 @@ RSpec.describe "Registrations" do
expect(User.first.email).to eq user_email
end
+ it "logs in user and redirects them to the creator settings path" do
+ user = build(:user)
+ user_attributes = user.slice(:name, :username, :email)
+
+ post "/users", params:
+ { user: { **user_attributes, password: "Passw0rd!", password_confirmation: "Passw0rd!" } }
+
+ new_user = User.first
+ expect(new_user.registered).to be true
+ expect(new_user.registered_at).not_to be_nil
+ expect(controller.current_user).to eq(new_user)
+ expect(response).to redirect_to(new_admin_creator_setting_path)
+ end
+
it "makes user super admin and config admin" do
post "/users", params:
{ user: { name: "test #{rand(10)}",
@@ -388,6 +471,8 @@ RSpec.describe "Registrations" do
password_confirmation: "PaSSw0rd_yo000" } }
expect(User.first.super_admin?).to be true
expect(User.first.trusted?).to be true
+ expect(User.first.creator?).to be true
+ expect(User.first.limited?).to be false
end
it "creates mascot user" do
@@ -471,6 +556,9 @@ RSpec.describe "Registrations" do
password: "PaSSw0rd_yo000",
password_confirmation: "PaSSw0rd_yo000" } }
expect(User.first.super_admin?).to be true
+ expect(User.first.trusted?).to be true
+ expect(User.first.creator?).to be true
+ expect(User.first.limited?).to be false
end
end
end
diff --git a/spec/services/authentication/authenticator_spec.rb b/spec/services/authentication/authenticator_spec.rb
index 863e8d26f..ef0b8e39c 100644
--- a/spec/services/authentication/authenticator_spec.rb
+++ b/spec/services/authentication/authenticator_spec.rb
@@ -19,6 +19,48 @@ RSpec.describe Authentication::Authenticator, type: :service do
end
end
+ shared_examples "preserves existing user roles" do
+ it "does not make any changes to roles if the user already exists" do
+ existing_user = create(:user, :trusted)
+ auth_payload.info.email = existing_user.email
+
+ expect do
+ user = service.call
+ expect(user).to eq(existing_user)
+ expect(user).to be_trusted
+ expect(user).not_to be_limited
+ end.not_to change(existing_user.roles, :count)
+ end
+ end
+
+ shared_examples "appropriate new user status" do
+ it "registers a user in good standing by default" do
+ user = service.call
+
+ expect(user.registered).to be(true)
+ expect(user.registered_at).not_to be_nil
+ expect(user).not_to be_limited
+ end
+
+ include_examples "preserves existing user roles"
+
+ context "when new user status admin setting is limited" do
+ before do
+ allow(Settings::Authentication).to receive(:new_user_status).and_return("limited")
+ end
+
+ it "registers the user as limited" do
+ user = service.call
+
+ expect(user.registered).to be(true)
+ expect(user.registered_at).not_to be_nil
+ expect(user).to be_limited
+ end
+
+ include_examples "preserves existing user roles"
+ end
+ end
+
context "when authenticating through an unknown provider" do
it "raises ProviderNotFound" do
auth_payload = OmniAuth.config.mock_auth[:github].merge(provider: "okta")
@@ -34,6 +76,8 @@ RSpec.describe Authentication::Authenticator, type: :service do
include_context "spam handling"
+ include_context "appropriate new user status"
+
describe "new user" do
it "creates a new user" do
expect do
@@ -229,6 +273,8 @@ RSpec.describe Authentication::Authenticator, type: :service do
include_context "spam handling"
+ include_context "appropriate new user status"
+
describe "new user" do
it "creates a new user" do
expect do
@@ -422,6 +468,8 @@ RSpec.describe Authentication::Authenticator, type: :service do
include_context "spam handling"
+ include_context "appropriate new user status"
+
describe "new user" do
it "creates a new user" do
expect do
@@ -507,6 +555,8 @@ RSpec.describe Authentication::Authenticator, type: :service do
include_context "spam handling"
+ include_context "appropriate new user status"
+
describe "new user" do
it "creates a new user" do
expect do
@@ -685,6 +735,8 @@ RSpec.describe Authentication::Authenticator, type: :service do
include_context "spam handling"
+ include_context "appropriate new user status"
+
describe "new user" do
it "creates a new user" do
expect do