From db25092bc250c4088ce2ec78e09e8dba274e96c3 Mon Sep 17 00:00:00 2001
From: Kenji Koshikawa <koshikawa2009@gmail.com>
Date: Wed, 10 Mar 2021 09:55:47 +0900
Subject: [PATCH 1/5] #16 Add a testcase to confirm callback_url when setting
 script_name.

---
 test/strategy_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/strategy_test.rb b/test/strategy_test.rb
index 8a5f206..c4a6e91 100644
--- a/test/strategy_test.rb
+++ b/test/strategy_test.rb
@@ -94,6 +94,13 @@ class CallbackUrlTest < StrategyTestCase
     strategy.stubs(:script_name).returns("") # as not to depend on Rack env
     assert_equal "#{url_base}/auth/slack/done", strategy.callback_url
   end
+
+  test "returns callback_url when setting script_name" do
+    url_base = "http://auth.request.com"
+    @request.stubs(:url).returns("#{url_base}/page/path")
+    strategy.stubs(:script_name).returns("/foo") # as not to depend on Rack env
+    assert_equal "#{url_base}/foo/auth/slack/callback", strategy.callback_url
+  end
 end
 
 class UidTest < StrategyTestCase

From 64159d5d0a359060ccdc01233d812c319941b6c1 Mon Sep 17 00:00:00 2001
From: Kenji Koshikawa <koshikawa2009@gmail.com>
Date: Wed, 10 Mar 2021 09:57:23 +0900
Subject: [PATCH 2/5] #16 Add dependency constraint for omniauth 1.x

---
 omniauth-slack.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/omniauth-slack.gemspec b/omniauth-slack.gemspec
index 7e6396e..bdf87e7 100644
--- a/omniauth-slack.gemspec
+++ b/omniauth-slack.gemspec
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'omniauth', '~> 1.2'
   spec.add_runtime_dependency 'omniauth-oauth2', '>= 1.4.0'
 
   spec.add_development_dependency 'bundler', '>= 1.11.2'

From 49e53c925106be6314aada09ac9a54e2fc3f9003 Mon Sep 17 00:00:00 2001
From: Kenji Koshikawa <koshikawa2009@gmail.com>
Date: Wed, 10 Mar 2021 10:01:49 +0900
Subject: [PATCH 3/5] set version to 2.5.1

---
 CHANGELOG.md                  | 4 ++++
 lib/omniauth-slack/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 468f36f..af135ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v2.5.1
+
+* Add dependency constraint for omniauth 1.x (#16)
+
 ## v2.5.0
 
 * Added Slack v2 API support (oauth flow, scopes, tokens).
diff --git a/lib/omniauth-slack/version.rb b/lib/omniauth-slack/version.rb
index 443dbe3..ad7d1dd 100644
--- a/lib/omniauth-slack/version.rb
+++ b/lib/omniauth-slack/version.rb
@@ -1,5 +1,5 @@
 module OmniAuth
   module Slack
-    VERSION = "2.5.0"
+    VERSION = "2.5.1"
   end
 end

From a500f651ef3d3eb1e08980d9a701ad396735a207 Mon Sep 17 00:00:00 2001
From: Kenji Koshikawa <koshikawa2009@gmail.com>
Date: Wed, 10 Mar 2021 10:05:54 +0900
Subject: [PATCH 4/5] #16 Allow for OmniAuth 2.0 series

---
 lib/omniauth/strategies/slack.rb | 2 +-
 omniauth-slack.gemspec           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/omniauth/strategies/slack.rb b/lib/omniauth/strategies/slack.rb
index 38b3892..10cda4f 100644
--- a/lib/omniauth/strategies/slack.rb
+++ b/lib/omniauth/strategies/slack.rb
@@ -196,7 +196,7 @@ def client
       # some errors in call to /api/oauth.[v2.]access.
       #
       def callback_url
-        options.redirect_uri || full_host + script_name + callback_path
+        options.redirect_uri || full_host + callback_path
       end
       
       ### Possibly obsolete
diff --git a/omniauth-slack.gemspec b/omniauth-slack.gemspec
index bdf87e7..7e579e7 100644
--- a/omniauth-slack.gemspec
+++ b/omniauth-slack.gemspec
@@ -16,8 +16,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'omniauth', '~> 1.2'
-  spec.add_runtime_dependency 'omniauth-oauth2', '>= 1.4.0'
+  spec.add_runtime_dependency 'omniauth', '~> 2.0'
+  spec.add_runtime_dependency 'omniauth-oauth2', '~> 1.7.1'
 
   spec.add_development_dependency 'bundler', '>= 1.11.2'
   spec.add_development_dependency 'rake'

From 490f2dc99b6f77933a0703cb8585e68bcc14f307 Mon Sep 17 00:00:00 2001
From: Kenji Koshikawa <koshikawa2009@gmail.com>
Date: Wed, 10 Mar 2021 10:07:16 +0900
Subject: [PATCH 5/5] set version to 3.0.0

---
 CHANGELOG.md                  | 4 ++++
 lib/omniauth-slack/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af135ed..8c98a83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v3.0.0
+
+* Allow for OmniAuth 2.0 series. (#16)
+
 ## v2.5.1
 
 * Add dependency constraint for omniauth 1.x (#16)
diff --git a/lib/omniauth-slack/version.rb b/lib/omniauth-slack/version.rb
index ad7d1dd..2533085 100644
--- a/lib/omniauth-slack/version.rb
+++ b/lib/omniauth-slack/version.rb
@@ -1,5 +1,5 @@
 module OmniAuth
   module Slack
-    VERSION = "2.5.1"
+    VERSION = "3.0.0"
   end
 end