github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 04:24:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3163 from rcfox/fix-by-external

Browse Source 
Allow periods in the external_id value used in the /users/by-external route.
This commit is contained in:
Sam
2015-06-24 13:07:12 +10:00
parent e0ac3529d1 14d2b76354
commit b052179ae6
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/application_controller.rb
View File

@ -269,7 +269,8 @@ class ApplicationController < ActionController::Base
find_opts[:active] = true unless opts[:include_inactive]
User.find_by(find_opts)
elsif params[:external_id]
SingleSignOnRecord.find_by(external_id: params[:external_id]).try(:user)
external_id = params[:external_id].gsub(/\.json$/, '')
SingleSignOnRecord.find_by(external_id: external_id).try(:user)
end
raise Discourse::NotFound if user.blank?