github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 19:54:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove the .json part from the external_id value when using it to lookup a user.

Browse Source
This commit is contained in:
Ryan Fox
2015-02-02 12:58:02 -05:00
parent 1f0915bf83
commit c3f21dcdfc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/application_controller.rb
View File

@ -239,7 +239,8 @@ class ApplicationController < ActionController::Base
find_opts[:active] = true unless opts[:include_inactive] find_opts[:active] = true unless opts[:include_inactive]
User.find_by(find_opts) User.find_by(find_opts)
elsif params[:external_id] 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 end
raise Discourse::NotFound.new if user.blank? raise Discourse::NotFound.new if user.blank?