From c3f21dcdfc9fd73a962de021b05c81bb5b6f1e97 Mon Sep 17 00:00:00 2001
From: Ryan Fox <ryan.fox@upverter.com>
Date: Mon, 2 Feb 2015 12:58:02 -0500
Subject: [PATCH] Remove the .json part from the external_id value when using
it to lookup a user.
---
app/controllers/application_controller.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ff805687b..e8313fbde 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -239,7 +239,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.new if user.blank?