From 1b5549df58d91ef9cb72a5951b1e843f1e30e6e5 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 13 Mar 2018 18:29:11 -0400 Subject: [PATCH] FIX: my sso_overrides_username assumed username was passed --- app/models/discourse_single_sign_on.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb index 64f77a5839d..1d7b041805d 100644 --- a/app/models/discourse_single_sign_on.rb +++ b/app/models/discourse_single_sign_on.rb @@ -181,10 +181,10 @@ class DiscourseSingleSignOn < SingleSignOn user.active = false if require_activation end - if SiteSetting.sso_overrides_username? + if SiteSetting.sso_overrides_username? && username.present? if user.username.downcase == username.downcase user.username = username # there may be a change of case - elsif user.username != username && username.present? + elsif user.username != username user.username = UserNameSuggester.suggest(username || name || email, user.username) end end