Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more username cycling avoidance

This commit is contained in:
Sam 2015-03-27 10:10:53 +11:00
parent 0c287d7d6b
commit d80ed94608
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/discourse_single_sign_on.rb
View File

@ -115,9 +115,8 @@ class DiscourseSingleSignOn < SingleSignOn
end
if SiteSetting.sso_overrides_username &&
user.username != username &&
user.username != UserNameSuggester.fix_username(username || name || email)
user.username = UserNameSuggester.suggest(username || name || email)
user.username != username
user.username = UserNameSuggester.suggest(username || name || email, user.username)
end
if SiteSetting.sso_overrides_name && user.name != name

8
lib/user_name_suggester.rb
View File

@ -1,9 +1,9 @@
module UserNameSuggester
def self.suggest(name)
def self.suggest(name, allow_username = nil)
return unless name.present?
name = parse_name_from_email(name)
find_available_username_based_on(name)
find_available_username_based_on(name, allow_username)
end
def self.parse_name_from_email(name)
@ -16,11 +16,11 @@ module UserNameSuggester
name
end
def self.find_available_username_based_on(name)
def self.find_available_username_based_on(name, allow_username = nil)
name = fix_username(name)
i = 1
attempt = name
until User.username_available?(attempt)
until attempt == allow_username || User.username_available?(attempt)
suffix = i.to_s
max_length = User.username_length.end - suffix.length - 1
attempt = "#{name[0..max_length]}#{suffix}"