From 9e452cacf8642b835cae85d141b0e2212b61d8ce Mon Sep 17 00:00:00 2001 From: wilson29thid Date: Sat, 23 Jul 2022 17:43:06 +0100 Subject: [PATCH 1/2] Update omniauth dependency to support 1.0 and 2.0 --- omniauth-discourse.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omniauth-discourse.gemspec b/omniauth-discourse.gemspec index 5b81f61..36a5ab8 100644 --- a/omniauth-discourse.gemspec +++ b/omniauth-discourse.gemspec @@ -8,7 +8,7 @@ Gem::Specification.new do |gem| gem.homepage = "https://github.com/lackstein/omniauth-discourse" gem.license = "MIT" - gem.add_dependency "omniauth", "~> 1.0" + gem.add_dependency "omniauth", ">= 1.0", "< 3" gem.add_development_dependency "bundler", "~> 1.9" gem.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) } From 92ec18cd94399a48ce3f7a3897503b58c6a4e724 Mon Sep 17 00:00:00 2001 From: wilson29thid Date: Fri, 16 Sep 2022 16:09:21 +0100 Subject: [PATCH 2/2] Use CGI.escape instead of the deprecated URI.escape --- lib/omniauth/strategies/discourse/sso.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/omniauth/strategies/discourse/sso.rb b/lib/omniauth/strategies/discourse/sso.rb index 327a026..2d8e3be 100644 --- a/lib/omniauth/strategies/discourse/sso.rb +++ b/lib/omniauth/strategies/discourse/sso.rb @@ -65,7 +65,7 @@ def base64_encoded_payload end def url_encoded_payload - URI.escape(base64_encoded_payload) + CGI.escape(base64_encoded_payload) end def hex_signature @@ -83,4 +83,4 @@ def base64? data end end end -end \ No newline at end of file +end