From 3460aec5e0d296239548a2360d22186fed1bca4b Mon Sep 17 00:00:00 2001
From: Bobby McDonald <bobbymcwho@gmail.com>
Date: Thu, 14 Jan 2021 14:31:35 -0500
Subject: [PATCH] Use OmniAuth 2.0.0

---
 lib/omniauth-okta/version.rb          | 2 +-
 lib/omniauth/strategies/okta.rb       | 2 +-
 omniauth-okta.gemspec                 | 5 ++---
 spec/omniauth/strategies/okta_spec.rb | 8 +++++---
 spec/spec_helper.rb                   | 4 +++-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/omniauth-okta/version.rb b/lib/omniauth-okta/version.rb
index f0b9d0a..c26edde 100644
--- a/lib/omniauth-okta/version.rb
+++ b/lib/omniauth-okta/version.rb
@@ -2,6 +2,6 @@
 
 module OmniAuth
   module Okta
-    VERSION = '0.1.3'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end
diff --git a/lib/omniauth/strategies/okta.rb b/lib/omniauth/strategies/okta.rb
index dfd70b4..c3812c1 100644
--- a/lib/omniauth/strategies/okta.rb
+++ b/lib/omniauth/strategies/okta.rb
@@ -72,7 +72,7 @@ def raw_info
       end
 
       def callback_url
-        options[:redirect_uri] || (full_host + script_name + callback_path)
+        options[:redirect_uri] || (full_host + callback_path)
       end
 
       # Returns the qualified URL for the authorization server
diff --git a/omniauth-okta.gemspec b/omniauth-okta.gemspec
index 863b669..afd9460 100644
--- a/omniauth-okta.gemspec
+++ b/omniauth-okta.gemspec
@@ -14,10 +14,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
 
-  s.add_dependency "omniauth", "~> 1.5"
-  s.add_dependency "omniauth-oauth2", ">= 1.6.0", "< 2.0"
+  s.add_dependency "omniauth", "~> 2.0"
+  s.add_dependency "omniauth-oauth2", "~> 1.7", ">= 1.7.1"
 
-  s.add_development_dependency "bundler", "~> 1.5"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3"
   s.add_development_dependency "rack-test"
diff --git a/spec/omniauth/strategies/okta_spec.rb b/spec/omniauth/strategies/okta_spec.rb
index 1c543cb..2cb937a 100755
--- a/spec/omniauth/strategies/okta_spec.rb
+++ b/spec/omniauth/strategies/okta_spec.rb
@@ -3,10 +3,11 @@
 require 'spec_helper'
 
 describe OmniAuth::Strategies::Okta do
-
+  include OmniAuth::Test::StrategyTestCase
   subject { described_class.new({}) }
 
   let(:base_url) { 'https://your-org.okta.com' }
+  let(:strategy) { described_class }
 
   describe '#client' do
     it 'has default site' do
@@ -38,8 +39,9 @@
 
   describe '#callback_path' do
     it 'has the correct callback path' do
-      expect(subject.callback_path).to \
-      eq('/auth/okta/callback')
+      post '/auth/okta'
+      expect(last_response.location).to \
+      eq('http://example.org/auth/okta/callback')
     end
   end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ecc54fa..339ccc3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,7 +7,6 @@
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
@@ -20,3 +19,6 @@
   #     --seed 1234
   config.order = 'random'
 end
+
+OmniAuth.config.test_mode = true
+OmniAuth.config.request_validation_phase = proc {}