github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't error out on empty reserved_usernames setting (#29305)

Browse Source 
We're seeing errors in logs due to some sites setting the reserved_usernames setting to nil. This is causing multiple use cases upstream of User#reserved_username? to error out.

This commit changes from using the raw #reserved_usernames to using the #reserved_usernames_map helper which exists on list-type site settings. It returns an empty array if the raw value is nil or empty string.
This commit is contained in:
Ted Johansson
2024-10-21 14:38:37 +08:00
committed by GitHub
parent 6f55457652
commit 56df077931
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spec/lib/user_name_suggester_spec.rb
View File

@ -10,6 +10,8 @@ RSpec.describe UserNameSuggester do
SiteSetting.reserved_usernames = ""
end
let(:fallback_username) { I18n.t("fallback_username") + "1" }
it "keeps adding numbers to the username" do
Fabricate(:user, username: "sam")
Fabricate(:user, username: "sAm1")
@ -20,7 +22,7 @@ RSpec.describe UserNameSuggester do
end
it "doesn't raise an error on nil username and suggest the fallback username" do
expect(UserNameSuggester.suggest(nil)).to eq(I18n.t("fallback_username"))
expect(UserNameSuggester.suggest(nil)).to eq(fallback_username)
end
it "doesn't raise an error on integer username" do
@ -86,7 +88,7 @@ RSpec.describe UserNameSuggester do
it "suggest a fallback username if name contains only invalid characters" do
suggestion = UserNameSuggester.suggest("---")
expect(suggestion).to eq(I18n.t("fallback_username"))
expect(suggestion).to eq(fallback_username)
end
it "allows dots in the middle" do
@ -164,7 +166,6 @@ RSpec.describe UserNameSuggester do
end
it "uses fallback username if there are Unicode characters only" do
fallback_username = I18n.t("fallback_username")
expect(UserNameSuggester.suggest("طائر")).to eq(fallback_username)
expect(UserNameSuggester.suggest("πουλί")).to eq(fallback_username)
end
@ -218,7 +219,7 @@ RSpec.describe UserNameSuggester do
it "uses allowlist" do
SiteSetting.allowed_unicode_username_characters = "[äöüßÄÖÜẞ]"
expect(UserNameSuggester.suggest("πουλί")).to eq(I18n.t("fallback_username"))
expect(UserNameSuggester.suggest("πουλί")).to eq(fallback_username)
expect(UserNameSuggester.suggest("a鳥b")).to eq("a_b")
expect(UserNameSuggester.suggest("Löwe")).to eq("Löwe")